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

1 files changed, 3 insertions, 8 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())