diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-09-30 15:42:16 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-10-07 10:59:32 +0100 |
| commit | e1a0cd8247467a70fed9f6099fc9c65ec35ae23e (patch) | |
| tree | 1ac0d53e65a65d0e948bc2a618da2035c9904d68 /WebCore/dom | |
| parent | 4ec83411857d951802e6584b2c2afc90382ad429 (diff) | |
| download | external_webkit-e1a0cd8247467a70fed9f6099fc9c65ec35ae23e.zip external_webkit-e1a0cd8247467a70fed9f6099fc9c65ec35ae23e.tar.gz external_webkit-e1a0cd8247467a70fed9f6099fc9c65ec35ae23e.tar.bz2 | |
Merge Webkit at r68651 : Fix conflicts.
ChromeClient.h:
Conflict due to ANDROID_INSTALLABLE_WEB_APPS
http://trac.webkit.org/changeset/68031/trunk/WebCore/page/ChromeClient.h
CSSParser.cpp:
Conflict due to ANDROID_INSTRUMENT
http://trac.webkit.org/changeset/68521/trunk/WebCore/css/CSSParser.cpp
Node.cpp:
Conflict due to ANDROID_DOM_LOGGING
http://trac.webkit.org/changeset/68541/trunk/WebCore/dom/Node.cpp
npapi.h:
Conflicts due to various #ifdef ANDROID
http://trac.webkit.org/changeset/68390/trunk/WebCore/bridge/npapi.h
PlatformTouchEvent.h:
PlatformTouchEventAndroid.cpp:
PlatformTouchPoint.h:
Conflicts due to new BREWMP code next to changed Android code
Initial webkit CL:
http://trac.webkit.org/changeset/68499
Later fix after merge revision, so cherry-picked:
http://trac.webkit.org/changeset/69034
RenderBox.cpp:
Several changes, conflicts due to ANDROID_LAYOUT
http://trac.webkit.org/changeset/68238#file2
http://trac.webkit.org/changeset/68239#file3
http://trac.webkit.org/changeset/68362/trunk/WebCore/rendering/RenderBox.cpp
The correct resolution here is unclear. A closer investiagtion by somebdoy
more familiar with the code is tracked with b/3071198
RenderBox.h:
Conflicts due to ANDROID_LAYOUT
http://trac.webkit.org/changeset/68417/trunk/WebCore/rendering/RenderBox.h
RenderIFrame.cpp:
Conflicts due to ANDROID_FLATTEN_IFRAME
http://trac.webkit.org/changeset/68238/trunk/WebCore/rendering/RenderIFrame.cpp
RenderTable.cpp:
Conflicts due to ANDROID_LAYOUT
http://trac.webkit.org/changeset/68427/trunk/WebCore/rendering/RenderTable.cpp
RenderView.cpp:
Conflicts due to ANDROID_LAYOUT
http://trac.webkit.org/changeset/68436/trunk/WebCore/rendering/RenderView.cpp
Settings.cpp:
Settings.h:
Conflicts due to ANDROID_PLUGINS and WEB_AUTOFILL
http://trac.webkit.org/changeset/68166
Widget.cpp:
http://trac.webkit.org/changeset/68054/trunk/WebCore/platform/Widget.cpp
Change-Id: I156f537ae0483b89e4c6b9fce0e7b2f931f957a2
Diffstat (limited to 'WebCore/dom')
| -rw-r--r-- | WebCore/dom/Node.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/WebCore/dom/Node.cpp b/WebCore/dom/Node.cpp index 5694dfe..831250e 100644 --- a/WebCore/dom/Node.cpp +++ b/WebCore/dom/Node.cpp @@ -25,15 +25,12 @@ #include "config.h" #include "Node.h" -<<<<<<< HEAD #ifdef ANDROID_DOM_LOGGING #define LOG_TAG "webcore" #include "AndroidLog.h" #endif -======= #include "AXObjectCache.h" ->>>>>>> webkit.org at r68651 #include "Attr.h" #include "Attribute.h" #include "CSSParser.h" |