Merge WebKit at r65615 : Fix conflicts.

Removing call to Geolocation::stop(), which was lost in the
merge with http://trac.webkit.org/changeset/65416

We may still have memory leaks here. This is being tracked
in https://bugs.webkit.org/show_bug.cgi?id=39288

Change-Id: I69b75bf07775536ac603a450dbde8c2935c4db16

3 files changed, 0 insertions, 38 deletions

diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index b2ab7c5..492daeb 100644
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -264,11 +264,8 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	\
 	html/AsyncImageResizer.cpp \
 	html/Blob.cpp \
-<<<<<<< HEAD
 	html/BlobBuilder.cpp \
-=======
 	html/BlobURL.cpp \
->>>>>>> WebKit at r65615
 	html/CollectionCache.cpp \
 	html/CSSPreloadScanner.cpp \
 	html/DOMFormData.cpp \
@@ -305,15 +302,10 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	html/HTMLViewSourceParser.cpp \
 	html/ImageData.cpp \
 	html/ImageResizerThread.cpp \
-<<<<<<< HEAD
 	html/LabelsNodeList.cpp \
 	html/LegacyHTMLTreeBuilder.cpp \
 	html/StepRange.cpp \
-	html/LegacyHTMLDocumentParser.cpp \
-	html/LegacyPreloadScanner.cpp \
-=======
 	html/ThreadableBlobRegistry.cpp \
->>>>>>> WebKit at r65615
 	html/TimeRanges.cpp \
 	html/ValidityState.cpp \
 	\
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index a4bc865..dc2c68c 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -62,9 +62,6 @@
 #include "FrameLoaderClient.h"
 #include "FrameTree.h"
 #include "FrameView.h"
-#if PLATFORM(ANDROID)
-#include "Geolocation.h"
-#endif // PLATFORM(ANDROID)
 #include "HTMLAnchorElement.h"
 #include "HTMLFormElement.h"
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
@@ -80,9 +77,6 @@
 #include "Logging.h"
 #include "MIMETypeRegistry.h"
 #include "MainResourceLoader.h"
-#if PLATFORM(ANDROID)
-#include "Navigator.h"
-#endif // PLATFORM(ANDROID)
 #include "Page.h"
 #include "PageCache.h"
 #include "PageGroup.h"
@@ -448,13 +442,6 @@ void FrameLoader::stopLoading(UnloadEventPolicy unloadEventPolicy, DatabasePolic
 #endif
     }
 
-#if PLATFORM(ANDROID)
-     // Stop the Geolocation object, if present. This call is made after the unload
-     // event has fired, so no new Geolocation activity is possible.
-    if (m_frame->domWindow()->navigator()->optionalGeolocation())
-        m_frame->domWindow()->navigator()->optionalGeolocation()->stop();
-#endif // PLATFORM(ANDROID)
-
     // FIXME: This will cancel redirection timer, which really needs to be restarted when restoring the frame from b/f cache.
     m_frame->redirectScheduler()->cancel();
 }
diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp
index 0847769..9a5e40b 100644
--- a/WebCore/page/Geolocation.cpp
+++ b/WebCore/page/Geolocation.cpp
@@ -234,29 +234,12 @@ Geolocation::~Geolocation()
 {
 }
 
-#if PLATFORM(ANDROID)
-void Geolocation::stop()
-{
-    m_oneShots.clear();
-    m_watchers.clear();
-    stopUpdating();
-}
-#endif // PLATFORM(ANDROID)
-
 void Geolocation::disconnectFrame()
 {
     if (m_frame && m_frame->page() && m_allowGeolocation == InProgress)
         m_frame->page()->chrome()->cancelGeolocationPermissionRequestForFrame(m_frame, this);
-<<<<<<< HEAD
-#if PLATFORM(ANDROID)
-    // See Geolocation::stop()
-#else
-    stopTimers();
-=======
     cancelAllRequests();
->>>>>>> WebKit at r65615
     stopUpdating();
-#endif // PLATFORM(ANDROID)
     if (m_frame && m_frame->document())
         m_frame->document()->setUsingGeolocation(false);
     m_frame = 0;