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

2 files changed, 15 insertions, 19 deletions

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;