| 3818681c85a025afd8aa203937b66d7c01ac1a8b |
|
27-Apr-2012 |
Steve Block <steveblock@google.com> |
Cherry-pick WebKit change r88472 to fix a rendering crash
See http://trac.webkit.org/changeset/88472
Bug: 6293530
Change-Id: I10bf2dfc6354d4e074a131e937aad04e0e6ca353
/external/webkit/Source/WebCore/css/CSSStyleSelector.cpp
|
| 95217a662a9bdf75bcd22acb92bccce312ea974b |
|
17-Apr-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Revert "Cherry-pick WebKit change r92139 to fix a LayoutTest crash"
This was causing HTML5 video to crash.
bug:6342146
This reverts commit d60e027437c746fb2412aef1c1cad6b1347c1b5e.
Change-Id: I15893f6c49bba2f0f738590d29c8b0c9024a98e6
/external/webkit/Source/WebCore/css/CSSStyleSelector.cpp
|
| bb0dba49203d72577b8eac34537c9c671ba9bec7 |
|
12-Apr-2012 |
Steve Block <steveblock@google.com> |
Cherry-pick WebKit change r96122 to fix a LayoutTest crash
fast/canvas/crash-set-font.html
See http://trac.webkit.org/changeset/96122
Bug: 6328797
Change-Id: I9d9fdbffb19e61615d352c20e24946cf01306903
/external/webkit/Source/WebCore/css/CSSStyleSelector.cpp
|
| d60e027437c746fb2412aef1c1cad6b1347c1b5e |
|
12-Apr-2012 |
Steve Block <steveblock@google.com> |
Cherry-pick WebKit change r92139 to fix a LayoutTest crash
editing/input/search-field-crash-in-designmode.html
Manually resolved a merge conflict in CSSStyleSelector::isAtShadowBoundary()
due to http://trac.webkit.org/changeset/88476.
See http://trac.webkit.org/changeset/92139
Bug: 6329073
Change-Id: If869bd58a689bb918ef47048c4f5d2e84e4b6f89
/external/webkit/Source/WebCore/css/CSSStyleSelector.cpp
|
| 6fc495ad78b1663298d1395115dc316eeb537036 |
|
12-Apr-2012 |
Steve Block <steveblock@google.com> |
Cherry-pick WebKit change r85267 as a prerequisite for r92139
See http://trac.webkit.org/changeset/85267
Bug: 6329073
Change-Id: I7c46eab459647059890732214a9b953adef0a647
/external/webkit/Source/WebCore/css/CSSStyleSelector.cpp
|
| be276cc8612281d7433f591dd8bc960ff759a8b2 |
|
18-Jan-2012 |
John Reck <jreck@google.com> |
Remove ANDROID_CSS_RING
Change-Id: I7395a5f17b0ccfe8dafcc97fa3ab8897676608e9
/external/webkit/Source/WebCore/css/CSSStyleSelector.cpp
|
| 150c94129c340b7cce44e62b98ee057e6d7612cd |
|
13-Jun-2011 |
John Reck <jreck@google.com> |
Merge "Ignore webkit-text-size-adjust: none"
|
| aaf00b3dd10c64d47611a17592267b3aad69eee8 |
|
26-May-2011 |
John Reck <jreck@google.com> |
Ignore webkit-text-size-adjust: none
Bug: 4486008
Change-Id: Iaf810878c6ed216e2431a7718de899a9e8e0d6f8
/external/webkit/Source/WebCore/css/CSSStyleSelector.cpp
|
| bbcce278be9be6a85f47928c38a74c8d36a13a85 |
|
09-Jun-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r84325: Fix conflicts.
Platform.h
ENABLE_FULLSCREEN_API (http://trac.webkit.org/changeset/83997)
WTF_USE_SKIA (http://trac.webkit.org/changeset/84106)
JSNavigatorCustom.cpp
V8NavigatorCustom.cpp
ENABLE(APPLICATION_INSTALLED) (http://trac.webkit.org/changeset/83287)
CSSStyleSelector.cpp
ANDROID_CSS_RING (http://trac.webkit.org/changeset/83986)
Document.cpp
ANDROID_META_SUPPORT (http://trac.webkit.org/changeset/83349)
ANDROID_INSTRUMENT (http://trac.webkit.org/changeset/82992)
HTMLInputElement.cpp
ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS (http://trac.webkit.org/changeset/82534)
RangeInputType.cpp
ENABLE(TOUCH_EVENTS) (http://trac.webkit.org/changeset/83256/)
ChromeClient.h
ANDROID_INSTALLABLE_WEB_APPS (http://trac.webkit.org/changeset/83375)
EventHandler.cpp
PLATFORM(ANDROID) (http://trac.webkit.org/changeset/83522)
Settings
ANDROID_PLUGINS (http://trac.webkit.org/changeset/83201)
ANDROID_BLOCK_NETWORK_IMAGE (http://trac.webkit.org/changeset/83628)
Gradient.cpp
Graphicscontext.cpp
HTMLCanvasElement.cpp
USE(SKIA) && !PLATFORM(ANDROID) (http://trac.webkit.org/changeset/84088)
USE(SKIA) && !PLATFORM(ANDROID) (http://trac.webkit.org/changeset/84101)
PluginView.h
ANDROID_PLUGINS (http://trac.webkit.org/changeset/84071)
RenderBox.h
ANDROID_LAYOUT (http://trac.webkit.org/changeset/82611)
RenderIframe.cpp (moved code to RenderPart.cpp)
PLATFORM(ANDROID) (http://trac.webkit.org/changeset/83518)
RenderLayer.cpp
ANDROID_OVERFLOW_SCROLL (http://trac.webkit.org/changeset/83899)
RenderLayer.h
RenderLayerBacking.cpp
ANDROID_OVERFLOW_SCROLL (http://trac.webkit.org/changeset/83820)
Change-Id: Ieabe98f4e01610b6a73e961b673e2fa99b0010e7
/external/webkit/Source/WebCore/css/CSSStyleSelector.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/CSSStyleSelector.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/CSSStyleSelector.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/CSSStyleSelector.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/CSSStyleSelector.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/CSSStyleSelector.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/CSSStyleSelector.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/CSSStyleSelector.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/CSSStyleSelector.cpp
|