Merge WebKit at r63859: Fix conflicts.

html/HTMLCanvasElement.h due to http://trac.webkit.org/changeset/63502
html/HTMLLinkElement.cpp due to http://trac.webkit.org/changeset/63622
Android.mk and WebCore/Android.mk due to http://trac.webkit.org/changeset/63735
WebCore/page/Settings.cpp|h due to http://trac.webkit.org/changeset/63537
WebCore/page/EventHandler.cpp|h due to http://trac.webkit.org/changeset/63807
WebCore/Android.jscbindings.mk due to http://trac.webkit.org/changeset/63193
WebCore/platform/network/ResourceHandle.h due to http://trac.webkit.org/changeset/63332

Change-Id: I03c929b97550014373f044f56c248040b66118f0

12 files changed, 8 insertions, 52 deletions

diff --git a/Android.mk b/Android.mk
index ca23094..5d7496b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -127,10 +127,7 @@ LOCAL_C_INCLUDES := \
 LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
 	$(LOCAL_PATH)/WebCore \
 	$(LOCAL_PATH)/WebCore/accessibility \
-<<<<<<< HEAD:Android.mk
 	$(LOCAL_PATH)/WebCore/bindings/ \
-=======
->>>>>>> webkit.org at r63859:Android.mk
 	$(LOCAL_PATH)/WebCore/bindings/generic \
 	$(LOCAL_PATH)/WebCore/css \
 	$(LOCAL_PATH)/WebCore/dom \
diff --git a/WebCore/Android.jscbindings.mk b/WebCore/Android.jscbindings.mk
index f67fe16..2b720b1 100644
--- a/WebCore/Android.jscbindings.mk
+++ b/WebCore/Android.jscbindings.mk
@@ -81,10 +81,6 @@ LOCAL_SRC_FILES += \
 	bindings/js/JSCustomPositionErrorCallback.cpp \
 	bindings/js/JSCustomSQLStatementErrorCallback.cpp \
 	bindings/js/JSCustomVoidCallback.cpp \
-<<<<<<< HEAD:WebCore/Android.jscbindings.mk
-	bindings/js/JSDesktopNotificationsCustom.cpp \
-=======
->>>>>>> webkit.org at r63859:WebCore/Android.jscbindings.mk
 	bindings/js/JSDOMApplicationCacheCustom.cpp \
 	bindings/js/JSDOMBinding.cpp \
 	bindings/js/JSDOMFormDataCustom.cpp \
@@ -96,11 +92,8 @@ LOCAL_SRC_FILES += \
 	bindings/js/JSDOMWindowBase.cpp \
 	bindings/js/JSDOMWindowCustom.cpp \
 	bindings/js/JSDOMWindowShell.cpp \
-<<<<<<< HEAD:WebCore/Android.jscbindings.mk
 	bindings/js/JSDOMWrapper.cpp \
-=======
 	bindings/js/JSDatabaseCallback.cpp \
->>>>>>> webkit.org at r63859:WebCore/Android.jscbindings.mk
 	bindings/js/JSDataGridColumnListCustom.cpp \
 	bindings/js/JSDataGridDataSource.cpp \
 	bindings/js/JSDatabaseCustom.cpp \
diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index a0dafa3..4af6848 100644
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -24,11 +24,8 @@
 ##
 
 LOCAL_SRC_FILES := \
-<<<<<<< HEAD:WebCore/Android.mk
 	bindings/generic/BindingSecurityBase.cpp \
-=======
 	bindings/generic/RuntimeEnabledFeatures.cpp \
->>>>>>> webkit.org at r63859:WebCore/Android.mk
 	\
 	css/CSSBorderImageValue.cpp \
 	css/CSSCanvasValue.cpp \
diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk
index 017bf98..f198621 100644
--- a/WebCore/Android.v8bindings.mk
+++ b/WebCore/Android.v8bindings.mk
@@ -43,8 +43,6 @@ BINDING_C_INCLUDES := \
 LOCAL_SRC_FILES += \
 	bindings/ScriptControllerBase.cpp \
 	\
-	bindings/generic/RuntimeEnabledFeatures.cpp \
-	\
 	bindings/v8/ChildThreadDOMData.cpp \
 	bindings/v8/DateExtension.cpp \
 	bindings/v8/DOMData.cpp \
diff --git a/WebCore/html/HTMLCanvasElement.h b/WebCore/html/HTMLCanvasElement.h
index ef5d289..2e3570d 100644
--- a/WebCore/html/HTMLCanvasElement.h
+++ b/WebCore/html/HTMLCanvasElement.h
@@ -110,7 +110,8 @@ public:
     bool is3D() const;
 #endif
 
-<<<<<<< HEAD:WebCore/html/HTMLCanvasElement.h
+    void makeRenderingResultsAvailable();
+
 #ifdef ANDROID_INSTRUMENT
     void* operator new(size_t size) {
         return HTMLElement::operator new(size);
@@ -126,9 +127,6 @@ public:
         HTMLElement::operator delete[](p, size);
     }
 #endif
-=======
-    void makeRenderingResultsAvailable();
->>>>>>> webkit.org at r63859:WebCore/html/HTMLCanvasElement.h
 
 private:
     HTMLCanvasElement(const QualifiedName&, Document*);
diff --git a/WebCore/html/HTMLLinkElement.cpp b/WebCore/html/HTMLLinkElement.cpp
index cce991a..c1623ec 100644
--- a/WebCore/html/HTMLLinkElement.cpp
+++ b/WebCore/html/HTMLLinkElement.cpp
@@ -200,7 +200,6 @@ void HTMLLinkElement::process()
     if (m_relAttribute.m_isIcon && m_url.isValid() && !m_url.isEmpty())
         document()->setIconURL(m_url.string(), type);
 
-<<<<<<< HEAD:WebCore/html/HTMLLinkElement.cpp
 #ifdef ANDROID_APPLE_TOUCH_ICON
     if ((m_relAttribute.m_isTouchIcon || m_relAttribute.m_isPrecomposedTouchIcon) && m_url.isValid()
         && !m_url.isEmpty() && document()->frame())
@@ -209,10 +208,7 @@ void HTMLLinkElement::process()
                         m_relAttribute.m_isPrecomposedTouchIcon);
 #endif
 
-    if (m_relAttribute.m_isDNSPrefetch && m_url.isValid() && !m_url.isEmpty())
-=======
     if (m_relAttribute.m_isDNSPrefetch && document()->isDNSPrefetchEnabled() && m_url.isValid() && !m_url.isEmpty())
->>>>>>> webkit.org at r63859:WebCore/html/HTMLLinkElement.cpp
         ResourceHandle::prepareForURL(m_url);
 
 #if ENABLE(LINK_PREFETCH)
diff --git a/WebCore/inspector/InspectorDOMAgent.h b/WebCore/inspector/InspectorDOMAgent.h
index efa27e0..5db837b 100644
--- a/WebCore/inspector/InspectorDOMAgent.h
+++ b/WebCore/inspector/InspectorDOMAgent.h
@@ -57,11 +57,7 @@ namespace WebCore {
     class Element;
     class Event;
     class InspectorDOMAgent;
-<<<<<<< HEAD:WebCore/inspector/InspectorDOMAgent.h
-    class InspectorFrontend2;
-=======
     class RemoteInspectorFrontend;
->>>>>>> webkit.org at r63859:WebCore/inspector/InspectorDOMAgent.h
     class MatchJob;
     class NameNodeMap;
     class Node;
diff --git a/WebCore/page/EventHandler.cpp b/WebCore/page/EventHandler.cpp
index 4d7771d..89e9424 100644
--- a/WebCore/page/EventHandler.cpp
+++ b/WebCore/page/EventHandler.cpp
@@ -869,15 +869,11 @@ void EventHandler::allowDHTMLDrag(bool& flagDHTML, bool& flagUA) const
 }
 #endif // ENABLE(DRAG_SUPPORT)
     
-<<<<<<< HEAD:WebCore/page/EventHandler.cpp
 #ifdef ANDROID_HITTEST_WITHSIZE
-HitTestResult EventHandler::hitTestResultAtPoint(const IntPoint& point, bool allowShadowContent, bool ignoreClipping, HitTestScrollbars testScrollbars, const IntSize& pointPadding)
+HitTestResult EventHandler::hitTestResultAtPoint(const IntPoint& point, bool allowShadowContent, bool ignoreClipping, HitTestScrollbars testScrollbars, int hitType, const IntSize& pointPadding)
 #else
-HitTestResult EventHandler::hitTestResultAtPoint(const IntPoint& point, bool allowShadowContent, bool ignoreClipping, HitTestScrollbars testScrollbars)
-#endif
-=======
 HitTestResult EventHandler::hitTestResultAtPoint(const IntPoint& point, bool allowShadowContent, bool ignoreClipping, HitTestScrollbars testScrollbars, int hitType)
->>>>>>> webkit.org at r63859:WebCore/page/EventHandler.cpp
+#endif
 {
 #ifdef ANDROID_HITTEST_WITHSIZE
     HitTestResult result(point, pointPadding);
diff --git a/WebCore/page/EventHandler.h b/WebCore/page/EventHandler.h
index 55c6b20..5348502 100644
--- a/WebCore/page/EventHandler.h
+++ b/WebCore/page/EventHandler.h
@@ -106,15 +106,11 @@ public:
 
     void dispatchFakeMouseMoveEventSoonInQuad(const FloatQuad&);
 
-<<<<<<< HEAD:WebCore/page/EventHandler.h
 #ifdef ANDROID_HITTEST_WITHSIZE
-    HitTestResult hitTestResultAtPoint(const IntPoint&, bool allowShadowContent, bool ignoreClipping = false, HitTestScrollbars scrollbars = DontHitTestScrollbars, const IntSize& pointPadding = IntSize());
+    HitTestResult hitTestResultAtPoint(const IntPoint&, bool allowShadowContent, bool ignoreClipping = false, HitTestScrollbars scrollbars = DontHitTestScrollbars, int hitType = HitTestRequest::ReadOnly | HitTestRequest::Active, const IntSize& pointPadding = IntSize());
 #else
-    HitTestResult hitTestResultAtPoint(const IntPoint&, bool allowShadowContent, bool ignoreClipping = false, HitTestScrollbars scrollbars = DontHitTestScrollbars);
-#endif
-=======
     HitTestResult hitTestResultAtPoint(const IntPoint&, bool allowShadowContent, bool ignoreClipping = false, HitTestScrollbars scrollbars = DontHitTestScrollbars, int hitType = HitTestRequest::ReadOnly | HitTestRequest::Active);
->>>>>>> webkit.org at r63859:WebCore/page/EventHandler.h
+#endif
 
     bool mousePressed() const { return m_mousePressed; }
     void setMousePressed(bool pressed) { m_mousePressed = pressed; }
diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp
index bca2c7b..95c4d21 100644
--- a/WebCore/page/Settings.cpp
+++ b/WebCore/page/Settings.cpp
@@ -148,13 +148,10 @@ Settings::Settings(Page* page)
     , m_html5TreeBuilderEnabled(false) // Will be deleted soon, do not use.
     , m_paginateDuringLayoutEnabled(false)
     , m_dnsPrefetchingEnabled(true)
-<<<<<<< HEAD:WebCore/page/Settings.cpp
+    , m_memoryInfoEnabled(false)
 #ifdef ANDROID_PLUGINS
     , m_pluginsOnDemand(false)
 #endif
-=======
-    , m_memoryInfoEnabled(false)
->>>>>>> webkit.org at r63859:WebCore/page/Settings.cpp
 {
     // 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 d1ffdbe..8d02d7c 100644
--- a/WebCore/page/Settings.h
+++ b/WebCore/page/Settings.h
@@ -499,13 +499,10 @@ namespace WebCore {
         bool m_html5TreeBuilderEnabled: 1; // Will be deleted soon, do not use.
         bool m_paginateDuringLayoutEnabled : 1;
         bool m_dnsPrefetchingEnabled : 1;
-<<<<<<< HEAD:WebCore/page/Settings.h
+        bool m_memoryInfoEnabled: 1;
 #ifdef ANDROID_PLUGINS
         bool m_pluginsOnDemand : 1;
 #endif
-=======
-        bool m_memoryInfoEnabled: 1;
->>>>>>> webkit.org at r63859:WebCore/page/Settings.h
     
 #if USE(SAFARI_THEME)
         static bool gShouldPaintNativeControls;
diff --git a/WebCore/platform/network/ResourceHandle.h b/WebCore/platform/network/ResourceHandle.h
index 867e974..3dc38f8 100644
--- a/WebCore/platform/network/ResourceHandle.h
+++ b/WebCore/platform/network/ResourceHandle.h
@@ -197,17 +197,12 @@ public:
     void setClient(ResourceHandleClient*);
 
     void setDefersLoading(bool);
-<<<<<<< HEAD:WebCore/platform/network/ResourceHandle.h
 #if PLATFORM(ANDROID)
 // TODO: this needs upstreaming.
     void pauseLoad(bool);
 #endif
-
-    const ResourceRequest& request() const;
-=======
       
     ResourceRequest& firstRequest();
->>>>>>> webkit.org at r63859:WebCore/platform/network/ResourceHandle.h
     const String& lastHTTPMethod() const;
 
     void fireFailure(Timer<ResourceHandle>*);