| c15e83e3313f9adc8c47e19be5d8218738b663d0 |
|
04-Apr-2013 |
Wink Saville <wink@google.com> |
Build fix with newer bison 2.6
From: http://trac.webkit.org/changeset/124099
Bug: 8517572
Change-Id: Iaead93f01d6a86180c21e320ef56a4620619ce00
/external/webkit/Source/WebCore/css/CSSParser.cpp
|
| 65f5521b69d0cfd5e011e73412b6c69ffcf0a897 |
|
12-Apr-2012 |
Steve Block <steveblock@google.com> |
Cherry-pick WebKit change r94215 to fix a LayoutTest crash
fast/gradients/css3-radial-gradient-crash.html
See http://trac.webkit.org/changeset/94215
Bug: 6328935
Change-Id: I4414885e54a60aa05346c002c40835334685b1cb
/external/webkit/Source/WebCore/css/CSSParser.cpp
|
| be276cc8612281d7433f591dd8bc960ff759a8b2 |
|
18-Jan-2012 |
John Reck <jreck@google.com> |
Remove ANDROID_CSS_RING
Change-Id: I7395a5f17b0ccfe8dafcc97fa3ab8897676608e9
/external/webkit/Source/WebCore/css/CSSParser.cpp
|
| 5f000f6f06377295cba1d3246dbd601610cdbd16 |
|
16-Nov-2011 |
Kristian Monsen <kristianm@google.com> |
Remove changes with upstream WebKit
Fix for bug 5626884, removing some small changes with upstream
that was spotted as part of CL:
https://android-git.corp.google.com/g/#/c/148917
No functional difference.
Change-Id: I62c8a24e17c3ab86eebff997b87e5bced88e0807
/external/webkit/Source/WebCore/css/CSSParser.cpp
|
| b359438e11520b3e3b6801ad1280e1bdef2b986c |
|
09-Nov-2011 |
Kristian Monsen <kristianm@google.com> |
Removing ANDROID_INSTRUMENTATION code
This has not been used for years, and due to WebKit merges the
results are not accurate anymore.
The resulting code is cleaner, less likely to create merge conflicts,
and does not give the impression that this can be turned on and
it will still work.
Needs CL:
https://android-git.corp.google.com/g/#/c/148912/
Change-Id: I617ad00c103ab72038371a3203452d2ccec0e50c
/external/webkit/Source/WebCore/css/CSSParser.cpp
|
| d0147a863b872ecaa451ab0dce2a348760e99e2c |
|
13-Jul-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at branches/chromium/742 r89068: Initial merge by Git.
Take us to top of Chrome 12 release branch (12.0.742.130)
Change-Id: I4408a97e343a118cf4a1bb9d71367bcc2c16ae48
/external/webkit/Source/WebCore/css/CSSParser.cpp
|
| 54cdeeebc7adcbcd900e8b6a141a8cae27d9a631 |
|
10-Jun-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at branches/chromium/742 r88085: Initial merge by git.
Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde
/external/webkit/Source/WebCore/css/CSSParser.cpp
|
| 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 |
|
02-Jun-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
/external/webkit/Source/WebCore/css/CSSParser.cpp
|
| 74ee772b3c1ea8b557e5a596e9cbc655d1c0e161 |
|
08-Jun-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r82507: Fix conflicts
- RenderLayerBacking.cpp
Due to ANDROID_OVERFLOW_SCROLL
http://trac.webkit.org/changeset/81715
- Document.cpp
Due to domTreeVersion and ANDROID_STYLE_VERSION
http://trac.webkit.org/changeset/80797
- CachedResourceLoader.cpp
Due to temporary debugging and ANDROID_BLOCK_NETWORK_IMAGE
http://trac.webkit.org/changeset/80695
- Settings.cpp/h
http://trac.webkit.org/changeset/81289
http://trac.webkit.org/changeset/81635
- MediaPlayer.cpp
Whitespace only
http://trac.webkit.org/changeset/80874
- RenderBox.cpp
Due to isHorizontalWritingMode
http://trac.webkit.org/changeset/81716
- RenderLayer.cpp/h
Due to ANDROID_OVERFLOW_SCROLL
http://trac.webkit.org/changeset/81981
- CSSStyleSelector.cpp
Due to ANDROID_CSS_RING
http://trac.webkit.org/changeset/80582
http://trac.webkit.org/changeset/80993
http://trac.webkit.org/changeset/80998
http://trac.webkit.org/changeset/81684
http://trac.webkit.org/changeset/82378
- CSSParser.cpp
Due to ANDROID_CSS_RING
http://trac.webkit.org/changeset/80582
http://trac.webkit.org/changeset/81684
- StyleElement.cpp
Due to cherry pick of http://trac.webkit.org/changeset/80787
http://trac.webkit.org/changeset/82054
- EventHandler.cpp
Due to ANDROID_PLUGINS
http://trac.webkit.org/changeset/81618
http://trac.webkit.org/changeset/81835
- SliderThumbElement.cpp
Due to touch events
http://trac.webkit.org/changeset/81216
- MediaControls.cpp
Due to touch events
http://trac.webkit.org/changeset/80857
Note that the WebKit history for this file is confusing as it was
renamed in http://trac.webkit.org/changeset/83545 and then re-added in
http://trac.webkit.org/changeset/84222 but trac is not smart enough to
track history backwards from http://trac.webkit.org/changeset/84222.
Change-Id: Ie1f80e09ae7c3befa7a18773cf846ff130e4354e
/external/webkit/Source/WebCore/css/CSSParser.cpp
|
| 2bde8e466a4451c7319e3a072d118917957d6554 |
|
25-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
/external/webkit/Source/WebCore/css/CSSParser.cpp
|
| 528d6eb2a23ee3cb19c267dc77ec4bd7647d597a |
|
31-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r80534: Fix CSSComputedStyleDeclaration.cpp
Update our uses of CSSPrimitiveValue following
http://trac.webkit.org/changeset/80463
Change-Id: I216382423f496b90af61b044b2a4bda9a6c322de
/external/webkit/Source/WebCore/css/CSSParser.cpp
|
| 81bc750723a18f21cd17d1b173cd2a4dda9cea6e |
|
24-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
/external/webkit/Source/WebCore/css/CSSParser.cpp
|
| 2fc2651226baac27029e38c9d6ef883fa32084db |
|
18-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
/external/webkit/Source/WebCore/css/CSSParser.cpp
|
| ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb |
|
16-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
/external/webkit/Source/WebCore/css/CSSParser.cpp
|
| 65f03d4f644ce73618e5f4f50dd694b26f55ae12 |
|
13-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
/external/webkit/Source/WebCore/css/CSSParser.cpp
|
| cad810f21b803229eb11403f9209855525a25d57 |
|
06-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r75315: Initial merge by git.
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
/external/webkit/Source/WebCore/css/CSSParser.cpp
|