Changeset 166663 in webkit

Timestamp:

Apr 2, 2014 1:59:19 PM (10 years ago)

Author:

dino@apple.com

Message:

[iOS] Expose geolocation provider on the process pool
​https://bugs.webkit.org/show_bug.cgi?id=131125

Patch by Sam Weinig.
Reviewed by Dean Jackson.

• UIProcess/API/Cocoa/WKProcessPool.mm:

(-[WKProcessPool _geolocationProvider]): Create and initialize WKGeolocationProviderIOS if necessary.

• UIProcess/API/Cocoa/WKProcessPoolInternal.h: Expose _geolocationProvider.
• UIProcess/ios/WKContentView.mm:

(-[WKContentView _decidePolicyForGeolocationRequestFromOrigin:frame:request:]): Call into WKProcessPool.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKProcessPool.mm (modified) (3 diffs)
• UIProcess/API/Cocoa/WKProcessPoolInternal.h (modified) (2 diffs)
• UIProcess/ios/WKContentView.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-02  Dean Jackson  <dino@apple.com>
+
+        [iOS] Expose geolocation provider on the process pool
+        https://bugs.webkit.org/show_bug.cgi?id=131125
+
+        Patch by Sam Weinig.
+        Reviewed by Dean Jackson.
+
+        * UIProcess/API/Cocoa/WKProcessPool.mm:
+        (-[WKProcessPool _geolocationProvider]): Create and initialize WKGeolocationProviderIOS if necessary.
+        * UIProcess/API/Cocoa/WKProcessPoolInternal.h: Expose _geolocationProvider.
+        * UIProcess/ios/WKContentView.mm:
+        (-[WKContentView _decidePolicyForGeolocationRequestFromOrigin:frame:request:]): Call into WKProcessPool.
+
 2014-04-02  Martin Hock  <mhock@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm

@@ -46 +46 @@
 #if PLATFORM(IOS)
 #import <WebCore/WebCoreThreadSystemInterface.h>
+#import "WKGeolocationProviderIOS.h"
 #endif
 
@@ -64 +65 @@
 @implementation WKProcessPool {
     WebKit::WeakObjCPtr<id <_WKDownloadDelegate>> _downloadDelegate;
+
+#if PLATFORM(IOS)
+    RetainPtr<WKGeolocationProviderIOS> _geolocationProvider;
+#endif // PLATFORM(IOS)
 }
 
@@ -192 +197 @@
 @end
 
+#if PLATFORM(IOS)
+@implementation WKProcessPool (WKInternal)
+
+- (WKGeolocationProviderIOS *)_geolocationProvider
+{
+    if (!_geolocationProvider)
+        _geolocationProvider = adoptNS([[WKGeolocationProviderIOS alloc] initWithContext:_context.get()]);
+    return _geolocationProvider.get();
+}
+
+@end
+#endif // PLATFORM(IOS)
+
 #endif // WK_API_ENABLED

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

@@ -31 +31 @@
 #import "WebContext.h"
 
+#if TARGET_OS_IPHONE
+@class WKGeolocationProviderIOS;
+#endif
+
 namespace WebKit {
 
@@ -49 +53 @@
 @end
 
+#if TARGET_OS_IPHONE
+@interface WKProcessPool (WKInternal)
+@property(readonly) WKGeolocationProviderIOS *_geolocationProvider;
+@end
+#endif
+
 #endif // WK_API_ENABLED

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

@@ -446 +446 @@
 - (void)_decidePolicyForGeolocationRequestFromOrigin:(WebSecurityOrigin&)origin frame:(WebFrameProxy&)frame request:(GeolocationPermissionRequestProxy&)permissionRequest
 {
-    // FIXME: The line below is commented out since wrapper(WebContext&) now returns a WKProcessPool.
-    // As part of the new API we should figure out where geolocation fits in, see <rdar://problem/15885544>.
-    // [[wrapper(_page->process().context()) _geolocationProvider] decidePolicyForGeolocationRequestFromOrigin:toAPI(&origin) frame:toAPI(&frame) request:toAPI(&permissionRequest) window:[self window]];
+    [[wrapper(_page->process().context()) _geolocationProvider] decidePolicyForGeolocationRequestFromOrigin:toAPI(&origin) frame:toAPI(&frame) request:toAPI(&permissionRequest) window:[self window]];
 }