From 9921f05212aa840e1ce32e9f04fa60ca4b3bcbb7 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Wed, 1 Jun 2011 16:59:03 +0100 Subject: 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 --- Source/WebCore/plugins/PluginViewNone.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'Source/WebCore/plugins') diff --git a/Source/WebCore/plugins/PluginViewNone.cpp b/Source/WebCore/plugins/PluginViewNone.cpp index c0d0e4a..383ac49 100644 --- a/Source/WebCore/plugins/PluginViewNone.cpp +++ b/Source/WebCore/plugins/PluginViewNone.cpp @@ -28,10 +28,7 @@ #if USE(JSC) #include "BridgeJSC.h" -<<<<<<< HEAD -======= #include ->>>>>>> WebKit at r80534 #endif using namespace WTF; -- cgit v1.1