| 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/dom/StyleElement.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/dom/StyleElement.cpp
|
| e7913fbdd6f145fe1644c90c22aa73cb733c9e17 |
|
16-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r75993: Fix conflicts.
StyleElement.cpp
Do not undo cherry pick of http://trac.webkit.org/changeset/80787
Conflict due to intermediate change
http://trac.webkit.org/changeset/75338
SliderThumbElement.cpp
Conflict due to Android TOUCH_EVENTS addition and
http://trac.webkit.org/changeset/75749
DOMWindow.cpp
Conflict due to clearDomStorage and
http://trac.webkit.org/changeset/75739
Page.cpp
Conflict due to Android APPLICATION_INSTALLED addition and
http://trac.webkit.org/changeset/75604
DragData.h
See http://trac.webkit.org/changeset/75523
RenderBox.cpp
Conflict due to PLATFORM_ANDROID addition and
http://trac.webkit.org/changeset/75837
.gitignore - keep ours
RenderSVGSolidColor.cpp
This file moved, so copy over our edits.
Change-Id: Ieeb1f0056987d718e3522cc7cd8097a90fc642fb
/external/webkit/Source/WebCore/dom/StyleElement.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/dom/StyleElement.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/dom/StyleElement.cpp
|