Merge webkit.org at r58033 : Resolve merge conflicts

- CanvasRenderingContext2D.cpp - Take upstream, conflict due to cherry-pick of security fix, see 285b474734e82bc42b25e48ea4824f8050badb4f
- CanvasSurface.cpp, HTMLCanvasElement.cpp - convertLogicalToDevice has been refactored. See http://trac.webkit.org/changeset/56447
- Chrome.cpp/h, ChromeClient.h - Take upstream, conflict due to cherry-pick of cancelling Geolocation permission request
- Document.h - Take both, conflicts due to ANDROID_META_SUPPORT
- DragImage.h - Take both, conflict due to Android addition
- EmptyClients.h - Take upstream, conflicts due to Geo cancel permission request
- EventHandler.cpp - Take both, conflicts due to recently upstreamed touch events and ANDROID_PLUGINS
- EventHandler.cpp - Keep ours, conflict due to touch event bug fixes not yet upstreamed. See 7f034a1734d634dd1fdb3b64817d5828b5e46922 and 73adc26dba4be1d9da34a7f0907cb7b12f10c909
- FileSystemPOSIX - Take both, conflict due to ANDROID_PLUGINS
- FrameLoader.cpp - Take both, conflct due to ANDROID_BLOCK_NETWORK_IMAGE
- FrameView.cpp - Take both, conflict due to Android frame flattening
- Geolocation.h - Merge conflicts due to Android-specific changes
- Geolocation.cpp - Take upstream, conflict due to addition of Geolocation maximumAge
- GeolocationPositionCache.cpp - Take upstream, conflict due to addition of ENABLE_GEOLOCATION guards
- Gradient.h - Take both, conflict due to Android addition
- HTMLLinkElement.cpp, DocLoader.cpp - Take both, conflict due to new link prefetching not yet upstreamed. See f91ac8eab3399adb5325701bebe0590a77e49df7
- HTMLMetaElement.cpp - Take both, conflict due to recently upstreamed meta element
- JavaInstanceJSC.cpp - Take both, conflict due to Android additional logging
- MediaPlayer.cpp/h - Take both, conflict due to Android-specific change
- PlatformTouchPoint.h - Take upstream, conflict due to recently upstreamed unsigned stuff
- RenderFrame.cpp, RenderFrameSet.h - Take both, conflict due to Android frameset flattening
- RenderLayerCompositor.cpp - Take both, conflicts due to Android layers code
- Settings.cpp/h - Conflict due to ANDROID_PLUGINS
- TextInputController.h - Take upstream, git got confused
- V8DOMWindowShell.cpp - Take upstream, conflict due to cherry-pick of method to add V8 bindings for page cache, see 8fecd9c9a62aa89fb44ed3142ba583dc7b8cbe29
- V8DOMWraper.cpp - Take upstream, conflict due to recently upstreamed WORKERS guards
- WebCore.xcodeproj - Take upstream, conflict due to addition of Geolocation maximumAge
- Widget.h - Take both, conflict due to Android addition
- jsc/JNIUtilityPrivate.cpp - Take upstream, conflict due to switching from bzero to memset
- mac/WebCoreSupport/WebChromeCient.h - Take upstream, conflicts due to Geo cancel permission request

Change-Id: I1b75eac220faddf2f84c7fd4fd3436a5e07edf64

34 files changed, 59 insertions, 605 deletions

diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 7f62b04..fe6d457 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -1151,8 +1151,6 @@
 		59EE122E1106080F00885116 /* JNIUtilityPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EE122D1106080F00885116 /* JNIUtilityPrivate.h */; };
 		59EE12301106081F00885116 /* JNIUtility.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59EE122F1106081F00885116 /* JNIUtility.cpp */; };
 		59EE12321106082900885116 /* JNIUtility.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EE12311106082900885116 /* JNIUtility.h */; };
-		59FD5B8B1129B29100DB6D96 /* GeolocationPositionCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59FD5B8A1129B29100DB6D96 /* GeolocationPositionCache.cpp */; };
-		59FD5B8D1129B29F00DB6D96 /* GeolocationPositionCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 59FD5B8C1129B29F00DB6D96 /* GeolocationPositionCache.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		5D15E3AB0F9E6AC1009E0E3F /* XMLTokenizerScope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D15E3A90F9E6AC1009E0E3F /* XMLTokenizerScope.cpp */; };
 		5D15E3AC0F9E6AC1009E0E3F /* XMLTokenizerScope.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D15E3AA0F9E6AC1009E0E3F /* XMLTokenizerScope.h */; };
 		5D874F130D161D3200796C3B /* NetscapePlugInStreamLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93E227DD0AF589AD00D48324 /* NetscapePlugInStreamLoader.cpp */; };
@@ -6652,8 +6650,6 @@
 		59EE122D1106080F00885116 /* JNIUtilityPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JNIUtilityPrivate.h; path = jsc/JNIUtilityPrivate.h; sourceTree = "<group>"; };
 		59EE122F1106081F00885116 /* JNIUtility.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JNIUtility.cpp; sourceTree = "<group>"; };
 		59EE12311106082900885116 /* JNIUtility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JNIUtility.h; sourceTree = "<group>"; };
-		59FD5B8A1129B29100DB6D96 /* GeolocationPositionCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GeolocationPositionCache.cpp; sourceTree = "<group>"; };
-		59FD5B8C1129B29F00DB6D96 /* GeolocationPositionCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeolocationPositionCache.h; sourceTree = "<group>"; };
 		5D15E3A90F9E6AC1009E0E3F /* XMLTokenizerScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XMLTokenizerScope.cpp; sourceTree = "<group>"; };
 		5D15E3AA0F9E6AC1009E0E3F /* XMLTokenizerScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLTokenizerScope.h; sourceTree = "<group>"; };
 		5D925B650F64D4DD00B847F0 /* ScrollBehavior.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollBehavior.cpp; sourceTree = "<group>"; };
@@ -11639,8 +11635,6 @@
 		65BF02180974806300C43196 /* page */ = {
 			isa = PBXGroup;
 			children = (
-				59FD5B8C1129B29F00DB6D96 /* GeolocationPositionCache.h */,
-				59FD5B8A1129B29100DB6D96 /* GeolocationPositionCache.cpp */,
 				316FE1060E6E1D8400BF6088 /* animation */,
 				93C09A820B064F05005ABD4D /* mac */,
 				8538F0000AD71770006A81D1 /* AbstractView.idl */,
@@ -18841,19 +18835,6 @@
 				93F199ED08245E59001E9ABC /* XSLTProcessor.h in Headers */,
 				E1BE512E0CF6C512002EA959 /* XSLTUnicodeSort.h in Headers */,
 				97DD4D870FDF4D6E00ECF9A4 /* XSSAuditor.h in Headers */,
-<<<<<<< HEAD
-				84D0C4061115F1EA0018AA34 /* AffineTransform.h in Headers */,
-				B71FE6DF11091CB300DAEF77 /* PrintContext.h in Headers */,
-				9F72304F11184B4100AD0126 /* ScriptProfile.h in Headers */,
-				9F72305111184B4100AD0126 /* ScriptProfiler.h in Headers */,
-				59FD5B8D1129B29F00DB6D96 /* GeolocationPositionCache.h in Headers */,
-				BCE789161120D6080060ECE5 /* InlineIterator.h in Headers */,
-				BCE789861120E7A60060ECE5 /* BidiRun.h in Headers */,
-				9F6FC1971122E82A00E80196 /* ScriptDebugServer.h in Headers */,
-				931BCC611124DFCB00BE70DD /* MediaCanStartListener.h in Headers */,
-				9F2A322C1125A0A2003C3056 /* JavaScriptProfile.h in Headers */,
-				9F2A322E1125A0A2003C3056 /* JavaScriptProfileNode.h in Headers */,
-=======
 				CE172E011136E8CE0062A533 /* ZoomMode.h in Headers */,
 				FAA10571114C2DF700940A01 /* RenderMathMLFraction.h in Headers */,
 				A43BF5991149290A00C643CA /* HTMLProgressElement.h in Headers */,
@@ -18888,7 +18869,6 @@
 				CEF418CF1179678C009D112C /* ViewportArguments.h in Headers */,
 				0FD3080F117CF7E700A791F7 /* RenderFrameBase.h in Headers */,
 				0FD308D6117D168500A791F7 /* RenderIFrame.h in Headers */,
->>>>>>> webkit.org at r58033
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -21100,19 +21080,6 @@
 				93F19B0508245E59001E9ABC /* XSLTProcessorLibxslt.cpp in Sources */,
 				E1BE512D0CF6C512002EA959 /* XSLTUnicodeSort.cpp in Sources */,
 				97DD4D860FDF4D6E00ECF9A4 /* XSSAuditor.cpp in Sources */,
-<<<<<<< HEAD
-				84D0C4041115F1D40018AA34 /* AffineTransform.cpp in Sources */,
-				B776D43D1104527500BEB0EC /* PrintContext.cpp in Sources */,
-				9F72305011184B4100AD0126 /* ScriptProfiler.cpp in Sources */,
-				59FD5B8B1129B29100DB6D96 /* GeolocationPositionCache.cpp in Sources */,
-				BCE7898B1120E8020060ECE5 /* BidiRun.cpp in Sources */,
-				9F6FC1961122E82A00E80196 /* ScriptDebugServer.cpp in Sources */,
-				76FF17E311235673001D61B5 /* PluginViewNone.cpp in Sources */,
-				9F2A322B1125A0A2003C3056 /* JavaScriptProfile.cpp in Sources */,
-				9F2A322D1125A0A2003C3056 /* JavaScriptProfileNode.cpp in Sources */,
-				6E21C6C01126338500A7BE02 /* GraphicsContext3D.cpp in Sources */,
-				6E21C6C21126339900A7BE02 /* GraphicsContext3DCG.cpp in Sources */,
-=======
 				FAA10570114C2DF700940A01 /* RenderMathMLFraction.cpp in Sources */,
 				A43BF5981149290A00C643CA /* HTMLProgressElement.cpp in Sources */,
 				A43BF59C1149292800C643CA /* RenderProgress.cpp in Sources */,
@@ -21138,7 +21105,6 @@
 				0FD3080E117CF7E700A791F7 /* RenderFrameBase.cpp in Sources */,
 				0FD308D5117D168500A791F7 /* RenderIFrame.cpp in Sources */,
 				973889A0116EA9DC00ADF313 /* DocumentWriter.cpp in Sources */,
->>>>>>> webkit.org at r58033
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/WebCore/bindings/v8/V8DOMWindowShell.cpp b/WebCore/bindings/v8/V8DOMWindowShell.cpp
index 6087479..c7c77d3 100644
--- a/WebCore/bindings/v8/V8DOMWindowShell.cpp
+++ b/WebCore/bindings/v8/V8DOMWindowShell.cpp
@@ -360,19 +360,6 @@ v8::Persistent<v8::Context> V8DOMWindowShell::createNewContext(v8::Handle<v8::Ob
 }
 
 void V8DOMWindowShell::setContext(v8::Handle<v8::Context> context)
-<<<<<<< HEAD
-{
-    // if we already have a context, clear it before setting the new one.
-    if (!m_context.IsEmpty()) {
-        m_context.Dispose();
-        m_context.Clear();
-    }
-    m_context = v8::Persistent<v8::Context>::New(context);
-}
-
-bool V8DOMWindowShell::installDOMWindow(v8::Handle<v8::Context> context, DOMWindow* window)
-=======
->>>>>>> webkit.org at r58033
 {
     // if we already have a context, clear it before setting the new one.
     if (!m_context.IsEmpty()) {
diff --git a/WebCore/bindings/v8/V8DOMWrapper.cpp b/WebCore/bindings/v8/V8DOMWrapper.cpp
index ac29170..b2eeeb4 100644
--- a/WebCore/bindings/v8/V8DOMWrapper.cpp
+++ b/WebCore/bindings/v8/V8DOMWrapper.cpp
@@ -161,11 +161,7 @@ v8::Local<v8::Function> V8DOMWrapper::getConstructor(WrapperTypeInfo* type, DOMW
 }
 
 #if ENABLE(WORKERS)
-<<<<<<< HEAD
-v8::Local<v8::Function> V8DOMWrapper::getConstructor(V8ClassIndex::V8WrapperType type, WorkerContext*)
-=======
 v8::Local<v8::Function> V8DOMWrapper::getConstructor(WrapperTypeInfo* type, WorkerContext*)
->>>>>>> webkit.org at r58033
 {
     WorkerScriptController* controller = WorkerScriptController::controllerForContext();
     WorkerContextExecutionProxy* proxy = controller ? controller->proxy() : 0;
@@ -179,8 +175,6 @@ v8::Local<v8::Function> V8DOMWrapper::getConstructor(WrapperTypeInfo* type, Work
     return getConstructorForContext(type, context);
 }
 #endif
-<<<<<<< HEAD
-=======
 
 void V8DOMWrapper::setHiddenReference(v8::Handle<v8::Object> parent, v8::Handle<v8::Value> child)
 {
@@ -192,7 +186,6 @@ void V8DOMWrapper::setHiddenReference(v8::Handle<v8::Object> parent, v8::Handle<
     v8::Local<v8::Array> hiddenReferenceArray = v8::Local<v8::Array>::Cast(hiddenReferenceObject);
     hiddenReferenceArray->Set(v8::Integer::New(hiddenReferenceArray->Length()), child);
 }
->>>>>>> webkit.org at r58033
 
 void V8DOMWrapper::setHiddenWindowReference(Frame* frame, v8::Handle<v8::Value> jsObject)
 {
@@ -236,22 +229,18 @@ PassRefPtr<NodeFilter> V8DOMWrapper::wrapNativeNodeFilter(v8::Handle<v8::Value>
 
 static bool globalObjectPrototypeIsDOMWindow(v8::Handle<v8::Object> objectPrototype)
 {
-#if ENABLE(SHARED_WORKERS)
     // We can identify what type of context the global object is wrapping by looking at the
     // internal field count of its prototype. This assumes WorkerContexts and DOMWindows have different numbers
     // of internal fields, so a COMPILE_ASSERT is included to warn if this ever changes.
 #if ENABLE(WORKERS)
     COMPILE_ASSERT(V8DOMWindow::internalFieldCount != V8WorkerContext::internalFieldCount,
         DOMWindowAndWorkerContextHaveUnequalFieldCounts);
-<<<<<<< HEAD
-=======
     COMPILE_ASSERT(V8DOMWindow::internalFieldCount != V8DedicatedWorkerContext::internalFieldCount,
         DOMWindowAndDedicatedWorkerContextHaveUnequalFieldCounts);
 #endif
 #if ENABLE(SHARED_WORKERS)
     COMPILE_ASSERT(V8DOMWindow::internalFieldCount != V8SharedWorkerContext::internalFieldCount,
         DOMWindowAndSharedWorkerContextHaveUnequalFieldCounts);
->>>>>>> webkit.org at r58033
 #endif
     return objectPrototype->InternalFieldCount() == V8DOMWindow::internalFieldCount;
 }
@@ -289,11 +278,7 @@ v8::Local<v8::Object> V8DOMWrapper::instantiateV8Object(V8Proxy* proxy, WrapperT
             function = getConstructor(type, workerContext);
         else
 #endif
-<<<<<<< HEAD
-            function = V8ClassIndex::getTemplate(type)->GetFunction();
-=======
             function = type->getTemplate()->GetFunction();
->>>>>>> webkit.org at r58033
         instance = SafeAllocation::newInstance(function);
     }
     if (!instance.IsEmpty()) {
@@ -437,70 +422,7 @@ v8::Handle<v8::Value> V8DOMWrapper::convertEventTargetToV8Object(EventTarget* ta
     return notHandledByInterceptor();
 }
 
-<<<<<<< HEAD
-PassRefPtr<EventListener> V8DOMWrapper::getEventListener(Node* node, v8::Local<v8::Value> value, bool isAttribute, ListenerLookupType lookup)
-{
-    return (lookup == ListenerFindOnly) ? V8EventListenerList::findWrapper(value, isAttribute) : V8EventListenerList::findOrCreateWrapper<V8EventListener>(value, isAttribute);
-}
-
-#if ENABLE(SVG)
-PassRefPtr<EventListener> V8DOMWrapper::getEventListener(SVGElementInstance* element, v8::Local<v8::Value> value, bool isAttribute, ListenerLookupType lookup)
-{
-    return getEventListener(element->correspondingElement(), value, isAttribute, lookup);
-}
-#endif
-
-// ANDROID
-// Temporary fix until we merge http://trac.webkit.org/changeset/55096
-#if ENABLE(WORKERS)
-PassRefPtr<EventListener> V8DOMWrapper::getEventListener(AbstractWorker* worker, v8::Local<v8::Value> value, bool isAttribute, ListenerLookupType lookup)
-{
-    if (worker->scriptExecutionContext()->isWorkerContext()) {
-        WorkerContextExecutionProxy* workerContextProxy = WorkerContextExecutionProxy::retrieve();
-        ASSERT(workerContextProxy);
-        return workerContextProxy->findOrCreateEventListener(value, isAttribute, lookup == ListenerFindOnly);
-    }
-
-    return (lookup == ListenerFindOnly) ? V8EventListenerList::findWrapper(value, isAttribute) : V8EventListenerList::findOrCreateWrapper<V8EventListener>(value, isAttribute);
-}
-#endif
-
-#if ENABLE(NOTIFICATIONS)
-PassRefPtr<EventListener> V8DOMWrapper::getEventListener(Notification* notification, v8::Local<v8::Value> value, bool isAttribute, ListenerLookupType lookup)
-{
-    if (notification->scriptExecutionContext()->isWorkerContext()) {
-        WorkerContextExecutionProxy* workerContextProxy = WorkerContextExecutionProxy::retrieve();
-        ASSERT(workerContextProxy);
-        return workerContextProxy->findOrCreateEventListener(value, isAttribute, lookup == ListenerFindOnly);
-    }
-
-    return (lookup == ListenerFindOnly) ? V8EventListenerList::findWrapper(value, isAttribute) : V8EventListenerList::findOrCreateWrapper<V8EventListener>(value, isAttribute);
-}
-#endif
-
-// ANDROID
-// Temporary fix until we merge http://trac.webkit.org/changeset/55096
-#if ENABLE(WORKERS)
-PassRefPtr<EventListener> V8DOMWrapper::getEventListener(WorkerContext* workerContext, v8::Local<v8::Value> value, bool isAttribute, ListenerLookupType lookup)
-{
-    WorkerContextExecutionProxy* workerContextProxy = workerContext->script()->proxy();
-    if (workerContextProxy)
-        return workerContextProxy->findOrCreateEventListener(value, isAttribute, lookup == ListenerFindOnly);
-
-    return 0;
-}
-#endif
-
-PassRefPtr<EventListener> V8DOMWrapper::getEventListener(XMLHttpRequestUpload* upload, v8::Local<v8::Value> value, bool isAttribute, ListenerLookupType lookup)
-{
-    return getEventListener(upload->associatedXMLHttpRequest(), value, isAttribute, lookup);
-}
-
-#if ENABLE(EVENTSOURCE)
-PassRefPtr<EventListener> V8DOMWrapper::getEventListener(EventSource* eventSource, v8::Local<v8::Value> value, bool isAttribute, ListenerLookupType lookup)
-=======
 PassRefPtr<EventListener> V8DOMWrapper::getEventListener(v8::Local<v8::Value> value, bool isAttribute, ListenerLookupType lookup)
->>>>>>> webkit.org at r58033
 {
     v8::Handle<v8::Context> context = v8::Context::GetCurrent();
     if (context.IsEmpty())
diff --git a/WebCore/bridge/jni/jsc/JNIUtilityPrivate.cpp b/WebCore/bridge/jni/jsc/JNIUtilityPrivate.cpp
index 69782f3..4702d12 100644
--- a/WebCore/bridge/jni/jsc/JNIUtilityPrivate.cpp
+++ b/WebCore/bridge/jni/jsc/JNIUtilityPrivate.cpp
@@ -250,13 +250,7 @@ jvalue convertValueToJValue(ExecState* exec, RootObject* rootObject, JSValue val
                     jobject javaString = env->functions->NewString(env, (const jchar*)stringValue.data(), stringValue.size());
                     result.l = javaString;
                 }
-<<<<<<< HEAD
-            } else if (!result.l)
-                // ANDROID
-                memset(&result, 0, sizeof(jvalue)); // Handle it the same as a void case
-=======
             }
->>>>>>> webkit.org at r58033
         }
         break;
 
@@ -310,13 +304,6 @@ jvalue convertValueToJValue(ExecState* exec, RootObject* rootObject, JSValue val
 
     case invalid_type:
     case void_type:
-<<<<<<< HEAD
-        {
-            // ANDROID
-            memset(&result, 0, sizeof(jvalue));
-        }
-=======
->>>>>>> webkit.org at r58033
         break;
     }
     return result;
diff --git a/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp b/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp
index 666df54..039626f 100644
--- a/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp
+++ b/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp
@@ -41,27 +41,11 @@
 #include <runtime/Error.h>
 #include <runtime/JSLock.h>
 
-<<<<<<< HEAD
-#if PLATFORM(ANDROID)
-#include <assert.h>
-#endif
-
-#ifdef NDEBUG
-#define JS_LOG(formatAndArgs...) ((void)0)
-#else
-#define JS_LOG(formatAndArgs...) { \
-    fprintf(stderr, "%s:%d -- %s:  ", __FILE__, __LINE__, __FUNCTION__); \
-    fprintf(stderr, formatAndArgs); \
-}
-#endif
-
 #if PLATFORM(ANDROID)
 #include <cutils/log.h>
 #define LOG_TAG JavaInstanceJSC.cpp
 #endif
 
-=======
->>>>>>> webkit.org at r58033
 using namespace JSC::Bindings;
 using namespace JSC;
 using namespace WebCore;
@@ -379,15 +363,11 @@ JSValue JavaInstance::valueOf(ExecState* exec) const
 JObjectWrapper::JObjectWrapper(jobject instance)
     : m_refCount(0)
 {
-<<<<<<< HEAD
-    assert(instance);
+    ASSERT(instance);
 #if PLATFORM(ANDROID)
     if (!instance)
         LOGE("Attempted to create JObjectWrapper for null object");
 #endif
-=======
-    ASSERT(instance);
->>>>>>> webkit.org at r58033
 
     // Cache the JNIEnv used to get the global ref for this java instance.
     // It'll be used to delete the reference.
@@ -397,17 +377,12 @@ JObjectWrapper::JObjectWrapper(jobject instance)
 
     LOG(LiveConnect, "JObjectWrapper ctor new global ref %p for %p", m_instance, instance);
 
-<<<<<<< HEAD
-    if  (!m_instance)
+    if (!m_instance)
 #if PLATFORM(ANDROID)
         LOGE("%s:  could not get GlobalRef for %p\n", __PRETTY_FUNCTION__, instance);
 #else
-        fprintf(stderr, "%s:  could not get GlobalRef for %p\n", __PRETTY_FUNCTION__, instance);
-#endif
-=======
-    if (!m_instance)
         LOG_ERROR("Could not get GlobalRef for %p", instance);
->>>>>>> webkit.org at r58033
+#endif
 }
 
 JObjectWrapper::~JObjectWrapper()
diff --git a/WebCore/dom/CanvasSurface.cpp b/WebCore/dom/CanvasSurface.cpp
index dc7e4e1..3b0f397 100644
--- a/WebCore/dom/CanvasSurface.cpp
+++ b/WebCore/dom/CanvasSurface.cpp
@@ -47,7 +47,20 @@ const float CanvasSurface::MaxCanvasArea = 32768 * 8192; // Maximum canvas area
 
 CanvasSurface::CanvasSurface(float pageScaleFactor)
     : m_size(DefaultWidth, DefaultHeight)
+#if PLATFORM(ANDROID)
+    /* In Android we capture the drawing into a displayList, and then replay
+     * that list at various scale factors (sometimes zoomed out, other times
+     * zoomed in for "normal" reading, yet other times at arbitrary zoom values
+     * based on the user's choice). In all of these cases, we do not re-record
+     * the displayList, hence it is usually harmful to perform any pre-rounding,
+     * since we just don't know the actual drawing resolution at record time.
+     */
+    // TODO - may be better to move the ifdef to the call site of this
+    // constructor
+    , m_pageScaleFactor(1.0f)
+#else
     , m_pageScaleFactor(pageScaleFactor)
+#endif
     , m_originClean(true)
     , m_hasCreatedImageBuffer(false)
 {
diff --git a/WebCore/dom/Document.h b/WebCore/dom/Document.h
index 98d5764..6ac1f01 100644
--- a/WebCore/dom/Document.h
+++ b/WebCore/dom/Document.h
@@ -700,8 +700,8 @@ public:
      * @param content The header value (value of the meta tag's "content" attribute)
      */
     void processHttpEquiv(const String& equiv, const String& content);
-<<<<<<< HEAD
-    
+    void processViewport(const String& features);
+
 #ifdef ANDROID_META_SUPPORT
     /**
      * Handles viewport like <meta name = "viewport" content = "width = device-width">
@@ -709,9 +709,6 @@ public:
      */
     void processMetadataSettings(const String& content);
 #endif
-=======
-    void processViewport(const String& features);
->>>>>>> webkit.org at r58033
 
     // Returns the owning element in the parent document.
     // Returns 0 if this is the top level document.
diff --git a/WebCore/html/HTMLCanvasElement.cpp b/WebCore/html/HTMLCanvasElement.cpp
index 0b60949..ef85323 100644
--- a/WebCore/html/HTMLCanvasElement.cpp
+++ b/WebCore/html/HTMLCanvasElement.cpp
@@ -256,103 +256,6 @@ void HTMLCanvasElement::paint(GraphicsContext* context, const IntRect& r)
 #endif
 }
 
-<<<<<<< HEAD
-IntRect HTMLCanvasElement::convertLogicalToDevice(const FloatRect& logicalRect) const
-{
-    return IntRect(convertLogicalToDevice(logicalRect.location()), convertLogicalToDevice(logicalRect.size()));
-}
-
-IntSize HTMLCanvasElement::convertLogicalToDevice(const FloatSize& logicalSize) const
-{
-#if PLATFORM(ANDROID)
-    /*  In Android we capture the drawing into a displayList, and then
-        replay that list at various scale factors (sometimes zoomed out, other
-        times zoomed in for "normal" reading, yet other times at arbitrary
-        zoom values based on the user's choice). In all of these cases, we do
-        not re-record the displayList, hence it is usually harmful to perform
-        any pre-rounding, since we just don't know the actual drawing resolution
-        at record time.
-     */
-    float pageScaleFactor = 1.0f;
-#else
-    float pageScaleFactor = document()->frame() ? document()->frame()->page()->chrome()->scaleFactor() : 1.0f;
-#endif
-    float wf = ceilf(logicalSize.width() * pageScaleFactor);
-    float hf = ceilf(logicalSize.height() * pageScaleFactor);
-    
-    if (!(wf >= 1 && hf >= 1 && wf * hf <= MaxCanvasArea))
-        return IntSize();
-
-    return IntSize(static_cast<unsigned>(wf), static_cast<unsigned>(hf));
-}
-
-IntPoint HTMLCanvasElement::convertLogicalToDevice(const FloatPoint& logicalPos) const
-{
-#if PLATFORM(ANDROID)
-    /*  In Android we capture the drawing into a displayList, and then
-        replay that list at various scale factors (sometimes zoomed out, other
-        times zoomed in for "normal" reading, yet other times at arbitrary
-        zoom values based on the user's choice). In all of these cases, we do
-        not re-record the displayList, hence it is usually harmful to perform
-        any pre-rounding, since we just don't know the actual drawing resolution
-        at record time.
-     */
-    float pageScaleFactor = 1.0f;
-#else
-    float pageScaleFactor = document()->frame() ? document()->frame()->page()->chrome()->scaleFactor() : 1.0f;
-#endif
-    float xf = logicalPos.x() * pageScaleFactor;
-    float yf = logicalPos.y() * pageScaleFactor;
-    
-    return IntPoint(static_cast<unsigned>(xf), static_cast<unsigned>(yf));
-}
-
-void HTMLCanvasElement::createImageBuffer() const
-{
-    ASSERT(!m_imageBuffer);
-
-    m_createdImageBuffer = true;
-    
-    FloatSize unscaledSize(width(), height());
-    IntSize size = convertLogicalToDevice(unscaledSize);
-    if (!size.width() || !size.height())
-        return;
-
-    m_imageBuffer = ImageBuffer::create(size);
-    // The convertLogicalToDevice MaxCanvasArea check should prevent common cases
-    // where ImageBuffer::create() returns NULL, however we could still be low on memory.
-    if (!m_imageBuffer)
-        return;
-    m_imageBuffer->context()->scale(FloatSize(size.width() / unscaledSize.width(), size.height() / unscaledSize.height()));
-    m_imageBuffer->context()->setShadowsIgnoreTransforms(true);
-}
-
-GraphicsContext* HTMLCanvasElement::drawingContext() const
-{
-    return buffer() ? m_imageBuffer->context() : 0;
-}
-
-ImageBuffer* HTMLCanvasElement::buffer() const
-{
-    if (!m_createdImageBuffer)
-        createImageBuffer();
-    return m_imageBuffer.get();
-}
-    
-AffineTransform HTMLCanvasElement::baseTransform() const
-{
-    ASSERT(m_createdImageBuffer);
-    FloatSize unscaledSize(width(), height());
-    IntSize size = convertLogicalToDevice(unscaledSize);
-    AffineTransform transform;
-    if (size.width() && size.height())
-        transform.scaleNonUniform(size.width() / unscaledSize.width(), size.height() / unscaledSize.height());
-    transform.multiply(m_imageBuffer->baseTransform());
-    return transform;
-}
-
-=======
->>>>>>> webkit.org at r58033
 #if ENABLE(3D_CANVAS)    
 bool HTMLCanvasElement::is3D() const
 {
diff --git a/WebCore/html/HTMLLinkElement.cpp b/WebCore/html/HTMLLinkElement.cpp
index 7942e67..cf9419f 100644
--- a/WebCore/html/HTMLLinkElement.cpp
+++ b/WebCore/html/HTMLLinkElement.cpp
@@ -201,7 +201,6 @@ void HTMLLinkElement::process()
     if (m_rel.m_isIcon && m_url.isValid() && !m_url.isEmpty())
         document()->setIconURL(m_url.string(), type);
 
-<<<<<<< HEAD
 #ifdef ANDROID_APPLE_TOUCH_ICON
     if ((m_rel.m_isTouchIcon || m_rel.m_isPrecomposedTouchIcon) && m_url.isValid()
             && !m_url.isEmpty())
@@ -211,11 +210,7 @@ void HTMLLinkElement::process()
 #endif
 
     if (m_rel.m_isDNSPrefetch && m_url.isValid() && !m_url.isEmpty())
-        prefetchDNS(m_url.host());
-=======
-    if (m_isDNSPrefetch && m_url.isValid() && !m_url.isEmpty())
         ResourceHandle::prepareForURL(m_url);
->>>>>>> webkit.org at r58033
 
 #if ENABLE(LINK_PREFETCH)
     if (m_rel.m_isLinkPrefetch && m_url.isValid()) {
diff --git a/WebCore/html/HTMLMetaElement.cpp b/WebCore/html/HTMLMetaElement.cpp
index 35fd299..51bfac3 100644
--- a/WebCore/html/HTMLMetaElement.cpp
+++ b/WebCore/html/HTMLMetaElement.cpp
@@ -68,10 +68,10 @@ void HTMLMetaElement::insertedIntoDocument()
 
 void HTMLMetaElement::process()
 {
-<<<<<<< HEAD
-#ifdef ANDROID_META_SUPPORT
     if (!inDocument() || m_content.isNull())
         return;
+#ifdef ANDROID_META_SUPPORT
+    // TODO: Evaluate whether to take upstreamed meta support
     bool updateViewport = false;
     if (equalIgnoringCase(name(), "viewport")) {
         document()->processMetadataSettings(m_content);
@@ -92,15 +92,11 @@ void HTMLMetaElement::process()
         if (view)
             android::WebViewCore::getWebViewCore(view)->updateViewport();
     }
-#endif
-=======
-    if (!inDocument() || m_content.isNull())
-        return;
-
+#else
     if (equalIgnoringCase(name(), "viewport"))
         document()->processViewport(m_content);
+#endif
 
->>>>>>> webkit.org at r58033
     // Get the document to process the tag, but only if we're actually part of DOM tree (changing a meta tag while
     // it's not in the tree shouldn't have any effect on the document)
     if (!m_equiv.isNull())
diff --git a/WebCore/html/canvas/CanvasRenderingContext2D.cpp b/WebCore/html/canvas/CanvasRenderingContext2D.cpp
index 0baa0e6..3732487 100644
--- a/WebCore/html/canvas/CanvasRenderingContext2D.cpp
+++ b/WebCore/html/canvas/CanvasRenderingContext2D.cpp
@@ -1267,11 +1267,7 @@ PassRefPtr<CanvasPattern> CanvasRenderingContext2D::createPattern(HTMLImageEleme
     if (!cachedImage || !image->cachedImage()->image())
         return CanvasPattern::create(Image::nullImage(), repeatX, repeatY, true);
 
-<<<<<<< HEAD
-    bool originClean = !canvas()->document()->securityOrigin()->taintsCanvas(KURL(KURL(), cachedImage->url())) && cachedImage->image()->hasSingleSecurityOrigin();
-=======
     bool originClean = !canvas()->securityOrigin().taintsCanvas(KURL(KURL(), cachedImage->url())) && cachedImage->image()->hasSingleSecurityOrigin();
->>>>>>> webkit.org at r58033
     return CanvasPattern::create(cachedImage->image(), repeatX, repeatY, originClean);
 }
 
diff --git a/WebCore/loader/DocLoader.cpp b/WebCore/loader/DocLoader.cpp
index 6862616..6a0b3d1 100644
--- a/WebCore/loader/DocLoader.cpp
+++ b/WebCore/loader/DocLoader.cpp
@@ -43,13 +43,11 @@
 #include "loader.h"
 #include "SecurityOrigin.h"
 #include "Settings.h"
-<<<<<<< HEAD
+#include <wtf/text/CString.h>
+
 #if ENABLE(LINK_PREFETCH)
 #include "CachedLinkPrefetch.h"
 #endif
-=======
-#include <wtf/text/CString.h>
->>>>>>> webkit.org at r58033
 
 #define PRELOAD_DEBUG 0
 
diff --git a/WebCore/loader/EmptyClients.h b/WebCore/loader/EmptyClients.h
index 9c764b9..3147a3b 100644
--- a/WebCore/loader/EmptyClients.h
+++ b/WebCore/loader/EmptyClients.h
@@ -162,11 +162,7 @@ public:
     virtual void scrollRectIntoView(const IntRect&, const ScrollView*) const {}
 
     virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*) {}
-<<<<<<< HEAD
-    virtual void cancelGeolocationPermissionRequestForFrame(Frame*) {}
-=======
     virtual void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*) {}
->>>>>>> webkit.org at r58033
 
 #if USE(ACCELERATED_COMPOSITING)
     virtual void attachRootGraphicsLayer(Frame*, GraphicsLayer*) {};
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 5e592a5..63b00e8 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -832,16 +832,11 @@ void FrameLoader::didBeginDocument(bool dispatch)
 
     updateFirstPartyForCookies();
 
-<<<<<<< HEAD
-    Settings* settings = document->settings();
-    document->docLoader()->setAutoLoadImages(settings && settings->loadsImagesAutomatically());
-#ifdef ANDROID_BLOCK_NETWORK_IMAGE
-    document->docLoader()->setBlockNetworkImage(settings && settings->blockNetworkImage());
-#endif
-=======
     Settings* settings = m_frame->document()->settings();
     m_frame->document()->docLoader()->setAutoLoadImages(settings && settings->loadsImagesAutomatically());
->>>>>>> webkit.org at r58033
+#ifdef ANDROID_BLOCK_NETWORK_IMAGE
+    m_frame->document()->docLoader()->setBlockNetworkImage(settings && settings->blockNetworkImage());
+#endif
 
     if (m_documentLoader) {
         String dnsPrefetchControl = m_documentLoader->response().httpHeaderField("X-DNS-Prefetch-Control");
diff --git a/WebCore/page/Chrome.cpp b/WebCore/page/Chrome.cpp
index b3df888..841908d 100644
--- a/WebCore/page/Chrome.cpp
+++ b/WebCore/page/Chrome.cpp
@@ -427,15 +427,9 @@ void Chrome::requestGeolocationPermissionForFrame(Frame* frame, Geolocation* geo
     m_client->requestGeolocationPermissionForFrame(frame, geolocation);
 }
 
-<<<<<<< HEAD
-void Chrome::cancelGeolocationPermissionRequestForFrame(Frame* frame)
-{
-    m_client->cancelGeolocationPermissionRequestForFrame(frame);
-=======
 void Chrome::cancelGeolocationPermissionRequestForFrame(Frame* frame, Geolocation* geolocation)
 {
     m_client->cancelGeolocationPermissionRequestForFrame(frame, geolocation);
->>>>>>> webkit.org at r58033
 }
 
 void Chrome::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> fileChooser)
diff --git a/WebCore/page/Chrome.h b/WebCore/page/Chrome.h
index ec58de2..658404a 100644
--- a/WebCore/page/Chrome.h
+++ b/WebCore/page/Chrome.h
@@ -136,11 +136,7 @@ namespace WebCore {
         void print(Frame*);
 
         void requestGeolocationPermissionForFrame(Frame*, Geolocation*);
-<<<<<<< HEAD
-        void cancelGeolocationPermissionRequestForFrame(Frame*);
-=======
         void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*);
->>>>>>> webkit.org at r58033
 
         void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
         void chooseIconForFiles(const Vector<String>&, FileChooser*);
diff --git a/WebCore/page/ChromeClient.h b/WebCore/page/ChromeClient.h
index e0b70e0..78e4f32 100644
--- a/WebCore/page/ChromeClient.h
+++ b/WebCore/page/ChromeClient.h
@@ -192,11 +192,7 @@ namespace WebCore {
         // This can be either a synchronous or asynchronous call. The ChromeClient can display UI asking the user for permission
         // to use Geolocation.
         virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*) = 0;
-<<<<<<< HEAD
-        virtual void cancelGeolocationPermissionRequestForFrame(Frame*) = 0;
-=======
         virtual void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*) = 0;
->>>>>>> webkit.org at r58033
             
         virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>) = 0;
         // Asynchronous request to load an icon for specified filenames.
diff --git a/WebCore/page/EventHandler.cpp b/WebCore/page/EventHandler.cpp
index df8759a..d775e89 100644
--- a/WebCore/page/EventHandler.cpp
+++ b/WebCore/page/EventHandler.cpp
@@ -57,11 +57,10 @@
 #include "Page.h"
 #include "PlatformKeyboardEvent.h"
 #include "PlatformWheelEvent.h"
-<<<<<<< HEAD
-#include "PluginView.h"
-=======
 #include "PluginDocument.h"
->>>>>>> webkit.org at r58033
+#if defined(ANDROID_PLUGINS)
+#include "PluginView.h"
+#endif
 #include "RenderFrameSet.h"
 #include "RenderTextControlSingleLine.h"
 #include "RenderView.h"
@@ -2083,20 +2082,16 @@ static Node* eventTargetNodeForDocument(Document* doc)
     if (!doc)
         return 0;
     Node* node = doc->focusedNode();
-<<<<<<< HEAD
-
 #if defined(ANDROID_PLUGINS)
     if (!node && doc->frame() && doc->frame()->view())
         node = android::WebViewCore::getWebViewCore(doc->frame()->view())
                                      ->cursorNodeIsPlugin();
-#endif
-
-=======
+#else
     if (!node && doc->isPluginDocument()) {
         PluginDocument* pluginDocument = static_cast<PluginDocument*>(doc);
         node =  pluginDocument->pluginNode();
     }
->>>>>>> webkit.org at r58033
+#endif
     if (!node && doc->isHTMLDocument())
         node = doc->body();
     if (!node)
@@ -2718,11 +2713,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
     const Vector<PlatformTouchPoint>& points = event.touchPoints();
     AtomicString* eventName = 0;
 
-<<<<<<< HEAD
-=======
     UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
 
->>>>>>> webkit.org at r58033
     for (unsigned i = 0; i < points.size(); ++i) {
         const PlatformTouchPoint& point = points[i];
         IntPoint pagePoint = documentPointForWindowPoint(m_frame, point.pos());
@@ -2749,18 +2741,13 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
 
         // Increment the platform touch id by 1 to avoid storing a key of 0 in the hashmap.
         unsigned touchPointTargetKey = point.id() + 1;
-<<<<<<< HEAD
         RefPtr<EventTarget> touchTarget;
-=======
-        EventTarget* touchTarget = 0;
->>>>>>> webkit.org at r58033
         if (point.state() == PlatformTouchPoint::TouchPressed) {
             m_originatingTouchPointTargets.set(touchPointTargetKey, target);
             touchTarget = target;
         } else if (point.state() == PlatformTouchPoint::TouchReleased || point.state() == PlatformTouchPoint::TouchCancelled) {
             // The target should be the original target for this touch, so get it from the hashmap. As it's a release or cancel
             // we also remove it from the map.
-<<<<<<< HEAD
             touchTarget = m_originatingTouchPointTargets.take(touchPointTargetKey);
         } else
             touchTarget = m_originatingTouchPointTargets.get(touchPointTargetKey);
@@ -2769,16 +2756,6 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
             continue;
 
         RefPtr<Touch> touch = Touch::create(doc->frame(), touchTarget.get(), point.id(),
-=======
-            touchTarget = m_originatingTouchPointTargets.take(touchPointTargetKey).get();
-        } else
-            touchTarget = m_originatingTouchPointTargets.get(touchPointTargetKey).get();
-
-        if (!touchTarget)
-            continue;
-
-        RefPtr<Touch> touch = Touch::create(doc->frame(), touchTarget, point.id(),
->>>>>>> webkit.org at r58033
                                             point.screenPos().x(), point.screenPos().y(),
                                             adjustedPageX, adjustedPageY);
 
@@ -2787,7 +2764,6 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
             touches->append(touch);
 
         // Now build up the correct list for changedTouches.
-<<<<<<< HEAD
         // Note that  any touches that are in the TouchStationary state (e.g. if
         // the user had several points touched but did not move them all) should
         // only be present in the touches list. They may also be added to the
@@ -2795,8 +2771,6 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
         // list so we do not handle them explicitly here.
         // See https://bugs.webkit.org/show_bug.cgi?id=37609 for further discussion
         // about the TouchStationary state.
-=======
->>>>>>> webkit.org at r58033
         if (point.state() == PlatformTouchPoint::TouchReleased)
             releasedTouches->append(touch);
         else if (point.state() == PlatformTouchPoint::TouchCancelled)
@@ -2859,7 +2833,6 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
 
         RefPtr<TouchList> targetTouches = assembleTargetTouches(changedTouch, touches.get());
 
-<<<<<<< HEAD
 #if PLATFORM(ANDROID)
         if (event.type() == TouchLongPress) {
             eventName = &eventNames().touchlongpressEvent;
@@ -2883,8 +2856,6 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
             defaultPrevented |= doubleTapEv->defaultPrevented();
         } else {
 #endif
-=======
->>>>>>> webkit.org at r58033
         eventName = &eventNames().touchstartEvent;
         RefPtr<TouchEvent> startEv =
             TouchEvent::create(touches.get(), targetTouches.get(), pressedTouches.get(),
diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp
index f784c1b..1ebdf99 100644
--- a/WebCore/page/FrameView.cpp
+++ b/WebCore/page/FrameView.cpp
@@ -75,16 +75,13 @@
 #include "SVGViewSpec.h"
 #endif
 
-<<<<<<< HEAD
-#if PLATFORM(ANDROID)
-#include "WebCoreFrameBridge.h"
-#endif
-
-=======
 #if ENABLE(TILED_BACKING_STORE)
 #include "TiledBackingStore.h"
 #endif
->>>>>>> webkit.org at r58033
+
+#if PLATFORM(ANDROID)
+#include "WebCoreFrameBridge.h"
+#endif
 
 namespace WebCore {
 
@@ -1249,7 +1246,6 @@ void FrameView::scheduleRelayout()
     if (!m_frame->document()->shouldScheduleLayout())
         return;
 
-<<<<<<< HEAD
 #if defined(FLATTEN_IFRAME) || defined(FLATTEN_FRAMESET)
     // This is the Android frame flattening code. The common code below is not
     // used as frameSetFlatteningEnabled() is false on Android.
@@ -1257,10 +1253,7 @@ void FrameView::scheduleRelayout()
         m_frame->ownerRenderer()->setNeedsLayoutAndPrefWidthsRecalc();
 #endif
 
-    // When frameset flattening is enabled, the contents of the frame affects layout of the parent frames.
-=======
     // When frame flattening is enabled, the contents of the frame affects layout of the parent frames.
->>>>>>> webkit.org at r58033
     // Also invalidate parent frame starting from the owner element of this frame.
     if (m_frame->settings()->frameFlatteningEnabled() && m_frame->ownerRenderer()) {
         if (m_frame->ownerElement()->hasTagName(iframeTag) || m_frame->ownerElement()->hasTagName(frameTag))
diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp
index 55fdef5..8abf417 100644
--- a/WebCore/page/Geolocation.cpp
+++ b/WebCore/page/Geolocation.cpp
@@ -31,12 +31,8 @@
 #if ENABLE(GEOLOCATION)
 
 #include "Chrome.h"
-<<<<<<< HEAD
 // ANDROID
 #include "DOMWindow.h"
-// END ANDROID
-#include "Document.h"
-// ANDROID
 #include "EventNames.h"
 // END ANDROID
 #include "Frame.h"
@@ -44,10 +40,6 @@
 #if PLATFORM(ANDROID)
 #include "PlatformBridge.h"
 #endif
-=======
-#include "Frame.h"
-#include "Page.h"
->>>>>>> webkit.org at r58033
 #include <wtf/CurrentTime.h>
 
 #if ENABLE(CLIENT_BASED_GEOLOCATION)
@@ -224,10 +216,6 @@ Geolocation::Geolocation(Frame* frame)
     , m_service(GeolocationService::create(this))
 #endif
     , m_allowGeolocation(Unknown)
-<<<<<<< HEAD
-    , m_shouldClearCache(false)
-=======
->>>>>>> webkit.org at r58033
     , m_positionCache(new GeolocationPositionCache)
 {
     if (!m_frame)
@@ -254,12 +242,8 @@ void Geolocation::disconnectFrame()
     if (m_frame && m_frame->page() && m_allowGeolocation == InProgress)
         m_frame->page()->chrome()->cancelGeolocationPermissionRequestForFrame(m_frame, this);
     stopUpdating();
-    if (m_frame) {
-        if (m_frame->document())
-            m_frame->document()->setUsingGeolocation(false);
-        if (m_frame->page() && m_allowGeolocation == InProgress)
-            m_frame->page()->chrome()->cancelGeolocationPermissionRequestForFrame(m_frame);
-    }
+    if (m_frame && m_frame->document())
+        m_frame->document()->setUsingGeolocation(false);
     m_frame = 0;
 }
 
@@ -337,58 +321,6 @@ void Geolocation::fatalErrorOccurred(Geolocation::GeoNotifier* notifier)
 }
 
 void Geolocation::requestUsesCachedPosition(GeoNotifier* notifier)
-<<<<<<< HEAD
-{
-    // This is called asynchronously, so the permissions could have been denied
-    // since we last checked in startRequest.
-    if (isDenied()) {
-        notifier->setFatalError(PositionError::create(PositionError::PERMISSION_DENIED, permissionDeniedErrorMessage));
-        return;
-    }
-
-    m_requestsAwaitingCachedPosition.add(notifier);
-
-    // If permissions are allowed, make the callback
-    if (isAllowed()) {
-        makeCachedPositionCallbacks();
-        return;
-    }
-
-    // Request permissions, which may be synchronous or asynchronous.
-    requestPermission();
-}
-
-void Geolocation::makeCachedPositionCallbacks()
-{
-    // All modifications to m_requestsAwaitingCachedPosition are done
-    // asynchronously, so we don't need to worry about it being modified from
-    // the callbacks.
-    GeoNotifierSet::const_iterator end = m_requestsAwaitingCachedPosition.end();
-    for (GeoNotifierSet::const_iterator iter = m_requestsAwaitingCachedPosition.begin(); iter != end; ++iter) {
-        GeoNotifier* notifier = iter->get();
-        notifier->runSuccessCallback(m_positionCache->cachedPosition());
-
-        // If this is a one-shot request, stop it. Otherwise, if the watch still
-        // exists, start the service to get updates.
-        if (m_oneShots.contains(notifier))
-            m_oneShots.remove(notifier);
-        else if (m_watchers.contains(notifier)) {
-            if (notifier->hasZeroTimeout() || startUpdating(notifier))
-                notifier->startTimerIfNeeded();
-            else
-                notifier->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, failedToStartServiceErrorMessage));
-        }
-    }
-
-    m_requestsAwaitingCachedPosition.clear();
-
-    if (!hasListeners())
-        stopUpdating();
-}
-
-void Geolocation::requestTimedOut(GeoNotifier* notifier)
-=======
->>>>>>> webkit.org at r58033
 {
     // This is called asynchronously, so the permissions could have been denied
     // since we last checked in startRequest.
@@ -437,23 +369,7 @@ void Geolocation::makeCachedPositionCallbacks()
         stopUpdating();
 }
 
-<<<<<<< HEAD
-bool Geolocation::haveSuitableCachedPosition(PositionOptions* options)
-{
-    if (!m_positionCache->cachedPosition())
-        return false;
-    if (!options->hasMaximumAge())
-        return true;
-    if (!options->maximumAge())
-        return false;
-    DOMTimeStamp currentTimeMillis = currentTime() * 1000.0;
-    return m_positionCache->cachedPosition()->timestamp() > currentTimeMillis - options->maximumAge();
-}
-
-void Geolocation::clearWatch(int watchId)
-=======
 void Geolocation::requestTimedOut(GeoNotifier* notifier)
->>>>>>> webkit.org at r58033
 {
     // If this is a one-shot request, stop it.
     m_oneShots.remove(notifier);
@@ -625,8 +541,6 @@ void Geolocation::positionChanged(PassRefPtr<Geoposition> newPosition)
 {
     m_positionCache->setCachedPosition(newPosition.get());
 
-    m_positionCache->setCachedPosition(m_currentPosition.get());
-
     // Stop all currently running timers.
     stopTimers();
     
diff --git a/WebCore/page/Geolocation.h b/WebCore/page/Geolocation.h
index 30db435..b4e5bef 100644
--- a/WebCore/page/Geolocation.h
+++ b/WebCore/page/Geolocation.h
@@ -27,12 +27,9 @@
 #ifndef Geolocation_h
 #define Geolocation_h
 
-<<<<<<< HEAD
 // ANDROID
 #include "EventListener.h"
 // END ANDROID
-=======
->>>>>>> webkit.org at r58033
 #include "GeolocationPositionCache.h"
 #include "GeolocationService.h"
 #include "Geoposition.h"
@@ -51,15 +48,10 @@ class GeolocationPosition;
 class GeolocationError;
 #endif
 
-<<<<<<< HEAD
 // ANDROID
 class Geolocation : public EventListener
 // END ANDROID
-#if !ENABLE(CLIENT_BASED_GEOLOCATION)
-=======
-class Geolocation : public RefCounted<Geolocation>
 #if !ENABLE(CLIENT_BASED_GEOLOCATION) && ENABLE(GEOLOCATION)
->>>>>>> webkit.org at r58033
     , public GeolocationServiceClient
 #endif
 {
@@ -188,16 +180,10 @@ private:
         Yes,
         No
     } m_allowGeolocation;
-<<<<<<< HEAD
-    bool m_shouldClearCache;
-
-    OwnPtr<GeolocationPositionCache> m_positionCache;
-=======
 
 #if ENABLE(GEOLOCATION)
     OwnPtr<GeolocationPositionCache> m_positionCache;
 #endif
->>>>>>> webkit.org at r58033
     GeoNotifierSet m_requestsAwaitingCachedPosition;
 };
     
diff --git a/WebCore/page/GeolocationPositionCache.cpp b/WebCore/page/GeolocationPositionCache.cpp
index 76d2b0b..06159f4 100644
--- a/WebCore/page/GeolocationPositionCache.cpp
+++ b/WebCore/page/GeolocationPositionCache.cpp
@@ -26,11 +26,8 @@
 #include "config.h"
 #include "GeolocationPositionCache.h"
 
-<<<<<<< HEAD
-=======
 #if ENABLE(GEOLOCATION)
 
->>>>>>> webkit.org at r58033
 #include "Geoposition.h"
 #include "SQLValue.h"
 #include "SQLiteDatabase.h"
@@ -38,10 +35,6 @@
 #include "SQLiteStatement.h"
 #include "SQLiteTransaction.h"
 
-<<<<<<< HEAD
-
-=======
->>>>>>> webkit.org at r58033
 namespace WebCore {
 
 static const char* databaseName = "CachedGeoposition.db";
@@ -181,8 +174,5 @@ void GeolocationPositionCache::writeToDB(const Geoposition* position)
 }
 
 } // namespace WebCore
-<<<<<<< HEAD
-=======
 
 #endif // ENABLE(GEOLOCATION)
->>>>>>> webkit.org at r58033
diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp
index e1b848a..33c9c0d 100644
--- a/WebCore/page/Settings.cpp
+++ b/WebCore/page/Settings.cpp
@@ -142,13 +142,10 @@ Settings::Settings(Page* page)
     , m_experimentalNotificationsEnabled(false)
     , m_webGLEnabled(false)
     , m_loadDeferringEnabled(true)
-<<<<<<< HEAD
+    , m_tiledBackingStoreEnabled(false)
 #ifdef ANDROID_PLUGINS
     , m_pluginsOnDemand(false)
 #endif
-=======
-    , m_tiledBackingStoreEnabled(false)
->>>>>>> webkit.org at r58033
 {
     // A Frame may not have been created yet, so we initialize the AtomicString 
     // hash before trying to use it.
diff --git a/WebCore/page/Settings.h b/WebCore/page/Settings.h
index 6893eae..04487b1 100644
--- a/WebCore/page/Settings.h
+++ b/WebCore/page/Settings.h
@@ -160,17 +160,11 @@ namespace WebCore {
         void setPluginsEnabled(bool);
         bool arePluginsEnabled() const { return m_arePluginsEnabled; }
 
-<<<<<<< HEAD
 #ifdef ANDROID_PLUGINS
         void setPluginsOnDemand(bool onDemand) { m_pluginsOnDemand = onDemand; }
         bool arePluginsOnDemand() const { return m_pluginsOnDemand; }
 #endif
 
-        void setDatabasesEnabled(bool);
-        bool databasesEnabled() const { return m_databasesEnabled; }
-
-=======
->>>>>>> webkit.org at r58033
         void setLocalStorageEnabled(bool);
         bool localStorageEnabled() const { return m_localStorageEnabled; }
 
@@ -491,13 +485,10 @@ namespace WebCore {
         bool m_experimentalNotificationsEnabled : 1;
         bool m_webGLEnabled : 1;
         bool m_loadDeferringEnabled : 1;
-<<<<<<< HEAD
+        bool m_tiledBackingStoreEnabled : 1;
 #ifdef ANDROID_PLUGINS
         bool m_pluginsOnDemand : 1;
 #endif
-=======
-        bool m_tiledBackingStoreEnabled : 1;
->>>>>>> webkit.org at r58033
 
 #if USE(SAFARI_THEME)
         static bool gShouldPaintNativeControls;
diff --git a/WebCore/platform/DragImage.h b/WebCore/platform/DragImage.h
index b905432..d7d53b2 100644
--- a/WebCore/platform/DragImage.h
+++ b/WebCore/platform/DragImage.h
@@ -80,11 +80,7 @@ namespace WebCore {
     typedef BBitmap* DragImageRef;
 #elif PLATFORM(BREWMP)
     typedef IImage* DragImageRef;
-<<<<<<< HEAD
-#elif PLATFORM(ANDROID)
-=======
-#elif PLATFORM(EFL)
->>>>>>> webkit.org at r58033
+#elif PLATFORM(EFL) || PLATFORM(ANDROID)
     typedef void* DragImageRef;
 #endif
     
diff --git a/WebCore/platform/PlatformTouchPoint.h b/WebCore/platform/PlatformTouchPoint.h
index 202a2d4..4a667a0 100644
--- a/WebCore/platform/PlatformTouchPoint.h
+++ b/WebCore/platform/PlatformTouchPoint.h
@@ -54,11 +54,7 @@ public:
     IntPoint screenPos() const { return m_screenPos; }
     IntPoint pos() const { return m_pos; }
     
-<<<<<<< HEAD
-private:
-=======
 protected:
->>>>>>> webkit.org at r58033
     unsigned m_id;
     State m_state;
     IntPoint m_screenPos;
diff --git a/WebCore/platform/Widget.h b/WebCore/platform/Widget.h
index 677fe34..2fce858 100644
--- a/WebCore/platform/Widget.h
+++ b/WebCore/platform/Widget.h
@@ -239,14 +239,12 @@ private:
 #if PLATFORM(MAC)
     WidgetPrivate* m_data;
 #endif
-<<<<<<< HEAD
+#if PLATFORM(HAIKU)
+    PlatformWidget m_topLevelPlatformWidget;
+#endif
 #if PLATFORM(ANDROID)
 public:
     int screenWidth() const;
-=======
-#if PLATFORM(HAIKU)
-    PlatformWidget m_topLevelPlatformWidget;
->>>>>>> webkit.org at r58033
 #endif
 };
 
diff --git a/WebCore/platform/graphics/Gradient.h b/WebCore/platform/graphics/Gradient.h
index 371cad7..b6911f3 100644
--- a/WebCore/platform/graphics/Gradient.h
+++ b/WebCore/platform/graphics/Gradient.h
@@ -63,13 +63,10 @@ typedef class PlatformGradientRec* PlatformGradient;
 class SkShader;
 typedef class SkShader* PlatformGradient;
 typedef class SkShader* PlatformPattern;
-<<<<<<< HEAD
 #endif
-=======
 #elif PLATFORM(HAIKU)
 class BGradient;
 typedef BGradient* PlatformGradient;
->>>>>>> webkit.org at r58033
 #else
 typedef void* PlatformGradient;
 #endif
diff --git a/WebCore/platform/graphics/MediaPlayer.cpp b/WebCore/platform/graphics/MediaPlayer.cpp
index 813b29c..55fa900 100644
--- a/WebCore/platform/graphics/MediaPlayer.cpp
+++ b/WebCore/platform/graphics/MediaPlayer.cpp
@@ -219,16 +219,12 @@ MediaPlayer::MediaPlayer(MediaPlayerClient* client)
     , m_volume(1.0f)
     , m_muted(false)
     , m_preservesPitch(true)
-<<<<<<< HEAD
-    , m_autobuffer(false)
-#if PLATFORM(ANDROID)
-    , m_mediaElementType(Video)
-#endif
-=======
->>>>>>> webkit.org at r58033
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
     , m_playerProxy(0)
 #endif
+#if PLATFORM(ANDROID)
+    , m_mediaElementType(Video)
+#endif
 {
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
     Vector<MediaPlayerFactory*>& engines = installedMediaEngines();
diff --git a/WebCore/platform/graphics/MediaPlayer.h b/WebCore/platform/graphics/MediaPlayer.h
index 24f4225..89021c3 100644
--- a/WebCore/platform/graphics/MediaPlayer.h
+++ b/WebCore/platform/graphics/MediaPlayer.h
@@ -266,16 +266,12 @@ private:
     float m_volume;
     bool m_muted;
     bool m_preservesPitch;
-<<<<<<< HEAD
-    bool m_autobuffer;
-#if PLATFORM(ANDROID)
-    MediaElementType m_mediaElementType;
-#endif
-=======
->>>>>>> webkit.org at r58033
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
     WebMediaPlayerProxy* m_playerProxy;    // not owned or used, passed to m_private
 #endif
+#if PLATFORM(ANDROID)
+    MediaElementType m_mediaElementType;
+#endif
 };
 
 typedef MediaPlayerPrivateInterface* (*CreateMediaEnginePlayer)(MediaPlayer*);
diff --git a/WebCore/platform/posix/FileSystemPOSIX.cpp b/WebCore/platform/posix/FileSystemPOSIX.cpp
index db8dff8..ac8c7fa 100644
--- a/WebCore/platform/posix/FileSystemPOSIX.cpp
+++ b/WebCore/platform/posix/FileSystemPOSIX.cpp
@@ -30,18 +30,14 @@
 #include "FileSystem.h"
 
 #include "PlatformString.h"
-<<<<<<< HEAD
-
-#include <sys/stat.h>
 #ifdef ANDROID_PLUGINS
-#include <sys/types.h>
 #include <dirent.h>
-#include <fnmatch.h>
 #endif
-=======
 #include <errno.h>
 #include <fcntl.h>
->>>>>>> webkit.org at r58033
+#ifdef ANDROID_PLUGINS
+#include <fnmatch.h>
+#endif
 #include <libgen.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/WebCore/rendering/RenderFrame.cpp b/WebCore/rendering/RenderFrame.cpp
index 3932c9a..46150ba 100644
--- a/WebCore/rendering/RenderFrame.cpp
+++ b/WebCore/rendering/RenderFrame.cpp
@@ -65,7 +65,6 @@ void RenderFrame::viewCleared()
         view->setMarginHeight(marginh);
 }
 
-<<<<<<< HEAD
 #ifdef FLATTEN_FRAMESET
 void RenderFrame::layout()
 {
@@ -94,58 +93,5 @@ void RenderFrame::layout()
     setNeedsLayout(false);
 }
 #endif
-void RenderFrame::layoutWithFlattening(bool fixedWidth, bool fixedHeight)
-{
-    // NOTE: The width and height have been set at this point by
-    // RenderFrameSet::positionFramesWithFlattening()
-
-    FrameView* childFrameView = static_cast<FrameView*>(widget());
-    RenderView* childRoot = childFrameView ? static_cast<RenderView*>(childFrameView->frame()->contentRenderer()) : 0;
-    HTMLFrameElement* element = static_cast<HTMLFrameElement*>(node());
-
-    // Do not expand framesets which has zero width or height
-    if (!width() || !height() || !childRoot) {
-        updateWidgetPosition();
-        if (childFrameView)
-            childFrameView->layout();
-        setNeedsLayout(false);
-        return;
-    }
-
-    // need to update to calculate min/max correctly
-    updateWidgetPosition();
-    if (childRoot->prefWidthsDirty())
-        childRoot->calcPrefWidths();
-
-    // if scrollbars are off, and the width or height are fixed
-    // we obey them and do not expand. With frame flattening
-    // no subframe much ever become scrollable.
-
-    bool isScrollable = element->scrollingMode() != ScrollbarAlwaysOff;
-
-    // make sure minimum preferred width is enforced
-    if (isScrollable || !fixedWidth || childRoot->isFrameSet())
-        setWidth(max(width(), childRoot->minPrefWidth()));
-
-    // update again to pass the width to the child frame
-    updateWidgetPosition();
-    childFrameView->layout();
-
-    // expand the frame by setting frame height = content height
-    if (isScrollable || !fixedHeight || childRoot->isFrameSet())
-        setHeight(max(height(), childFrameView->contentsHeight()));
-    if (isScrollable || !fixedWidth || childRoot->isFrameSet())
-        setWidth(max(width(), childFrameView->contentsWidth()));
-
-    updateWidgetPosition();
-
-    ASSERT(!childFrameView->layoutPending());
-    ASSERT(!childRoot->needsLayout());
-    ASSERT(!childRoot->firstChild() || !childRoot->firstChild()->firstChild() || !childRoot->firstChild()->firstChild()->needsLayout());
-
-    setNeedsLayout(false);
-}
 
-=======
->>>>>>> webkit.org at r58033
 } // namespace WebCore
diff --git a/WebCore/rendering/RenderFrameSet.h b/WebCore/rendering/RenderFrameSet.h
index 1e192fb..345648f 100644
--- a/WebCore/rendering/RenderFrameSet.h
+++ b/WebCore/rendering/RenderFrameSet.h
@@ -70,14 +70,10 @@ public:
     bool canResizeRow(const IntPoint&) const;
     bool canResizeColumn(const IntPoint&) const;
 
-<<<<<<< HEAD
 #ifdef FLATTEN_FRAMESET
     void setGridNeedsLayout() { m_gridCalculated = false; }
 #endif
-    bool flattenFrameSet() const;
 
-=======
->>>>>>> webkit.org at r58033
 private:
     static const int noSplit = -1;
 
diff --git a/WebCore/rendering/RenderLayerCompositor.cpp b/WebCore/rendering/RenderLayerCompositor.cpp
index 480abb7..25d8eda 100644
--- a/WebCore/rendering/RenderLayerCompositor.cpp
+++ b/WebCore/rendering/RenderLayerCompositor.cpp
@@ -527,8 +527,7 @@ void RenderLayerCompositor::computeCompositingRequirements(RenderLayer* layer, O
     ++childState.m_depth;
 #endif
 
-<<<<<<< HEAD
-    const bool willBeComposited = needsToBeComposited(layer);
+    bool willBeComposited = needsToBeComposited(layer);
 
 #if ENABLE(COMPOSITED_FIXED_ELEMENTS)
     // If we are a fixed layer, signal it to our siblings
@@ -540,9 +539,6 @@ void RenderLayerCompositor::computeCompositingRequirements(RenderLayer* layer, O
 
     if (willBeComposited || compositingState.m_fixedSibling) {
 #else
-=======
-    bool willBeComposited = needsToBeComposited(layer);
->>>>>>> webkit.org at r58033
     if (willBeComposited) {
 #endif
         // Tell the parent it has compositing descendants.
@@ -1016,7 +1012,6 @@ bool RenderLayerCompositor::needsToBeComposited(const RenderLayer* layer) const
     if (!canBeComposited(layer))
         return false;
 
-<<<<<<< HEAD
 #if ENABLE(COMPOSITED_FIXED_ELEMENTS)
     // if an ancestor is fixed positioned, we need to be composited...
     const RenderLayer* currLayer = layer;
@@ -1026,10 +1021,8 @@ bool RenderLayerCompositor::needsToBeComposited(const RenderLayer* layer) const
     }
 #endif
 
-    return requiresCompositingLayer(layer) || layer->mustOverlapCompositedLayers();
-=======
+    // The root layer always has a compositing layer, but it may not have backing.
     return requiresCompositingLayer(layer) || layer->mustOverlapCompositedLayers() || (inCompositingMode() && layer->isRootLayer());
->>>>>>> webkit.org at r58033
 }
 
 #if PLATFORM(ANDROID)
@@ -1081,21 +1074,11 @@ bool RenderLayerCompositor::requiresCompositingLayer(const RenderLayer* layer) c
         renderer = renderer->parent(); // The RenderReplica's parent is the object being reflected.
         layer = toRenderBoxModelObject(renderer)->layer();
     }
-    // The root layer always has a compositing layer, but it may not have backing.
-<<<<<<< HEAD
-    return (inCompositingMode() && layer->isRootLayer()) ||
 #if PLATFORM(ANDROID)
-             requiresCompositingForMobileSites(layer) ||
+    return requiresCompositingForMobileSites(layer)
+             || renderer->style()->backfaceVisibility() == BackfaceVisibilityHidden
+             || clipsCompositingDescendants(layer);
 #else
-             requiresCompositingForTransform(renderer) ||
-             requiresCompositingForVideo(renderer) ||
-             requiresCompositingForCanvas(renderer) ||
-             requiresCompositingForPlugin(renderer) ||
-             requiresCompositingForAnimation(renderer) ||
-#endif
-             renderer->style()->backfaceVisibility() == BackfaceVisibilityHidden ||
-             clipsCompositingDescendants(layer);
-=======
     return requiresCompositingForTransform(renderer)
              || requiresCompositingForVideo(renderer)
              || requiresCompositingForCanvas(renderer)
@@ -1104,12 +1087,12 @@ bool RenderLayerCompositor::requiresCompositingLayer(const RenderLayer* layer) c
              || renderer->style()->backfaceVisibility() == BackfaceVisibilityHidden
              || clipsCompositingDescendants(layer)
              || requiresCompositingForAnimation(renderer);
+#endif
 }
 
 bool RenderLayerCompositor::canBeComposited(const RenderLayer* layer) const
 {
     return m_hasAcceleratedCompositing && layer->isSelfPaintingLayer();
->>>>>>> webkit.org at r58033
 }
 
 // Return true if the given layer has some ancestor in the RenderLayer hierarchy that clips,