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

1 files changed, 23 insertions, 30 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
 
 }