Changeset 252536 in webkit

Timestamp:

Nov 17, 2019 5:12:54 PM (4 years ago)

Author:

ap@apple.com

Message:

Better build fix attempt after r252434.

We do need this variant, it was a mistake to claim that it's "old".

• Platform/spi/ios/UIKitSPI.h:
• UIProcess/ios/WKGeolocationProviderIOSObjCSecurityOrigin.mm:

(WebKit::decidePolicyForGeolocationRequestFromOrigin):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Platform/spi/ios/UIKitSPI.h (modified) (1 diff)
• UIProcess/ios/WKGeolocationProviderIOSObjCSecurityOrigin.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-11-17  Alexey Proskuryakov  <ap@apple.com>
+
+        Better build fix attempt after r252434. 
+
+        We do need this variant, it was a mistake to claim that it's "old".
+
+        * Platform/spi/ios/UIKitSPI.h:
+        * UIProcess/ios/WKGeolocationProviderIOSObjCSecurityOrigin.mm:
+        (WebKit::decidePolicyForGeolocationRequestFromOrigin):
+
 2019-11-17  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h

@@ -1149 +1149 @@
 @end
 
-@interface UIColor (IPI)
+@interface UIWebGeolocationPolicyDecider (Staging_25963823)
+- (void)decidePolicyForGeolocationRequestFromOrigin:(id)securityOrigin requestingURL:(NSURL *)requestingURL view:(UIView *)view listener:(id)listener;
+@end
+
+ @interface UIColor (IPI)
 + (UIColor *)insertionPointColor;
 @end

trunk/Source/WebKit/UIProcess/ios/WKGeolocationProviderIOSObjCSecurityOrigin.mm

@@ -52 +52 @@
     RetainPtr<NSURL> requestUrl = adoptNS([[NSURL alloc] initWithString:urlString]);
     RetainPtr<UIWebGeolocationPolicyDecider> decider = [UIWebGeolocationPolicyDecider sharedPolicyDecider];
-    [decider decidePolicyForGeolocationRequestFromOrigin:securityOrigin.get() requestingURL:requestUrl.get() window:view.window listener:listener];
+    if ([decider respondsToSelector:@selector(decidePolicyForGeolocationRequestFromOrigin:requestingURL:view:listener:)])
+        [decider decidePolicyForGeolocationRequestFromOrigin:securityOrigin.get() requestingURL:requestUrl.get() view:view listener:listener];
+    else
+        [decider decidePolicyForGeolocationRequestFromOrigin:securityOrigin.get() requestingURL:requestUrl.get() window:view.window listener:listener];
 }