Merge WebKit at r80534: Fix conflicts.

Android.jscbindings.mk 79223
Conflict due to http://trac.webkit.org/changeset/79223

Android.mk
Conflicts due to http://trac.webkit.org/changeset/79825 and
http://trac.webkit.org/changeset/79978

Android.v8bindings.mk 80367
Conflicts due to http://trac.webkit.org/changeset/80103 and
http://trac.webkit.org/changeset/80367

HTMLMediaElement.cpp
Conflicts due to http://trac.webkit.org/changeset/80030 and
local TOUCH_EVENTS modifications.

HTMLDocumentParser.cpp
Conflict due to http://trac.webkit.org/changeset/79772 and
local ANDROID_INSTRUMENT modifications.

CachedResourceLoader.cpp|h
Conflicts due to http://trac.webkit.org/changeset/78602 and
ANDROID_BLOCK_NETWORK_IMAGE.

MemoryCache.h
Conflicts due to http://trac.webkit.org/changeset/78848 and
ANDROID_INSTRUMENT.

FrameView.cpp
Conflict due to http://trac.webkit.org/changeset/78928 and
locally added updatePositionedObjects function.

NetworkStateNotifier
JobjectWrapper.cpp
Git seems to have got confused with a rename here in
JobjectWrapper.cpp, keep ours.
Conflicts due to http://trac.webkit.org/changeset/79563 and
local Android additions.

PluginViewNone.cpp 79904
Conflicts due to http://trac.webkit.org/changeset/79904 and
local cherry pick of http://trac.webkit.org/changeset/79988

RenderBox.cpp
Conflicts due to http://trac.webkit.org/changeset/79467 and
local android modifications.

Change-Id: I98bd80de86b5169212da137ad3df42c1c35e8931

14 files changed, 33 insertions, 104 deletions

diff --git a/Source/WebCore/Android.jscbindings.mk b/Source/WebCore/Android.jscbindings.mk
index ed0461c..d491cd2 100644
--- a/Source/WebCore/Android.jscbindings.mk
+++ b/Source/WebCore/Android.jscbindings.mk
@@ -94,16 +94,13 @@ LOCAL_SRC_FILES += \
 	bindings/js/JSDOMBinding.cpp \
 	bindings/js/JSDOMFormDataCustom.cpp \
 	bindings/js/JSDOMGlobalObject.cpp \
-<<<<<<< HEAD
+	bindings/js/JSDOMImplementationCustom.cpp \
 	bindings/js/JSDOMMimeTypeArrayCustom.cpp \
 	bindings/js/JSDOMPluginArrayCustom.cpp \
 	bindings/js/JSDOMPluginCustom.cpp \
-	bindings/js/JSDOMStringMapCustom.cpp \
-=======
-	bindings/js/JSDOMImplementationCustom.cpp \
 	bindings/js/JSDOMSettableTokenList.cpp \
+	bindings/js/JSDOMStringMapCustom.cpp \
 	bindings/js/JSDOMTokenList.cpp \
->>>>>>> WebKit at r80534
 	bindings/js/JSDOMWindowBase.cpp \
 	bindings/js/JSDOMWindowCustom.cpp \
 	bindings/js/JSDOMWindowShell.cpp \
diff --git a/Source/WebCore/Android.mk b/Source/WebCore/Android.mk
index 2d4f24c..31b066a 100644
--- a/Source/WebCore/Android.mk
+++ b/Source/WebCore/Android.mk
@@ -517,11 +517,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	platform/ContentType.cpp \
 	platform/ContextMenuItem.cpp \
 	platform/CrossThreadCopier.cpp \
-<<<<<<< HEAD
 	platform/Cursor.cpp \
-	platform/DeprecatedPtrListImpl.cpp \
-=======
->>>>>>> WebKit at r80534
 	platform/DragData.cpp \
 	platform/DragImage.cpp \
 	platform/FileChooser.cpp \
@@ -926,11 +922,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 
 LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	rendering/ScrollBehavior.cpp \
-<<<<<<< HEAD
 	rendering/ShadowElement.cpp \
-	rendering/TextControlInnerElements.cpp \
-=======
->>>>>>> WebKit at r80534
 	rendering/TransformState.cpp \
 	rendering/break_lines.cpp \
 	\
diff --git a/Source/WebCore/Android.v8bindings.mk b/Source/WebCore/Android.v8bindings.mk
index 446051a..f42fc28 100644
--- a/Source/WebCore/Android.v8bindings.mk
+++ b/Source/WebCore/Android.v8bindings.mk
@@ -199,7 +199,6 @@ LOCAL_SRC_FILES += \
 	bridge/jni/v8/JavaClassV8.cpp \
 	bridge/jni/v8/JavaFieldV8.cpp \
 	bridge/jni/v8/JavaInstanceV8.cpp \
-<<<<<<< HEAD
 	bridge/jni/v8/JavaNPObjectV8.cpp
 
 # For XPath.
@@ -209,7 +208,3 @@ LOCAL_SRC_FILES += \
 # For XSLT.
 LOCAL_SRC_FILES += \
 	bindings/v8/custom/V8XSLTProcessorCustom.cpp
-=======
-	bridge/jni/v8/JavaNPObject.cpp \
-	bridge/jni/v8/JobjectWrapper.cpp
->>>>>>> WebKit at r80534
diff --git a/Source/WebCore/bridge/jni/JobjectWrapper.cpp b/Source/WebCore/bridge/jni/JobjectWrapper.cpp
index 82cdb2a..04217ee 100644
--- a/Source/WebCore/bridge/jni/JobjectWrapper.cpp
+++ b/Source/WebCore/bridge/jni/JobjectWrapper.cpp
@@ -48,24 +48,9 @@ JobjectWrapper::JobjectWrapper(jobject instance)
         LOG_ERROR("Could not get GlobalRef for %p", instance);
 }
 
-<<<<<<< HEAD:Source/WebCore/platform/network/android/NetworkStateNotifierAndroid.cpp
-// TODO: Upstream to webkit.org
-void NetworkStateNotifier::networkTypeChange(Connection::ConnectionType type)
-{
-    if (m_type == type)
-        return;
-
-    m_type = type;
-
-    if (m_networkStateChangedFunction)
-        m_networkStateChangedFunction();
-}
-
-=======
 JobjectWrapper::~JobjectWrapper()
 {
     m_env->DeleteGlobalRef(m_instance);
->>>>>>> WebKit at r80534:Source/WebCore/bridge/jni/JobjectWrapper.cpp
 }
 
 #endif // ENABLE(JAVA_BRIDGE)
diff --git a/Source/WebCore/html/HTMLMediaElement.cpp b/Source/WebCore/html/HTMLMediaElement.cpp
index a2506d0..ad0fdef 100644
--- a/Source/WebCore/html/HTMLMediaElement.cpp
+++ b/Source/WebCore/html/HTMLMediaElement.cpp
@@ -171,14 +171,12 @@ HTMLMediaElement::HTMLMediaElement(const QualifiedName& tagName, Document* docum
     LOG(Media, "HTMLMediaElement::HTMLMediaElement");
     document->registerForDocumentActivationCallbacks(this);
     document->registerForMediaVolumeCallbacks(this);
-<<<<<<< HEAD
+    document->registerForPrivateBrowsingStateChangedCallbacks(this);
 #if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS)
     // Enable the Media Element to listen to all the touch events
     document->addListenerTypeIfNeeded(eventNames().touchstartEvent);
 #endif
-=======
-    document->registerForPrivateBrowsingStateChangedCallbacks(this);
->>>>>>> WebKit at r80534
+
 }
 
 HTMLMediaElement::~HTMLMediaElement()
diff --git a/Source/WebCore/html/parser/HTMLDocumentParser.cpp b/Source/WebCore/html/parser/HTMLDocumentParser.cpp
index 843df45..e79a97a 100644
--- a/Source/WebCore/html/parser/HTMLDocumentParser.cpp
+++ b/Source/WebCore/html/parser/HTMLDocumentParser.cpp
@@ -341,25 +341,14 @@ void HTMLDocumentParser::append(const SegmentedString& source)
     if (m_preloadScanner)
         m_preloadScanner->appendToEnd(source);
 
-<<<<<<< HEAD
-        if (m_writeNestingLevel > 1) {
-            // We've gotten data off the network in a nested write.
-            // We don't want to consume any more of the input stream now.  Do
-            // not worry.  We'll consume this data in a less-nested write().
-#ifdef ANDROID_INSTRUMENT
-            android::TimeCounter::record(android::TimeCounter::ParsingTimeCounter, __FUNCTION__);
-#endif
-            return;
-        }
-
-        pumpTokenizerIfPossible(AllowYield);
-=======
     if (inPumpSession()) {
         // We've gotten data off the network in a nested write.
         // We don't want to consume any more of the input stream now.  Do
         // not worry.  We'll consume this data in a less-nested write().
+#ifdef ANDROID_INSTRUMENT
+        android::TimeCounter::record(android::TimeCounter::ParsingTimeCounter, __FUNCTION__);
+#endif
         return;
->>>>>>> WebKit at r80534
     }
 
     pumpTokenizerIfPossible(AllowYield);
diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.cpp b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
index 57e5ee6..71edb1b 100644
--- a/Source/WebCore/loader/cache/CachedResourceLoader.cpp
+++ b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
@@ -85,13 +85,11 @@ CachedResourceLoader::CachedResourceLoader(Document* document)
     , m_autoLoadImages(true)
     , m_loadFinishing(false)
     , m_allowStaleResources(false)
-<<<<<<< HEAD
+    , m_isInMethod(0)
 #ifdef ANDROID_BLOCK_NETWORK_IMAGE
     , m_blockNetworkImage(false)
 #endif
-=======
-    , m_isInMethod(0)
->>>>>>> WebKit at r80534
+
 {
 }
 
diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.h b/Source/WebCore/loader/cache/CachedResourceLoader.h
index 594a0e2..0302010 100644
--- a/Source/WebCore/loader/cache/CachedResourceLoader.h
+++ b/Source/WebCore/loader/cache/CachedResourceLoader.h
@@ -153,15 +153,12 @@ private:
     bool m_autoLoadImages : 1;
     bool m_loadFinishing : 1;
     bool m_allowStaleResources : 1;
-<<<<<<< HEAD
 #ifdef ANDROID_BLOCK_NETWORK_IMAGE
     bool m_blockNetworkImage : 1;
 #endif
-=======
     
     // FIME: For debugging, remove.
     unsigned m_isInMethod;
->>>>>>> WebKit at r80534
 };
 
 }
diff --git a/Source/WebCore/loader/cache/MemoryCache.h b/Source/WebCore/loader/cache/MemoryCache.h
index 15a7c17..a092eac 100644
--- a/Source/WebCore/loader/cache/MemoryCache.h
+++ b/Source/WebCore/loader/cache/MemoryCache.h
@@ -167,16 +167,15 @@ public:
     
     void resourceAccessed(CachedResource*);
 
-<<<<<<< HEAD
+    typedef HashSet<RefPtr<SecurityOrigin>, SecurityOriginHash> SecurityOriginSet;
+    void removeResourcesWithOrigin(SecurityOrigin*);
+    void getOriginsWithCache(SecurityOriginSet& origins);
+
 #ifdef ANDROID_INSTRUMENT
     unsigned getLiveSize() { return m_liveSize; }
     unsigned getDeadSize() { return m_deadSize; }
 #endif
-=======
-    typedef HashSet<RefPtr<SecurityOrigin>, SecurityOriginHash> SecurityOriginSet;
-    void removeResourcesWithOrigin(SecurityOrigin*);
-    void getOriginsWithCache(SecurityOriginSet& origins);
->>>>>>> WebKit at r80534
+
 
 private:
     MemoryCache();
diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp
index 3be999c..8ab19ab 100644
--- a/Source/WebCore/page/FrameView.cpp
+++ b/Source/WebCore/page/FrameView.cpp
@@ -1126,7 +1126,6 @@ void FrameView::removeFixedObject()
         updateCanBlitOnScrollRecursively();
 }
 
-<<<<<<< HEAD
 #if PLATFORM(ANDROID)
 // When the screen size change, fixed positioned element should be updated.
 void FrameView::updatePositionedObjects()
@@ -1149,7 +1148,7 @@ void FrameView::updatePositionedObjects()
     }
 }
 #endif
-=======
+
 int FrameView::scrollXForFixedPosition() const
 {
     int visibleContentWidth = visibleContentRect().width();
@@ -1206,7 +1205,6 @@ IntSize FrameView::scrollOffsetForFixedPosition() const
 {
     return IntSize(scrollXForFixedPosition(), scrollYForFixedPosition());
 }
->>>>>>> WebKit at r80534
 
 IntPoint FrameView::currentMousePosition() const
 {
diff --git a/Source/WebCore/platform/network/NetworkStateNotifier.cpp b/Source/WebCore/platform/network/NetworkStateNotifier.cpp
index d0e00f1..636a4b9 100644
--- a/Source/WebCore/platform/network/NetworkStateNotifier.cpp
+++ b/Source/WebCore/platform/network/NetworkStateNotifier.cpp
@@ -59,4 +59,17 @@ void NetworkStateNotifier::setOnLine(bool onLine)
 }
 #endif // PLATFORM(ANDROID) || PLATFORM(CHROMIM)
 
+#ifdef ANDROID
+void NetworkStateNotifier::networkTypeChange(Connection::ConnectionType type)
+{
+    if (m_type == type)
+        return;
+
+    m_type = type;
+
+    if (m_networkStateChangedFunction)
+        m_networkStateChangedFunction();
+}
+#endif
+
 }
diff --git a/Source/WebCore/platform/network/NetworkStateNotifier.h b/Source/WebCore/platform/network/NetworkStateNotifier.h
index 116bbb4..ee11370 100644
--- a/Source/WebCore/platform/network/NetworkStateNotifier.h
+++ b/Source/WebCore/platform/network/NetworkStateNotifier.h
@@ -78,18 +78,13 @@ public:
 
 #if PLATFORM(ANDROID)
     void networkStateChange(bool online) { setOnLine(online); }
-#endif
-
-<<<<<<< HEAD
-#if PLATFORM(ANDROID)
+    // TODO: Upstream to webkit.org
+    void networkTypeChange(Connection::ConnectionType type);
     // TODO: Upstream to webkit.org
     Connection::ConnectionType type() const { return m_type; }
 #endif
 
-private:    
-=======
 private:
->>>>>>> WebKit at r80534
     bool m_isOnLine;
 #if PLATFORM(ANDROID)
     // TODO: Upstream to webkit.org
@@ -116,18 +111,6 @@ private:
     HANDLE m_waitHandle;
     OVERLAPPED m_overlapped;
 
-<<<<<<< HEAD
-#elif PLATFORM(CHROMIUM)
-    NetworkStateNotifierPrivate p;
-
-#elif PLATFORM(ANDROID)
-public:
-    void networkStateChange(bool online);
-    // TODO: Upstream to webkit.org
-    void networkTypeChange(Connection::ConnectionType type);
-
-=======
->>>>>>> WebKit at r80534
 #elif PLATFORM(QT) && ENABLE(QT_BEARER)
     friend class NetworkStateNotifierPrivate;
     NetworkStateNotifierPrivate* p;
diff --git a/Source/WebCore/plugins/PluginViewNone.cpp b/Source/WebCore/plugins/PluginViewNone.cpp
index c0d0e4a..383ac49 100644
--- a/Source/WebCore/plugins/PluginViewNone.cpp
+++ b/Source/WebCore/plugins/PluginViewNone.cpp
@@ -28,10 +28,7 @@
 
 #if USE(JSC)
 #include "BridgeJSC.h"
-<<<<<<< HEAD
-=======
 #include <runtime/ScopeChain.h>
->>>>>>> WebKit at r80534
 #endif
 
 using namespace WTF;
diff --git a/Source/WebCore/rendering/RenderBox.cpp b/Source/WebCore/rendering/RenderBox.cpp
index 4d90284..6e7c0f2 100644
--- a/Source/WebCore/rendering/RenderBox.cpp
+++ b/Source/WebCore/rendering/RenderBox.cpp
@@ -2117,7 +2117,6 @@ void RenderBox::computeBlockDirectionMargins(RenderBlock* containingBlock)
 
 int RenderBox::containingBlockLogicalWidthForPositioned(const RenderBoxModelObject* containingBlock, bool checkForPerpendicularWritingMode) const
 {
-<<<<<<< HEAD
 #if PLATFORM(ANDROID)
     // Fixed element's position should be decided by the visible screen size.
     // That is in the doc coordindate.
@@ -2126,19 +2125,13 @@ int RenderBox::containingBlockLogicalWidthForPositioned(const RenderBoxModelObje
         return PlatformBridge::screenWidthInDocCoord(view->frameView());
     }
 #endif
-    if (containingBlock->isBox()) {
-        const RenderBox* containingBlockBox = toRenderBox(containingBlock);
-        return containingBlockBox->width() - containingBlockBox->borderLeft() - containingBlockBox->borderRight() - containingBlockBox->verticalScrollbarWidth();
-    }
-    
-=======
+
     if (checkForPerpendicularWritingMode && containingBlock->style()->isHorizontalWritingMode() != style()->isHorizontalWritingMode())
         return containingBlockLogicalHeightForPositioned(containingBlock, false);
 
     if (containingBlock->isBox())
         return toRenderBox(containingBlock)->clientLogicalWidth();
 
->>>>>>> WebKit at r80534
     ASSERT(containingBlock->isRenderInline() && containingBlock->isRelPositioned());
 
     const RenderInline* flow = toRenderInline(containingBlock);
@@ -2162,8 +2155,7 @@ int RenderBox::containingBlockLogicalWidthForPositioned(const RenderBoxModelObje
     return max(0, (fromRight - fromLeft));
 }
 
-<<<<<<< HEAD
-int RenderBox::containingBlockHeightForPositioned(const RenderBoxModelObject* containingBlock) const
+int RenderBox::containingBlockLogicalHeightForPositioned(const RenderBoxModelObject* containingBlock, bool checkForPerpendicularWritingMode) const
 {
 #if PLATFORM(ANDROID)
     // Fixed element's position should be decided by the visible screen size.
@@ -2173,14 +2165,10 @@ int RenderBox::containingBlockHeightForPositioned(const RenderBoxModelObject* co
         return PlatformBridge::screenHeightInDocCoord(view->frameView());
     }
 #endif
-    int heightResult = 0;
-=======
-int RenderBox::containingBlockLogicalHeightForPositioned(const RenderBoxModelObject* containingBlock, bool checkForPerpendicularWritingMode) const
-{
+
     if (checkForPerpendicularWritingMode && containingBlock->style()->isHorizontalWritingMode() != style()->isHorizontalWritingMode())
         return containingBlockLogicalWidthForPositioned(containingBlock, false);
 
->>>>>>> WebKit at r80534
     if (containingBlock->isBox())
         return toRenderBox(containingBlock)->clientLogicalHeight();