diff options
author | Ben Murdoch <benm@google.com> | 2011-06-01 16:59:03 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:25 +0100 |
commit | 9921f05212aa840e1ce32e9f04fa60ca4b3bcbb7 (patch) | |
tree | 2c8a4e1e35df6042d7264e8d13a702093078637e /Source/WebCore/Android.mk | |
parent | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (diff) | |
download | external_webkit-9921f05212aa840e1ce32e9f04fa60ca4b3bcbb7.zip external_webkit-9921f05212aa840e1ce32e9f04fa60ca4b3bcbb7.tar.gz external_webkit-9921f05212aa840e1ce32e9f04fa60ca4b3bcbb7.tar.bz2 |
Merge WebKit at r80534: Fix conflicts.
Android.jscbindings.mk 79223
Conflict due to http://trac.webkit.org/changeset/79223
Android.mk
Conflicts due to http://trac.webkit.org/changeset/79825 and
http://trac.webkit.org/changeset/79978
Android.v8bindings.mk 80367
Conflicts due to http://trac.webkit.org/changeset/80103 and
http://trac.webkit.org/changeset/80367
HTMLMediaElement.cpp
Conflicts due to http://trac.webkit.org/changeset/80030 and
local TOUCH_EVENTS modifications.
HTMLDocumentParser.cpp
Conflict due to http://trac.webkit.org/changeset/79772 and
local ANDROID_INSTRUMENT modifications.
CachedResourceLoader.cpp|h
Conflicts due to http://trac.webkit.org/changeset/78602 and
ANDROID_BLOCK_NETWORK_IMAGE.
MemoryCache.h
Conflicts due to http://trac.webkit.org/changeset/78848 and
ANDROID_INSTRUMENT.
FrameView.cpp
Conflict due to http://trac.webkit.org/changeset/78928 and
locally added updatePositionedObjects function.
NetworkStateNotifier
JobjectWrapper.cpp
Git seems to have got confused with a rename here in
JobjectWrapper.cpp, keep ours.
Conflicts due to http://trac.webkit.org/changeset/79563 and
local Android additions.
PluginViewNone.cpp 79904
Conflicts due to http://trac.webkit.org/changeset/79904 and
local cherry pick of http://trac.webkit.org/changeset/79988
RenderBox.cpp
Conflicts due to http://trac.webkit.org/changeset/79467 and
local android modifications.
Change-Id: I98bd80de86b5169212da137ad3df42c1c35e8931
Diffstat (limited to 'Source/WebCore/Android.mk')
-rw-r--r-- | Source/WebCore/Android.mk | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Source/WebCore/Android.mk b/Source/WebCore/Android.mk index 2d4f24c..31b066a 100644 --- a/Source/WebCore/Android.mk +++ b/Source/WebCore/Android.mk @@ -517,11 +517,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ platform/ContentType.cpp \ platform/ContextMenuItem.cpp \ platform/CrossThreadCopier.cpp \ -<<<<<<< HEAD platform/Cursor.cpp \ - platform/DeprecatedPtrListImpl.cpp \ -======= ->>>>>>> WebKit at r80534 platform/DragData.cpp \ platform/DragImage.cpp \ platform/FileChooser.cpp \ @@ -926,11 +922,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ rendering/ScrollBehavior.cpp \ -<<<<<<< HEAD rendering/ShadowElement.cpp \ - rendering/TextControlInnerElements.cpp \ -======= ->>>>>>> WebKit at r80534 rendering/TransformState.cpp \ rendering/break_lines.cpp \ \ |