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

20 files changed, 113 insertions, 259 deletions

diff --git a/Source/WebCore/bindings/js/JSNavigatorCustom.cpp b/Source/WebCore/bindings/js/JSNavigatorCustom.cpp
index 26e93e3..dc3b932 100644
--- a/Source/WebCore/bindings/js/JSNavigatorCustom.cpp
+++ b/Source/WebCore/bindings/js/JSNavigatorCustom.cpp
@@ -23,17 +23,14 @@
 #include "config.h"
 #include "JSNavigator.h"
 
-<<<<<<< HEAD
-#include "ExceptionCode.h"
-=======
 #include "CallbackFunction.h"
 #include "JSNavigatorUserMediaErrorCallback.h"
 #include "JSNavigatorUserMediaSuccessCallback.h"
->>>>>>> WebKit.org at r84325
 #include "Navigator.h"
 #include <runtime/InternalFunction.h>
 
 #if PLATFORM(ANDROID)
+#include "ExceptionCode.h"
 #include "JSCustomApplicationInstalledCallback.h"
 #endif
 
@@ -50,9 +47,29 @@ void JSNavigator::markChildren(MarkStack& markStack)
     markDOMObjectWrapper(markStack, globalData, impl()->optionalGeolocation());
 }
 
-<<<<<<< HEAD
-#if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
+#if ENABLE(MEDIA_STREAM)
+JSValue JSNavigator::webkitGetUserMedia(ExecState* exec)
+{
+    // Arguments: Options, successCallback, (optional)errorCallback
+
+    String options = ustringToString(exec->argument(0).toString(exec));
+    if (exec->hadException())
+        return jsUndefined();
+
+    RefPtr<NavigatorUserMediaSuccessCallback> successCallback = createFunctionOnlyCallback<JSNavigatorUserMediaSuccessCallback>(exec, static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), exec->argument(1));
+    if (exec->hadException())
+        return jsUndefined();
+
+    RefPtr<NavigatorUserMediaErrorCallback> errorCallback = createFunctionOnlyCallback<JSNavigatorUserMediaErrorCallback>(exec, static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), exec->argument(2), CallbackAllowUndefined);
+    if (exec->hadException())
+        return jsUndefined();
+
+    m_impl->webkitGetUserMedia(options, successCallback.release(), errorCallback.release());
+    return jsUndefined();
+}
+#endif // ENABLE(MEDIA_STREAM)
 
+#if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
 JSC::JSValue  WebCore::JSNavigator::isApplicationInstalled(JSC::ExecState* exec)
 {
     if (exec->argumentCount() < 2) {
@@ -80,30 +97,6 @@ JSC::JSValue  WebCore::JSNavigator::isApplicationInstalled(JSC::ExecState* exec)
         setDOMException(exec, INVALID_STATE_ERR);
     return jsUndefined();
 }
-
 #endif
-=======
-#if ENABLE(MEDIA_STREAM)
-JSValue JSNavigator::webkitGetUserMedia(ExecState* exec)
-{
-    // Arguments: Options, successCallback, (optional)errorCallback
-
-    String options = ustringToString(exec->argument(0).toString(exec));
-    if (exec->hadException())
-        return jsUndefined();
-
-    RefPtr<NavigatorUserMediaSuccessCallback> successCallback = createFunctionOnlyCallback<JSNavigatorUserMediaSuccessCallback>(exec, static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), exec->argument(1));
-    if (exec->hadException())
-        return jsUndefined();
-
-    RefPtr<NavigatorUserMediaErrorCallback> errorCallback = createFunctionOnlyCallback<JSNavigatorUserMediaErrorCallback>(exec, static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), exec->argument(2), CallbackAllowUndefined);
-    if (exec->hadException())
-        return jsUndefined();
-
-    m_impl->webkitGetUserMedia(options, successCallback.release(), errorCallback.release());
-    return jsUndefined();
-}
-#endif // ENABLE(MEDIA_STREAM)
->>>>>>> WebKit.org at r84325
 
 }
diff --git a/Source/WebCore/bindings/v8/custom/V8NavigatorCustom.cpp b/Source/WebCore/bindings/v8/custom/V8NavigatorCustom.cpp
index 16e8cfe..538cf19 100644
--- a/Source/WebCore/bindings/v8/custom/V8NavigatorCustom.cpp
+++ b/Source/WebCore/bindings/v8/custom/V8NavigatorCustom.cpp
@@ -1,33 +1,4 @@
 /*
-<<<<<<< HEAD
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-=======
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,22 +20,56 @@
  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
->>>>>>> WebKit.org at r84325
  */
 
 #include "config.h"
 #include "V8Navigator.h"
 
-<<<<<<< HEAD
-#if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
+#if ENABLE(MEDIA_STREAM) || (PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED))
 
+#include "Navigator.h"
+#include "V8Binding.h"
+#include "V8NavigatorUserMediaErrorCallback.h"
+#include "V8NavigatorUserMediaSuccessCallback.h"
+#include "V8Utilities.h"
+
+#if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
 #include "ExceptionCode.h"
 #include "V8CustomApplicationInstalledCallback.h"
-#include "V8Binding.h"
 #include "V8Proxy.h"
+#endif
+
+using namespace WTF;
 
 namespace WebCore {
+#if ENABLE(MEDIA_STREAM) // ANDROID
+v8::Handle<v8::Value> V8Navigator::webkitGetUserMediaCallback(const v8::Arguments& args)
+{
+    INC_STATS("DOM.Navigator.webkitGetUserMedia()");
+
+    v8::TryCatch exceptionCatcher;
+    String options = toWebCoreString(args[0]);
+    if (exceptionCatcher.HasCaught())
+        return throwError(exceptionCatcher.Exception());
+
+    bool succeeded = false;
+
+    RefPtr<NavigatorUserMediaSuccessCallback> successCallback = createFunctionOnlyCallback<V8NavigatorUserMediaSuccessCallback>(args[1], succeeded);
+    if (!succeeded)
+        return v8::Undefined();
+
+    // Argument is optional, hence undefined is allowed.
+    RefPtr<NavigatorUserMediaErrorCallback> errorCallback = createFunctionOnlyCallback<V8NavigatorUserMediaErrorCallback>(args[2], succeeded, CallbackAllowUndefined);
+    if (!succeeded)
+        return v8::Undefined();
+
+    Navigator* navigator = V8Navigator::toNative(args.Holder());
+    navigator->webkitGetUserMedia(options, successCallback.release(), errorCallback.release());
+    return v8::Undefined();
+}
+#endif // ANDROID
 
+#if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
 static PassRefPtr<ApplicationInstalledCallback> createApplicationInstalledCallback(
         v8::Local<v8::Value> value, bool& succeeded)
 {
@@ -102,49 +107,11 @@ v8::Handle<v8::Value> V8Navigator::isApplicationInstalledCallback(const v8::Argu
     if (!navigator->isApplicationInstalled(toWebCoreString(args[0]), callback.release()))
         return throwError(INVALID_STATE_ERR);
 
-=======
-#if ENABLE(MEDIA_STREAM)
-
-#include "Navigator.h"
-#include "V8Binding.h"
-#include "V8NavigatorUserMediaErrorCallback.h"
-#include "V8NavigatorUserMediaSuccessCallback.h"
-#include "V8Utilities.h"
-
-using namespace WTF;
-
-namespace WebCore {
-
-v8::Handle<v8::Value> V8Navigator::webkitGetUserMediaCallback(const v8::Arguments& args)
-{
-    INC_STATS("DOM.Navigator.webkitGetUserMedia()");
-
-    v8::TryCatch exceptionCatcher;
-    String options = toWebCoreString(args[0]);
-    if (exceptionCatcher.HasCaught())
-        return throwError(exceptionCatcher.Exception());
-
-    bool succeeded = false;
-
-    RefPtr<NavigatorUserMediaSuccessCallback> successCallback = createFunctionOnlyCallback<V8NavigatorUserMediaSuccessCallback>(args[1], succeeded);
-    if (!succeeded)
-        return v8::Undefined();
-
-    // Argument is optional, hence undefined is allowed.
-    RefPtr<NavigatorUserMediaErrorCallback> errorCallback = createFunctionOnlyCallback<V8NavigatorUserMediaErrorCallback>(args[2], succeeded, CallbackAllowUndefined);
-    if (!succeeded)
-        return v8::Undefined();
-
-    Navigator* navigator = V8Navigator::toNative(args.Holder());
-    navigator->webkitGetUserMedia(options, successCallback.release(), errorCallback.release());
->>>>>>> WebKit.org at r84325
     return v8::Undefined();
 }
+#endif // PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
 
 } // namespace WebCore
 
-<<<<<<< HEAD
-#endif // PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
-=======
-#endif // ENABLE(MEDIA_STREAM)
->>>>>>> WebKit.org at r84325
+#endif // ENABLE(MEDIA_STREAM) || PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
+
diff --git a/Source/WebCore/css/CSSStyleSelector.cpp b/Source/WebCore/css/CSSStyleSelector.cpp
index cbcdc0f..309954b 100644
--- a/Source/WebCore/css/CSSStyleSelector.cpp
+++ b/Source/WebCore/css/CSSStyleSelector.cpp
@@ -6053,7 +6053,6 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
     case CSSPropertyOverflowY:
         ASSERT_NOT_REACHED();
         return;
-<<<<<<< HEAD
 
 #ifdef ANDROID_CSS_RING
     case CSSPropertyWebkitRing:
@@ -6199,8 +6198,6 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
     }
 #endif
 
-=======
->>>>>>> WebKit.org at r84325
 #if ENABLE(SVG)
     default:
         // Try the SVG properties
diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
index b85bdfb..8c22da8 100644
--- a/Source/WebCore/dom/Document.cpp
+++ b/Source/WebCore/dom/Document.cpp
@@ -689,8 +689,8 @@ void Document::setDocType(PassRefPtr<DocumentType> docType)
     ASSERT(!m_docType || !docType);
     m_docType = docType;
     if (m_docType)
-<<<<<<< HEAD
-        m_docType->setDocument(this);
+        m_docType->setTreeScope(this);
+
 #ifdef ANDROID_META_SUPPORT
     if (m_docType && !ownerElement()
             && m_docType->publicId().startsWith("-//wapforum//dtd xhtml mobile 1.", false)) {
@@ -701,9 +701,6 @@ void Document::setDocType(PassRefPtr<DocumentType> docType)
             PlatformBridge::updateViewport(frameView);
     }
 #endif
-=======
-        m_docType->setTreeScope(this);
->>>>>>> WebKit.org at r84325
 }
 
 DOMImplementation* Document::implementation()
@@ -1482,19 +1479,16 @@ void Document::recalcStyle(StyleChange change)
     suspendPostAttachCallbacks();
     RenderWidget::suspendWidgetHierarchyUpdates();
     
-<<<<<<< HEAD
-#ifdef ANDROID_INSTRUMENT
-    android::TimeCounter::start(android::TimeCounter::CalculateStyleTimeCounter);
-#endif
-    
-=======
     RefPtr<FrameView> frameView = view();
     if (frameView) {
         frameView->pauseScheduledEvents();
         frameView->beginDeferredRepaints();
     }
 
->>>>>>> WebKit.org at r84325
+#ifdef ANDROID_INSTRUMENT
+    android::TimeCounter::start(android::TimeCounter::CalculateStyleTimeCounter);
+#endif
+
     ASSERT(!renderer() || renderArena());
     if (!renderer() || !renderArena())
         goto bail_out;
diff --git a/Source/WebCore/html/HTMLCanvasElement.cpp b/Source/WebCore/html/HTMLCanvasElement.cpp
index 1747273..ff94b76 100644
--- a/Source/WebCore/html/HTMLCanvasElement.cpp
+++ b/Source/WebCore/html/HTMLCanvasElement.cpp
@@ -342,12 +342,8 @@ String HTMLCanvasElement::toDataURL(const String& mimeType, const double* qualit
     if (mimeType.isNull() || !MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(lowercaseMimeType))
         lowercaseMimeType = "image/png";
 
-<<<<<<< HEAD
-#if PLATFORM(CG) || (USE(SKIA) && !PLATFORM(ANDROID))
+#if USE(CG) || (USE(SKIA) && !PLATFORM(ANDROID))
     // FIXME: Consider using this code path on Android. http://b/4572024
-=======
-#if USE(CG) || USE(SKIA)
->>>>>>> WebKit.org at r84325
     // Try to get ImageData first, as that may avoid lossy conversions.
     RefPtr<ImageData> imageData = getImageData();
 
diff --git a/Source/WebCore/html/HTMLInputElement.cpp b/Source/WebCore/html/HTMLInputElement.cpp
index 83e8c7d..d5d0aee 100644
--- a/Source/WebCore/html/HTMLInputElement.cpp
+++ b/Source/WebCore/html/HTMLInputElement.cpp
@@ -443,21 +443,15 @@ void HTMLInputElement::setType(const String& type)
 
 void HTMLInputElement::updateType()
 {
-<<<<<<< HEAD
-    const AtomicString& typeString = fastGetAttribute(typeAttr);
-
-    OwnPtr<InputType> newType = InputType::create(this, typeString);
+    OwnPtr<InputType> newType = InputType::create(this, fastGetAttribute(typeAttr));
 #ifdef ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS
     if (newType->isPasswordField() && document()->focusedNode() == this)
         PlatformBridge::updateTextfield(document()->view(), this, true, String());
 #endif
-=======
-    OwnPtr<InputType> newType = InputType::create(this, fastGetAttribute(typeAttr));
     bool hadType = m_hasType;
     m_hasType = true;
     if (m_inputType->formControlType() == newType->formControlType())
         return;
->>>>>>> WebKit.org at r84325
 
     if (hadType && !newType->canChangeFromAnotherType()) {
         // Set the attribute back to the old value.
diff --git a/Source/WebCore/html/RangeInputType.h b/Source/WebCore/html/RangeInputType.h
index b7af291..358a638 100644
--- a/Source/WebCore/html/RangeInputType.h
+++ b/Source/WebCore/html/RangeInputType.h
@@ -69,14 +69,12 @@ private:
     virtual String fallbackValue();
     virtual String sanitizeValue(const String& proposedValue);
     virtual bool shouldRespectListAttribute();
-<<<<<<< HEAD
+
+    SliderThumbElement* shadowSliderThumb() const;
+
 #if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS)
     virtual void handleTouchStartEvent(TouchEvent*);
 #endif
-=======
-
-    SliderThumbElement* shadowSliderThumb() const;
->>>>>>> WebKit.org at r84325
 };
 
 } // namespace WebCore
diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h
index 4e6b45e..ce664ac 100644
--- a/Source/WebCore/page/ChromeClient.h
+++ b/Source/WebCore/page/ChromeClient.h
@@ -308,11 +308,6 @@ namespace WebCore {
 
         virtual void didCompleteRubberBandForMainFrame(const IntSize&) const { }
 
-<<<<<<< HEAD
-#if ENABLE(ANDROID_INSTALLABLE_WEB_APPS)
-        virtual void webAppCanBeInstalled() = 0;
-#endif
-=======
         enum DialogType {
             AlertDialog = 0,
             ConfirmDialog = 1,
@@ -321,7 +316,10 @@ namespace WebCore {
             NumDialogTypes = 4
         };
         virtual void willRunModalDialogDuringPageDismissal(const DialogType&) const { }
->>>>>>> WebKit.org at r84325
+
+#if ENABLE(ANDROID_INSTALLABLE_WEB_APPS)
+        virtual void webAppCanBeInstalled() = 0;
+#endif
 
     protected:
         virtual ~ChromeClient() { }
diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp
index d5ba4de..e77809c 100644
--- a/Source/WebCore/page/EventHandler.cpp
+++ b/Source/WebCore/page/EventHandler.cpp
@@ -2905,18 +2905,9 @@ void EventHandler::defaultTextInputEventHandler(TextEvent* event)
         event->setDefaultHandled();
 }
 
-<<<<<<< HEAD
-#if PLATFORM(QT) || PLATFORM(MAC) || PLATFORM(ANDROID)
-
-// These two platforms handle the space event in the platform-specific WebKit code.
-// Eventually it would be good to eliminate that and use the code here instead, but
-// the Qt version is inside an ifdef and the Mac version has some extra behavior
-// so we can't unify everything yet.
-=======
-#if PLATFORM(QT)
+#if PLATFORM(QT) || PLATFORM(ANDROID)
 // Qt handles the space event in platform-specific WebKit code.
 // Eventually it would be good to eliminate that and use the code here instead.
->>>>>>> WebKit.org at r84325
 void EventHandler::defaultSpaceEventHandler(KeyboardEvent*)
 {
 }
diff --git a/Source/WebCore/page/Settings.cpp b/Source/WebCore/page/Settings.cpp
index f272325..1136371 100644
--- a/Source/WebCore/page/Settings.cpp
+++ b/Source/WebCore/page/Settings.cpp
@@ -176,7 +176,7 @@ Settings::Settings(Page* page)
     , m_crossOriginCheckInGetMatchedCSSRulesDisabled(false)
     , m_useQuickLookResourceCachingQuirks(false)
     , m_forceCompositingMode(false)
-<<<<<<< HEAD
+    , m_shouldInjectUserScriptsInInitialEmptyDocument(false)
 #ifdef ANDROID_LAYOUT
     , m_useWideViewport(false)
 #endif
@@ -192,9 +192,6 @@ Settings::Settings(Page* page)
 #ifdef ANDROID_PLUGINS
     , m_pluginsOnDemand(false)
 #endif
-=======
-    , m_shouldInjectUserScriptsInInitialEmptyDocument(false)
->>>>>>> WebKit.org at r84325
 {
     // A Frame may not have been created yet, so we initialize the AtomicString 
     // hash before trying to use it.
diff --git a/Source/WebCore/page/Settings.h b/Source/WebCore/page/Settings.h
index 8aedd77..31a5ad9 100644
--- a/Source/WebCore/page/Settings.h
+++ b/Source/WebCore/page/Settings.h
@@ -109,18 +109,11 @@ namespace WebCore {
         void setLoadsImagesAutomatically(bool);
         bool loadsImagesAutomatically() const { return m_loadsImagesAutomatically; }
 
-<<<<<<< HEAD
-#ifdef ANDROID_BLOCK_NETWORK_IMAGE
-        void setBlockNetworkImage(bool);
-        bool blockNetworkImage() const { return m_blockNetworkImage; }
-#endif
-=======
         // This setting only affects site icon image loading if loadsImagesAutomatically setting is false and this setting is true.
         // All other permutations still heed loadsImagesAutomatically setting.
         void setLoadsSiteIconsIgnoringImageLoadingSetting(bool);
         bool loadsSiteIconsIgnoringImageLoadingSetting() const { return m_loadsSiteIconsIgnoringImageLoadingSetting; }
 
->>>>>>> WebKit.org at r84325
         void setJavaScriptEnabled(bool);
         // Instead of calling isJavaScriptEnabled directly, please consider calling
         // ScriptController::canExecuteScripts, which takes things like the
@@ -470,6 +463,11 @@ namespace WebCore {
         bool autoFillEnabled() { return m_autoFillEnabled; }
 #endif
 
+#ifdef ANDROID_BLOCK_NETWORK_IMAGE
+        void setBlockNetworkImage(bool);
+        bool blockNetworkImage() const { return m_blockNetworkImage; }
+#endif
+
     private:
         Page* m_page;
 
@@ -589,7 +587,7 @@ namespace WebCore {
         bool m_crossOriginCheckInGetMatchedCSSRulesDisabled : 1;
         bool m_useQuickLookResourceCachingQuirks : 1;
         bool m_forceCompositingMode : 1;
-<<<<<<< HEAD
+        bool m_shouldInjectUserScriptsInInitialEmptyDocument : 1;
 #ifdef ANDROID_META_SUPPORT
         // default is yes
         bool m_viewport_user_scalable : 1;
@@ -619,9 +617,6 @@ namespace WebCore {
 #ifdef ANDROID_PLUGINS
         bool m_pluginsOnDemand : 1;
 #endif
-=======
-        bool m_shouldInjectUserScriptsInInitialEmptyDocument : 1;
->>>>>>> WebKit.org at r84325
 
 #if USE(SAFARI_THEME)
         static bool gShouldPaintNativeControls;
diff --git a/Source/WebCore/platform/graphics/Gradient.cpp b/Source/WebCore/platform/graphics/Gradient.cpp
index 4edb4bd..7541646 100644
--- a/Source/WebCore/platform/graphics/Gradient.cpp
+++ b/Source/WebCore/platform/graphics/Gradient.cpp
@@ -221,11 +221,7 @@ void Gradient::setGradientSpaceTransform(const AffineTransform& gradientSpaceTra
     setPlatformGradientSpaceTransform(gradientSpaceTransformation);
 }
 
-<<<<<<< HEAD
-#if !(USE(SKIA) && !PLATFORM(ANDROID)) && !PLATFORM(CAIRO)
-=======
-#if !USE(SKIA) && !USE(CAIRO)
->>>>>>> WebKit.org at r84325
+#if !(USE(SKIA) && !PLATFORM(ANDROID)) && !USE(CAIRO)
 void Gradient::setPlatformGradientSpaceTransform(const AffineTransform&)
 {
 }
diff --git a/Source/WebCore/platform/graphics/GraphicsContext.cpp b/Source/WebCore/platform/graphics/GraphicsContext.cpp
index ddaf938..65cc6df 100644
--- a/Source/WebCore/platform/graphics/GraphicsContext.cpp
+++ b/Source/WebCore/platform/graphics/GraphicsContext.cpp
@@ -678,11 +678,7 @@ void GraphicsContext::setPlatformStrokePattern(Pattern*)
 }
 #endif
 
-<<<<<<< HEAD
-#if !PLATFORM(CG) && !(USE(SKIA) && !PLATFORM(ANDROID))
-=======
-#if !USE(CG) && !USE(SKIA)
->>>>>>> WebKit.org at r84325
+#if !USE(CG) && !(USE(SKIA) && !PLATFORM(ANDROID))
 // Implement this if you want to go ahead and push the drawing mode into your native context
 // immediately.
 void GraphicsContext::setPlatformTextDrawingMode(TextDrawingModeFlags mode)
@@ -690,11 +686,7 @@ void GraphicsContext::setPlatformTextDrawingMode(TextDrawingModeFlags mode)
 }
 #endif
 
-<<<<<<< HEAD
-#if !PLATFORM(QT) && !PLATFORM(CAIRO) && !(USE(SKIA) && !PLATFORM(ANDROID)) && !PLATFORM(HAIKU) && !PLATFORM(OPENVG)
-=======
-#if !PLATFORM(QT) && !USE(CAIRO) && !USE(SKIA) && !PLATFORM(HAIKU) && !PLATFORM(OPENVG)
->>>>>>> WebKit.org at r84325
+#if !PLATFORM(QT) && !USE(CAIRO) && !(USE(SKIA) && !PLATFORM(ANDROID)) && !PLATFORM(HAIKU) && !PLATFORM(OPENVG)
 void GraphicsContext::setPlatformStrokeStyle(StrokeStyle)
 {
 }
diff --git a/Source/WebCore/plugins/PluginView.h b/Source/WebCore/plugins/PluginView.h
index e2dbb49..976c65c 100644
--- a/Source/WebCore/plugins/PluginView.h
+++ b/Source/WebCore/plugins/PluginView.h
@@ -438,11 +438,7 @@ public:
 
 private:
 
-<<<<<<< HEAD
-#if defined(XP_UNIX) || OS(SYMBIAN) || defined(ANDROID_PLUGINS)
-=======
-#if defined(XP_UNIX) || OS(SYMBIAN) || PLATFORM(GTK)
->>>>>>> WebKit.org at r84325
+#if defined(XP_UNIX) || OS(SYMBIAN) || PLATFORM(GTK) || defined(ANDROID_PLUGINS)
         void setNPWindowIfNeeded();
 #elif defined(XP_MACOSX)
         NP_CGContext m_npCgContext;
diff --git a/Source/WebCore/rendering/RenderBox.h b/Source/WebCore/rendering/RenderBox.h
index f8aee06..1bee989 100644
--- a/Source/WebCore/rendering/RenderBox.h
+++ b/Source/WebCore/rendering/RenderBox.h
@@ -398,13 +398,11 @@ public:
     IntRect logicalLayoutOverflowRectForPropagation(RenderStyle*) const;
     IntRect layoutOverflowRectForPropagation(RenderStyle*) const;
 
-<<<<<<< HEAD
+    RenderOverflow* hasRenderOverflow() const { return m_overflow.get(); }
+
 #ifdef ANDROID_LAYOUT
     int getVisibleWidth() const { return m_visibleWidth; }
 #endif
-=======
-    RenderOverflow* hasRenderOverflow() const { return m_overflow.get(); }
->>>>>>> WebKit.org at r84325
 
 protected:
     virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle);
diff --git a/Source/WebCore/rendering/RenderIFrame.cpp b/Source/WebCore/rendering/RenderIFrame.cpp
index 1468acd..a471b0e 100644
--- a/Source/WebCore/rendering/RenderIFrame.cpp
+++ b/Source/WebCore/rendering/RenderIFrame.cpp
@@ -124,39 +124,4 @@ void RenderIFrame::layout()
     setNeedsLayout(false);
 }
 
-<<<<<<< HEAD
-#if USE(ACCELERATED_COMPOSITING)
-bool RenderIFrame::requiresLayer() const
-{
-    if (RenderPart::requiresLayer())
-        return true;
-    
-    return requiresAcceleratedCompositing();
-}
-
-bool RenderIFrame::requiresAcceleratedCompositing() const
-{
-    if (!node() || !node()->hasTagName(iframeTag))
-        return false;
-
-#if PLATFORM(ANDROID)
-    // XXX: Bug submitted to webkit.org
-    // https://bugs.webkit.org/show_bug.cgi?id=52655
-    if (style()->visibility() != VISIBLE)
-        return false;
-#endif
-
-    // If the contents of the iframe are composited, then we have to be as well.
-    HTMLIFrameElement* element = static_cast<HTMLIFrameElement*>(node());
-    if (Document* contentDocument = element->contentDocument()) {
-        if (RenderView* view = contentDocument->renderView())
-            return view->usesCompositing();
-    }
-
-    return false;
-}
-#endif
-
-=======
->>>>>>> WebKit.org at r84325
 }
diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp
index da82996..4676c91 100644
--- a/Source/WebCore/rendering/RenderLayer.cpp
+++ b/Source/WebCore/rendering/RenderLayer.cpp
@@ -3416,8 +3416,7 @@ void RenderLayer::calculateClipRects(const RenderLayer* rootLayer, ClipRects& cl
         }
         
         if (renderer()->hasOverflowClip()) {
-<<<<<<< HEAD
-            IntRect newOverflowClip = toRenderBox(renderer())->overflowClipRect(x, y);
+            IntRect newOverflowClip = toRenderBox(renderer())->overflowClipRect(x, y, relevancy);
 #if ENABLE(ANDROID_OVERFLOW_SCROLL)
             clipRects.setHitTestClip(intersection(clipRects.fixed() ? clipRects.fixedClipRect()
                     : newOverflowClip, clipRects.hitTestClip()));
@@ -3428,9 +3427,6 @@ void RenderLayer::calculateClipRects(const RenderLayer* rootLayer, ClipRects& cl
                             m_scrollWidth, m_scrollHeight);
             }
 #endif
-=======
-            IntRect newOverflowClip = toRenderBox(renderer())->overflowClipRect(x, y, relevancy);
->>>>>>> WebKit.org at r84325
             clipRects.setOverflowClipRect(intersection(newOverflowClip, clipRects.overflowClipRect()));
             if (renderer()->isPositioned() || renderer()->isRelPositioned())
                 clipRects.setPosClipRect(intersection(newOverflowClip, clipRects.posClipRect()));
diff --git a/Source/WebCore/rendering/RenderLayer.h b/Source/WebCore/rendering/RenderLayer.h
index 4cf96ce..2174920 100644
--- a/Source/WebCore/rendering/RenderLayer.h
+++ b/Source/WebCore/rendering/RenderLayer.h
@@ -287,14 +287,6 @@ public:
     int horizontalScrollbarHeight(OverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize) const;
 
     bool hasOverflowControls() const;
-<<<<<<< HEAD
-#if ENABLE(ANDROID_OVERFLOW_SCROLL)
-    bool hasOverflowScroll() const { return m_hasOverflowScroll; }
-    bool hasOverflowParent() const;
-#endif
-    void positionOverflowControls(int tx, int ty);
-=======
->>>>>>> WebKit.org at r84325
     bool isPointInResizeControl(const IntPoint& absolutePoint) const;
     bool hitTestOverflowControls(HitTestResult&, const IntPoint& localPoint);
     IntSize offsetFromResizeCorner(const IntPoint& absolutePoint) const;
@@ -502,6 +494,11 @@ public:
     bool containsDirtyOverlayScrollbars() const { return m_containsDirtyOverlayScrollbars; }
     void setContainsDirtyOverlayScrollbars(bool dirtyScrollbars) { m_containsDirtyOverlayScrollbars = dirtyScrollbars; }
 
+#if ENABLE(ANDROID_OVERFLOW_SCROLL)
+    bool hasOverflowScroll() const { return m_hasOverflowScroll; }
+    bool hasOverflowParent() const;
+#endif
+
 private:
     // The normal operator new is disallowed on all render objects.
     void* operator new(size_t) throw();
diff --git a/Source/WebCore/rendering/RenderLayerBacking.cpp b/Source/WebCore/rendering/RenderLayerBacking.cpp
index 63b1d20..6f56eca 100644
--- a/Source/WebCore/rendering/RenderLayerBacking.cpp
+++ b/Source/WebCore/rendering/RenderLayerBacking.cpp
@@ -1207,28 +1207,8 @@ void RenderLayerBacking::paintIntoLayer(RenderLayer* rootLayer, GraphicsContext*
 
 static void paintScrollbar(Scrollbar* scrollbar, GraphicsContext& context, const IntRect& clip)
 {
-<<<<<<< HEAD
-    InspectorInstrumentationCookie cookie = InspectorInstrumentation::willPaint(m_owningLayer->renderer()->frame(), clip);
-
-    IntSize offset = graphicsLayer->offsetFromRenderer();
-    context.translate(-offset);
-
-    IntRect clipRect(clip);
-    clipRect.move(offset);
-    
-    // The dirtyRect is in the coords of the painting root.
-    IntRect dirtyRect = compositedBounds();
-#if ENABLE(ANDROID_OVERFLOW_SCROLL)
-    // If we encounter a scrollable layer, layers inside the scrollable layer
-    // will need their entire content recorded.
-    if (m_owningLayer->hasOverflowParent())
-        dirtyRect.setSize(clip.size());
-#endif
-    dirtyRect.intersect(clipRect);
-=======
     if (!scrollbar)
         return;
->>>>>>> WebKit.org at r84325
 
     context.save();
     const IntRect& scrollbarRect = scrollbar->frameRect();
@@ -1255,6 +1235,13 @@ void RenderLayerBacking::paintContents(const GraphicsLayer* graphicsLayer, Graph
         IntRect dirtyRect = compositedBounds();
         dirtyRect.intersect(clipRect);
 
+#if ENABLE(ANDROID_OVERFLOW_SCROLL)
+        // If we encounter a scrollable layer, layers inside the scrollable layer
+        // will need their entire content recorded.
+        if (m_owningLayer->hasOverflowParent())
+            dirtyRect.setSize(clip.size());
+#endif
+
         // We have to use the same root as for hit testing, because both methods can compute and cache clipRects.
         paintIntoLayer(m_owningLayer, &context, dirtyRect, PaintBehaviorNormal, paintingPhase, renderer());
 
diff --git a/Source/WebCore/rendering/RenderPart.cpp b/Source/WebCore/rendering/RenderPart.cpp
index 59b9795..4b74176 100644
--- a/Source/WebCore/rendering/RenderPart.cpp
+++ b/Source/WebCore/rendering/RenderPart.cpp
@@ -80,6 +80,13 @@ bool RenderPart::requiresAcceleratedCompositing() const
     if (!node() || !node()->isFrameOwnerElement())
         return false;
 
+#if PLATFORM(ANDROID)
+    // FIXME: Upstream this to webkit.org
+    // https://bugs.webkit.org/show_bug.cgi?id=52655
+    if (style()->visibility() != VISIBLE)
+        return false;
+#endif
+
     HTMLFrameOwnerElement* element = static_cast<HTMLFrameOwnerElement*>(node());
     if (Document* contentDocument = element->contentDocument()) {
         if (RenderView* view = contentDocument->renderView())