Changeset 173019 in webkit

Timestamp:

Aug 27, 2014, 2:48:02 PM (11 years ago)

Author:

benjamin@webkit.org

Message:

[iOS WK2] Provide a delegate callback to skip Geolocation authorization per page for WebApp
​https://bugs.webkit.org/show_bug.cgi?id=136243

Patch by Benjamin Poulain <​bpoulain@apple.com> on 2014-08-27
Reviewed by Sam Weinig.

Just ask the UI if the authorization dialog needs to be skipped.

• UIProcess/API/Cocoa/WKUIDelegate.h:
• UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
• UIProcess/ios/PageClientImplIOS.mm:

(WebKit::PageClientImpl::decidePolicyForGeolocationPermissionRequest):

• UIProcess/ios/WKContentView.h:
• UIProcess/ios/WKContentView.mm:

(-[WKContentView _decidePolicyForGeolocationRequestFromOrigin:frame:request:]): Deleted.
The code in WKContentView only exists due to legacy. Instead, the PageClient dispatch the request
to the GeolocationProvider directly.

• UIProcess/ios/WKGeolocationProviderIOS.h:
• UIProcess/ios/WKGeolocationProviderIOS.mm:

(-[WKGeolocationProviderIOS decidePolicyForGeolocationRequestFromOrigin:frame:request:view:]):
(-[WKGeolocationProviderIOS geolocationAuthorizationGranted]):
(-[WKGeolocationProviderIOS positionChanged:]):
(-[WKGeolocationProviderIOS decidePolicyForGeolocationRequestFromOrigin:frame:request:window:]): Deleted.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKUIDelegate.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKUIDelegatePrivate.h (modified) (1 diff)
• UIProcess/ios/PageClientImplIOS.mm (modified) (2 diffs)
• UIProcess/ios/WKContentView.h (modified) (1 diff)
• UIProcess/ios/WKContentView.mm (modified) (2 diffs)
• UIProcess/ios/WKGeolocationProviderIOS.h (modified) (2 diffs)
• UIProcess/ios/WKGeolocationProviderIOS.mm (modified) (8 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-08-27  Benjamin Poulain  <bpoulain@apple.com>
+
+        [iOS WK2] Provide a delegate callback to skip Geolocation authorization per page for WebApp
+        https://bugs.webkit.org/show_bug.cgi?id=136243
+
+        Reviewed by Sam Weinig.
+
+        Just ask the UI if the authorization dialog needs to be skipped.
+
+        * UIProcess/API/Cocoa/WKUIDelegate.h:
+        * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
+        * UIProcess/ios/PageClientImplIOS.mm:
+        (WebKit::PageClientImpl::decidePolicyForGeolocationPermissionRequest):
+
+        * UIProcess/ios/WKContentView.h:
+        * UIProcess/ios/WKContentView.mm:
+        (-[WKContentView _decidePolicyForGeolocationRequestFromOrigin:frame:request:]): Deleted.
+        The code in WKContentView only exists due to legacy. Instead, the PageClient dispatch the request
+        to the GeolocationProvider directly.
+
+        * UIProcess/ios/WKGeolocationProviderIOS.h:
+        * UIProcess/ios/WKGeolocationProviderIOS.mm:
+        (-[WKGeolocationProviderIOS decidePolicyForGeolocationRequestFromOrigin:frame:request:view:]):
+        (-[WKGeolocationProviderIOS geolocationAuthorizationGranted]):
+        (-[WKGeolocationProviderIOS positionChanged:]):
+        (-[WKGeolocationProviderIOS decidePolicyForGeolocationRequestFromOrigin:frame:request:window:]): Deleted.
+
 2014-08-27  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegate.h

@@ -31 +31 @@
 
 @class WKFrameInfo;
+@class WKNavigationAction;
 @class WKWebViewConfiguration;
 @class WKWindowFeatures;

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h

@@ -49 +49 @@
 - (void)_webView:(WKWebView *)webView didNotHandleTapAsClickAtPoint:(CGPoint)point;
 - (void)_webView:(WKWebView *)webView usesMinimalUI:(BOOL)wantMinimalUI;
+- (bool)_webView:(WKWebView *)webView shouldRequestGeolocationAuthorizationForURL:(NSURL *)url isMainFrame:(BOOL)isMainFrame mainFrameURL:(NSURL *)mainFrameURL;
 #endif
 

trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm

@@ -39 +39 @@
 #import "WKContentView.h"
 #import "WKContentViewInteraction.h"
+#import "WKGeolocationProviderIOS.h"
+#import "WKProcessPoolInternal.h"
 #import "WKWebViewConfigurationInternal.h"
 #import "WKWebViewContentProviderRegistry.h"
@@ -229 +231 @@
 bool PageClientImpl::decidePolicyForGeolocationPermissionRequest(WebFrameProxy& frame, WebSecurityOrigin& origin, GeolocationPermissionRequestProxy& request)
 {
-    [m_contentView _decidePolicyForGeolocationRequestFromOrigin:origin frame:frame request:request];
+    [[wrapper(m_webView->_page->process().context()) _geolocationProvider] decidePolicyForGeolocationRequestFromOrigin:origin.securityOrigin() frame:frame request:request view:m_webView];
     return true;
 }

trunk/Source/WebKit2/UIProcess/ios/WKContentView.h

@@ -86 +86 @@
 - (void)_didCommitLayerTree:(const WebKit::RemoteLayerTreeTransaction&)layerTreeTransaction;
 
-- (void)_decidePolicyForGeolocationRequestFromOrigin:(WebKit::WebSecurityOrigin&)origin frame:(WebKit::WebFrameProxy&)frame request:(WebKit::GeolocationPermissionRequestProxy&)permissionRequest;
-
 - (void)_setAccessibilityWebProcessToken:(NSData *)data;
 

trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm

@@ -35 +35 @@
 #import "WKBrowsingContextControllerInternal.h"
 #import "WKBrowsingContextGroupPrivate.h"
-#import "WKGeolocationProviderIOS.h"
 #import "WKInspectorHighlightView.h"
 #import "WKPreferencesInternal.h"
 #import "WKProcessGroupPrivate.h"
-#import "WKProcessPoolInternal.h"
 #import "WKWebViewConfiguration.h"
 #import "WKWebViewInternal.h"
@@ -474 +472 @@
 }
 
-- (void)_decidePolicyForGeolocationRequestFromOrigin:(WebSecurityOrigin&)origin frame:(WebFrameProxy&)frame request:(GeolocationPermissionRequestProxy&)permissionRequest
-{
-    [[wrapper(_page->process().context()) _geolocationProvider] decidePolicyForGeolocationRequestFromOrigin:toAPI(&origin) frame:toAPI(&frame) request:toAPI(&permissionRequest) window:[self window]];
-}
-
 - (BOOL)_scrollToRect:(CGRect)targetRect withOrigin:(CGPoint)origin minimumScrollDistance:(CGFloat)minimumScrollDistance
 {

trunk/Source/WebKit2/UIProcess/ios/WKGeolocationProviderIOS.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2012, 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30 +30 @@
 
 namespace WebKit {
+class GeolocationPermissionRequestProxy;
 class WebContext;
+class WebFrameProxy;
 }
 
-@class UIWindow;
+namespace WebCore {
+class SecurityOrigin;
+}
+
+@class WKWebView;
 
 @interface WKGeolocationProviderIOS : NSObject
 -(id)initWithContext:(WebKit::WebContext*)context;
--(void)decidePolicyForGeolocationRequestFromOrigin:(WKSecurityOriginRef)origin frame:(WKFrameRef)frame request:(WKGeolocationPermissionRequestRef)permissionRequest window:(UIWindow*)window;
+-(void)decidePolicyForGeolocationRequestFromOrigin:(WebCore::SecurityOrigin&)origin frame:(WebKit::WebFrameProxy&)frame request:(WebKit::GeolocationPermissionRequestProxy&)permissionRequest view:(WKWebView*)view;
 @end
 

trunk/Source/WebKit2/UIProcess/ios/WKGeolocationProviderIOS.mm

@@ -1 +1 @@
 /*
- * Copyright (C) 2012, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30 +30 @@
 
 #import "GeolocationPermissionRequestProxy.h"
+#import "WKUIDelegatePrivate.h"
+#import "WKWebView.h"
 #import "WebContext.h"
 #import "WebGeolocationManagerProxy.h"
@@ -35 +37 @@
 #import <WebGeolocationPosition.h>
 #import <WebCore/GeolocationPosition.h>
-#import <WebKit/WKGeolocationPermissionRequest.h>
+#import <WebCore/URL.h>
 #import <wtf/Assertions.h>
 #import <wtf/PassRefPtr.h>
@@ -46 +48 @@
 #import <WebKit/WebAllowDenyPolicyListener.h>
 
+using namespace WebCore;
 using namespace WebKit;
 
@@ -60 +63 @@
 
 namespace WebKit {
-void decidePolicyForGeolocationRequestFromOrigin(WebCore::SecurityOrigin*, const String& urlString, id<WebAllowDenyPolicyListener>, UIWindow*);
+void decidePolicyForGeolocationRequestFromOrigin(SecurityOrigin*, const String& urlString, id<WebAllowDenyPolicyListener>, UIWindow*);
 };
 
 struct GeolocationRequestData {
-    RefPtr<WebCore::SecurityOrigin> origin;
+    RefPtr<SecurityOrigin> origin;
     RefPtr<WebFrameProxy> frame;
     RefPtr<GeolocationPermissionRequestProxy> permissionRequest;
-    RetainPtr<UIWindow> window;
+    RetainPtr<WKWebView> view;
 };
 
@@ -151 +154 @@
 }
 
--(void)decidePolicyForGeolocationRequestFromOrigin:(WKSecurityOriginRef)origin frame:(WKFrameRef)frame request:(WKGeolocationPermissionRequestRef)permissionRequest window:(UIWindow*)window
+-(void)decidePolicyForGeolocationRequestFromOrigin:(SecurityOrigin&)origin frame:(WebFrameProxy&)frame request:(GeolocationPermissionRequestProxy&)permissionRequest view:(WKWebView*)contentView
 {
     // Step 1: ask the user if the app can use Geolocation.
     GeolocationRequestData geolocationRequestData;
-    geolocationRequestData.origin = const_cast<WebCore::SecurityOrigin*>(&toImpl(origin)->securityOrigin());
-    geolocationRequestData.frame = toImpl(frame);
-    geolocationRequestData.permissionRequest = toImpl(permissionRequest);
-    geolocationRequestData.window = window;
+    geolocationRequestData.origin = &origin;
+    geolocationRequestData.frame = &frame;
+    geolocationRequestData.permissionRequest = &permissionRequest;
+    geolocationRequestData.view = contentView;
     _requestsWaitingForCoreLocationAuthorization.append(geolocationRequestData);
     [_coreLocationProvider requestGeolocationAuthorization];
@@ -173 +176 @@
     Vector<GeolocationRequestData> requests = WTF::move(_requestsWaitingForCoreLocationAuthorization);
     for (const auto& request : requests) {
-        RetainPtr<WKWebAllowDenyPolicyListener> policyListener = adoptNS([[WKWebAllowDenyPolicyListener alloc] initWithPermissionRequestProxy:request.permissionRequest.get()]);
-        decidePolicyForGeolocationRequestFromOrigin(request.origin.get(), request.frame->url(), policyListener.get(), request.window.get());
+        bool requiresUserAuthorization = true;
+
+        id<WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([request.view UIDelegate]);
+        if ([uiDelegate respondsToSelector:@selector(_webView:shouldRequestGeolocationAuthorizationForURL:isMainFrame:mainFrameURL:)]) {
+            const WebFrameProxy* mainFrame = request.frame->page()->mainFrame();
+            bool isMainFrame = request.frame == mainFrame;
+            URL requestFrameURL(URL(), request.frame->url());
+            URL mainFrameURL(URL(), mainFrame->url());
+            requiresUserAuthorization = [uiDelegate _webView:request.view.get()
+                 shouldRequestGeolocationAuthorizationForURL:requestFrameURL
+                                                 isMainFrame:isMainFrame
+                                                mainFrameURL:mainFrameURL];
+        }
+
+        if (requiresUserAuthorization) {
+            RetainPtr<WKWebAllowDenyPolicyListener> policyListener = adoptNS([[WKWebAllowDenyPolicyListener alloc] initWithPermissionRequestProxy:request.permissionRequest.get()]);
+            decidePolicyForGeolocationRequestFromOrigin(request.origin.get(), request.frame->url(), policyListener.get(), [request.view window]);
+        } else
+            request.permissionRequest->allow();
     }
 }
@@ -185 +205 @@
 }
 
-- (void)positionChanged:(WebCore::GeolocationPosition*)position
+- (void)positionChanged:(GeolocationPosition*)position
 {
     _lastActivePosition = WebGeolocationPosition::create(position->timestamp(), position->latitude(), position->longitude(), position->accuracy(), position->canProvideAltitude(), position->altitude(), position->canProvideAltitudeAccuracy(), position->altitudeAccuracy(), position->canProvideHeading(), position->heading(), position->canProvideSpeed(), position->speed());