Merge Webkit at r63173 : Fix conflicts.

Android.v8bindings.mk: IDBBindingUtilities caused by http://trac.webkit.org/changeset/63064

CSSCompitedStyleDeclaration.cpp conflict caused by http://trac.webkit.org/changeset/63038
'Computed style is not implemented for padding-start, padding-end, margin-start, margin-end'

HTMLDocumentParser.cpp conflict caused by http://trac.webkit.org/changeset/63165
'HTML5 Parser: document.write after onload blows away document'

Navigator.h conflict caused by http://trac.webkit.org/changeset/62577

Page.cpp caused by  http://trac.webkit.org/changeset/62502

ResourceHandleAndroid.cpp by http://trac.webkit.org/changeset/62736

HTMLLinkElement.* by the upstreaming of link prefetching at http://trac.webkit.org/changeset/63032

Change-Id: I5b9d3eef87cd525a9fc7d862676a41fc4122cba0

9 files changed, 11 insertions, 52 deletions

diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk
index 8eaa091..e887747 100644
--- a/WebCore/Android.v8bindings.mk
+++ b/WebCore/Android.v8bindings.mk
@@ -49,12 +49,9 @@ LOCAL_SRC_FILES += \
 	bindings/v8/DateExtension.cpp \
 	bindings/v8/DOMData.cpp \
 	bindings/v8/DOMDataStore.cpp \
-<<<<<<< HEAD
 	bindings/v8/DOMWrapperWorld.cpp \
-	bindings/v8/IsolatedWorld.cpp \
-=======
 	bindings/v8/IDBBindingUtilities.cpp \
->>>>>>> webkit.org at r63173
+	bindings/v8/IsolatedWorld.cpp \
 	bindings/v8/MainThreadDOMData.cpp \
 	bindings/v8/NPV8Object.cpp \
 	bindings/v8/ScheduledAction.cpp \
@@ -129,12 +126,9 @@ LOCAL_SRC_FILES += \
 	bindings/v8/custom/V8EventSourceConstructor.cpp \
 	bindings/v8/custom/V8Float32ArrayCustom.cpp \
 	bindings/v8/custom/V8GeolocationCustom.cpp \
-<<<<<<< HEAD
 	bindings/v8/custom/V8HistoryCustom.cpp \
-=======
 	bindings/v8/custom/V8IDBAny.cpp \
 	bindings/v8/custom/V8IDBKey.cpp \
->>>>>>> webkit.org at r63173
 	bindings/v8/custom/V8HTMLAllCollectionCustom.cpp \
 	bindings/v8/custom/V8HTMLAudioElementConstructor.cpp \
 	bindings/v8/custom/V8HTMLCanvasElementCustom.cpp \
diff --git a/WebCore/bridge/jni/v8/JavaInstanceV8.cpp b/WebCore/bridge/jni/v8/JavaInstanceV8.cpp
index 980bf91..dd4750f 100644
--- a/WebCore/bridge/jni/v8/JavaInstanceV8.cpp
+++ b/WebCore/bridge/jni/v8/JavaInstanceV8.cpp
@@ -32,14 +32,11 @@
 #include "JavaClassV8.h"
 
 #include <assert.h>
-<<<<<<< HEAD
 
 // ANDROID
 #define LOG_TAG "v8binding"
 #include <utils/Log.h>
 // END ANDROID
-=======
->>>>>>> webkit.org at r63173
 
 using namespace JSC::Bindings;
 
diff --git a/WebCore/css/CSSComputedStyleDeclaration.cpp b/WebCore/css/CSSComputedStyleDeclaration.cpp
index c4ccdb3..2ebab06 100644
--- a/WebCore/css/CSSComputedStyleDeclaration.cpp
+++ b/WebCore/css/CSSComputedStyleDeclaration.cpp
@@ -691,13 +691,10 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
     if (!style)
         return 0;
 
-<<<<<<< HEAD
+    propertyID = CSSProperty::resolveDirectionAwareProperty(propertyID, style->direction());
 #ifdef ANDROID_LAYOUT
     const Settings * settings = node->document()->frame() ? node->document()->frame()->settings() : 0; 
 #endif
-=======
-    propertyID = CSSProperty::resolveDirectionAwareProperty(propertyID, style->direction());
->>>>>>> webkit.org at r63173
 
     switch (static_cast<CSSPropertyID>(propertyID)) {
         case CSSPropertyInvalid:
diff --git a/WebCore/html/HTMLDocumentParser.cpp b/WebCore/html/HTMLDocumentParser.cpp
index 129f6e9..0c9f676 100644
--- a/WebCore/html/HTMLDocumentParser.cpp
+++ b/WebCore/html/HTMLDocumentParser.cpp
@@ -222,11 +222,6 @@ void HTMLDocumentParser::insert(const SegmentedString& source)
     if (m_parserStopped)
         return;
 
-<<<<<<< HEAD
-#ifdef ANDROID_INSTRUMENT
-    android::TimeCounter::start(android::TimeCounter::ParsingTimeCounter);
-#endif
-=======
     if (m_scriptRunner && !m_scriptRunner->inScriptExecution() && m_input.haveSeenEndOfFile()) {
         // document.write was called without a current insertion point.
         // According to the spec, we're supposed to implicitly open the
@@ -237,8 +232,10 @@ void HTMLDocumentParser::insert(const SegmentedString& source)
         // http://www.w3.org/Bugs/Public/show_bug.cgi?id=9767
         return;
     }
+#ifdef ANDROID_INSTRUMENT
+    android::TimeCounter::start(android::TimeCounter::ParsingTimeCounter);
+#endif
 
->>>>>>> webkit.org at r63173
     {
         NestingLevelIncrementer nestingLevelIncrementer(m_writeNestingLevel);
 
diff --git a/WebCore/html/HTMLLinkElement.cpp b/WebCore/html/HTMLLinkElement.cpp
index bad236a..eff250a 100644
--- a/WebCore/html/HTMLLinkElement.cpp
+++ b/WebCore/html/HTMLLinkElement.cpp
@@ -147,13 +147,10 @@ void HTMLLinkElement::tokenizeRelAttribute(const AtomicString& rel, RelAttribute
 #if ENABLE(LINK_PREFETCH)
     relAttribute.m_isLinkPrefetch = false;
 #endif
-<<<<<<< HEAD
 #ifdef ANDROID_APPLE_TOUCH_ICON
     relAttribute.m_isTouchIcon = false;
     relAttribute.m_isPrecomposedTouchIcon = false;
 #endif
-=======
->>>>>>> webkit.org at r63173
     if (equalIgnoringCase(rel, "stylesheet"))
         relAttribute.m_isStyleSheet = true;
     else if (equalIgnoringCase(rel, "icon") || equalIgnoringCase(rel, "shortcut icon"))
diff --git a/WebCore/html/HTMLLinkElement.h b/WebCore/html/HTMLLinkElement.h
index cc8d2d1..efdfde2 100644
--- a/WebCore/html/HTMLLinkElement.h
+++ b/WebCore/html/HTMLLinkElement.h
@@ -41,13 +41,10 @@ public:
         bool m_isIcon;
         bool m_isAlternate;
         bool m_isDNSPrefetch;
-<<<<<<< HEAD
 #ifdef ANDROID_APPLE_TOUCH_ICON
         bool m_isTouchIcon;
         bool m_isPrecomposedTouchIcon;
 #endif
-=======
->>>>>>> webkit.org at r63173
 #if ENABLE(LINK_PREFETCH)
         bool m_isLinkPrefetch;
 #endif
@@ -60,12 +57,8 @@ public:
 #if ENABLE(LINK_PREFETCH)
             , m_isLinkPrefetch(false)
 #endif
-<<<<<<< HEAD
-            { };
-=======
             { 
             }
->>>>>>> webkit.org at r63173
     };
 
     static PassRefPtr<HTMLLinkElement> create(const QualifiedName&, Document*, bool createdByParser);
diff --git a/WebCore/page/Navigator.h b/WebCore/page/Navigator.h
index 3380c9c..b40bed4 100644
--- a/WebCore/page/Navigator.h
+++ b/WebCore/page/Navigator.h
@@ -33,17 +33,12 @@ namespace WebCore {
     class Frame;
     class Geolocation;
     class PluginData;
-<<<<<<< HEAD
-    class PluginArray;
+    class String;
 #if PLATFORM(ANDROID)
     class ApplicationInstalledCallback;
     class Connection;
 #endif
 
-=======
-    class String;
->>>>>>> webkit.org at r63173
-
     class Navigator : public NavigatorBase, public RefCounted<Navigator> {
     public:
         static PassRefPtr<Navigator> create(Frame* frame) { return adoptRef(new Navigator(frame)); }
diff --git a/WebCore/page/Page.cpp b/WebCore/page/Page.cpp
index 5d023f5..ee99c43 100644
--- a/WebCore/page/Page.cpp
+++ b/WebCore/page/Page.cpp
@@ -85,13 +85,12 @@
 #include "GeolocationController.h"
 #endif
 
-<<<<<<< HEAD
-#if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
-#include "PackageNotifier.h"
-=======
 #if ENABLE(INSPECTOR) && ENABLE(OFFLINE_WEB_APPLICATIONS)
 #include "InspectorApplicationCacheAgent.h"
->>>>>>> webkit.org at r63173
+#endif
+
+#if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
+#include "PackageNotifier.h"
 #endif
 
 namespace WebCore {
@@ -126,7 +125,6 @@ static void networkStateChanged()
         frames[i]->document()->dispatchWindowEvent(Event::create(eventName, false, false));
 }
 
-<<<<<<< HEAD
 #if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
 static void onPackageResultAvailable()
 {
@@ -138,10 +136,7 @@ static void onPackageResultAvailable()
 }
 #endif
 
-Page::Page(ChromeClient* chromeClient, ContextMenuClient* contextMenuClient, EditorClient* editorClient, DragClient* dragClient, InspectorClient* inspectorClient, PluginHalterClient* pluginHalterClient, GeolocationControllerClient* geolocationControllerClient, DeviceOrientationClient* deviceOrientationClient)
-=======
 Page::Page(ChromeClient* chromeClient, ContextMenuClient* contextMenuClient, EditorClient* editorClient, DragClient* dragClient, InspectorClient* inspectorClient, PluginHalterClient* pluginHalterClient, GeolocationControllerClient* geolocationControllerClient, DeviceOrientationClient* deviceOrientationClient, BackForwardControllerClient* backForwardControllerClient)
->>>>>>> webkit.org at r63173
     : m_chrome(new Chrome(this, chromeClient))
     , m_dragCaretController(new SelectionController(0, true))
 #if ENABLE(DRAG_SUPPORT)
diff --git a/WebCore/platform/network/android/ResourceHandleAndroid.cpp b/WebCore/platform/network/android/ResourceHandleAndroid.cpp
index 60d1eb6..b8bc6da 100644
--- a/WebCore/platform/network/android/ResourceHandleAndroid.cpp
+++ b/WebCore/platform/network/android/ResourceHandleAndroid.cpp
@@ -156,19 +156,13 @@ void ResourceHandle::loadResourceSynchronously(const ResourceRequest& request,
         Frame* frame) 
 {
     SyncLoader s(error, response, data);
-<<<<<<< HEAD
-    ResourceHandle h(request, &s, false, false);
+    RefPtr<ResourceHandle> h = adoptRef(new ResourceHandle(request, &s, false, false));
     // This blocks until the load is finished.
     // Use the request owned by the ResourceHandle. This has had the username
     // and password (if present) stripped from the URL in
     // ResourceHandleInternal::ResourceHandleInternal(). This matches the
     // behaviour in the asynchronous case.
-    ResourceLoaderAndroid::start(&h, h.getInternal()->m_request, frame->loader()->client(), false, true);
-=======
-    RefPtr<ResourceHandle> h = adoptRef(new ResourceHandle(request, &s, false, false, false));
-    // This blocks until the load is finished.
     ResourceLoaderAndroid::start(h.get(), request, frame->loader()->client(), false, true);
->>>>>>> webkit.org at r63173
 }
 
 } // namespace WebCore