GeolocationPermissions cleanup

- Avoid the need to pass the main frame to GeolocationPermissions. This can be
  determined from the WebViewCore.
- Call GeolocationPermissions::maybeStorePermanentPermissions() directly from
  WebViewCore to avoid the need for a ChromeClient method.

No functional change.

Bug: 6511338
Change-Id: I80436e3728080338199a632890a64e573a658bba

5 files changed, 19 insertions, 31 deletions

diff --git a/Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
index 907dc3c..e736087 100644
--- a/Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
+++ b/Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
@@ -516,8 +516,9 @@ void ChromeClientAndroid::requestGeolocationPermissionForFrame(Frame* frame, Geo
 {
     ASSERT(geolocation);
     if (!m_geolocationPermissions) {
-        m_geolocationPermissions = new GeolocationPermissions(android::WebViewCore::getWebViewCore(frame->view()),
-                                                              m_webFrame->page()->mainFrame());
+        WebViewCore* webViewCore = android::WebViewCore::getWebViewCore(frame->view());
+        ASSERT(webViewCore->mainFrame() == m_webFrame->page()->mainFrame());
+        m_geolocationPermissions = new GeolocationPermissions(webViewCore);
     }
     m_geolocationPermissions->queryPermissionState(frame);
 }
@@ -530,15 +531,9 @@ void ChromeClientAndroid::cancelGeolocationPermissionRequestForFrame(Frame* fram
 
 void ChromeClientAndroid::provideGeolocationPermissions(const String &origin, bool allow, bool remember)
 {
-    ASSERT(m_geolocationPermissions);
     m_geolocationPermissions->providePermissionState(origin, allow, remember);
 }
 
-void ChromeClientAndroid::storeGeolocationPermissions()
-{
-    GeolocationPermissions::maybeStorePermanentPermissions();
-}
-
 void ChromeClientAndroid::onMainFrameLoadStarted()
 {
     if (m_geolocationPermissions.get())
diff --git a/Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.h b/Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
index 36576e6..8b509d5 100644
--- a/Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
+++ b/Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
@@ -151,7 +151,6 @@ namespace android {
         virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*, WebCore::Geolocation*);
         // Android-specific
         void provideGeolocationPermissions(const String &origin, bool allow, bool remember);
-        void storeGeolocationPermissions();
         void onMainFrameLoadStarted();
 
         virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
diff --git a/Source/WebKit/android/WebCoreSupport/GeolocationPermissions.cpp b/Source/WebKit/android/WebCoreSupport/GeolocationPermissions.cpp
index 36a9b61..fb29bd6 100755
--- a/Source/WebKit/android/WebCoreSupport/GeolocationPermissions.cpp
+++ b/Source/WebKit/android/WebCoreSupport/GeolocationPermissions.cpp
@@ -26,16 +26,16 @@
 #include "config.h"
 #include "GeolocationPermissions.h"
 
-#include "DOMWindow.h"
-#include "Frame.h"
-#include "Geolocation.h"
-#include "Navigator.h"
-#include "SQLiteDatabase.h"
-#include "SQLiteFileSystem.h"
-#include "SQLiteStatement.h"
-#include "SQLiteTransaction.h"
 #include "WebViewCore.h"
 
+#include <DOMWindow.h>
+#include <Frame.h>
+#include <Geolocation.h>
+#include <Navigator.h>
+#include <SQLiteDatabase.h>
+#include <SQLiteFileSystem.h>
+#include <SQLiteStatement.h>
+#include <SQLiteTransaction.h>
 #include <text/CString.h>
 
 using namespace WebCore;
@@ -51,9 +51,8 @@ String GeolocationPermissions::s_databasePath;
 
 static const char* databaseName = "GeolocationPermissions.db";
 
-GeolocationPermissions::GeolocationPermissions(WebViewCore* webViewCore, Frame* mainFrame)
+GeolocationPermissions::GeolocationPermissions(WebViewCore* webViewCore)
     : m_webViewCore(webViewCore)
-    , m_mainFrame(mainFrame)
     , m_timer(this, &GeolocationPermissions::timerFired)
 
 {
@@ -266,7 +265,7 @@ void GeolocationPermissions::maybeCallbackFrames(String origin, bool allow)
     // or have their contents replaced. Even uniqueChildName is not unique when
     // frames are dynamically deleted and created. Instead, we simply call back
     // to the Geolocation object in all frames from the correct origin.
-    for (Frame* frame = m_mainFrame; frame; frame = frame->tree()->traverseNext()) {
+    for (Frame* frame = m_webViewCore->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
         if (origin == frame->document()->securityOrigin()->toString()) {
             // If the page has changed, it may no longer have a Geolocation
             // object.
diff --git a/Source/WebKit/android/WebCoreSupport/GeolocationPermissions.h b/Source/WebKit/android/WebCoreSupport/GeolocationPermissions.h
index fb31dfe..8f4b96e 100644
--- a/Source/WebKit/android/WebCoreSupport/GeolocationPermissions.h
+++ b/Source/WebKit/android/WebCoreSupport/GeolocationPermissions.h
@@ -26,9 +26,8 @@
 #ifndef GeolocationPermissions_h
 #define GeolocationPermissions_h
 
-#include "PlatformString.h"
-#include "Timer.h"
-
+#include <PlatformString.h>
+#include <Timer.h>
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
 #include <wtf/RefCounted.h>
@@ -63,9 +62,8 @@ namespace android {
     class GeolocationPermissions : public RefCounted<GeolocationPermissions> {
       public:
         // Creates the GeolocationPermissions object to manage permissions for
-        // the specified main frame (i.e. tab). The WebViewCore is used to
-        // communicate with the browser to display UI.
-        GeolocationPermissions(WebViewCore* webViewCore, WebCore::Frame* mainFrame);
+        // the WebView.
+        GeolocationPermissions(WebViewCore* webViewCore);
         virtual ~GeolocationPermissions();
 
         // Queries the permission state for the specified frame. If the
@@ -140,7 +138,6 @@ namespace android {
         const WTF::String& nextOriginInQueue();
 
         WebViewCore* m_webViewCore;
-        WebCore::Frame* m_mainFrame;
         // A vector of the origins queued to make a permission request.
         // The first in the vector is the origin currently making the request.
         typedef Vector<WTF::String> OriginVector;
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp
index e621644..b119cc4 100644
--- a/Source/WebKit/android/jni/WebViewCore.cpp
+++ b/Source/WebKit/android/jni/WebViewCore.cpp
@@ -4726,11 +4726,9 @@ static void Pause(JNIEnv* env, jobject obj, jint nativeClass)
     // browser). The browser can only be killed by the system when it is in the
     // background, so saving the Geolocation permission state now ensures that
     // is maintained when the browser is killed.
-    WebViewCore* viewImpl = reinterpret_cast<WebViewCore*>(nativeClass);
-    ChromeClient* chromeClient = viewImpl->mainFrame()->page()->chrome()->client();
-    ChromeClientAndroid* chromeClientAndroid = static_cast<ChromeClientAndroid*>(chromeClient);
-    chromeClientAndroid->storeGeolocationPermissions();
+    GeolocationPermissions::maybeStorePermanentPermissions();
 
+    WebViewCore* viewImpl = reinterpret_cast<WebViewCore*>(nativeClass);
     Frame* mainFrame = viewImpl->mainFrame();
     for (Frame* frame = mainFrame; frame; frame = frame->tree()->traverseNext()) {
         Geolocation* geolocation = frame->domWindow()->navigator()->optionalGeolocation();