Title: [271466] branches/safari-611-branch/Source/WebKit
Revision
271466
Author
[email protected]
Date
2021-01-13 15:18:38 -0800 (Wed, 13 Jan 2021)

Log Message

Cherry-pick r271448. rdar://problem/73168438

    PCM: Experimental debug mode needs to be read from defaults differently on iOS
    https://bugs.webkit.org/show_bug.cgi?id=220573
    <rdar://problem/73092137>

    Reviewed by Brent Fulgham.

    Experimental features on iOS use the prefix "WebKitExperimental" so we
    need to read it that way on that platform. PCM is not supported on other
    platforms than macOS and iOS at this point.

    * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
    (WebKit::WebProcessPool::platformInitializeNetworkProcess):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@271448 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-611-branch/Source/WebKit/ChangeLog (271465 => 271466)


--- branches/safari-611-branch/Source/WebKit/ChangeLog	2021-01-13 23:18:36 UTC (rev 271465)
+++ branches/safari-611-branch/Source/WebKit/ChangeLog	2021-01-13 23:18:38 UTC (rev 271466)
@@ -1,3 +1,38 @@
+2021-01-13  Russell Epstein  <[email protected]>
+
+        Cherry-pick r271448. rdar://problem/73168438
+
+    PCM: Experimental debug mode needs to be read from defaults differently on iOS
+    https://bugs.webkit.org/show_bug.cgi?id=220573
+    <rdar://problem/73092137>
+    
+    Reviewed by Brent Fulgham.
+    
+    Experimental features on iOS use the prefix "WebKitExperimental" so we
+    need to read it that way on that platform. PCM is not supported on other
+    platforms than macOS and iOS at this point.
+    
+    * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+    (WebKit::WebProcessPool::platformInitializeNetworkProcess):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@271448 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-01-13  John Wilander  <[email protected]>
+
+            PCM: Experimental debug mode needs to be read from defaults differently on iOS
+            https://bugs.webkit.org/show_bug.cgi?id=220573
+            <rdar://problem/73092137>
+
+            Reviewed by Brent Fulgham.
+
+            Experimental features on iOS use the prefix "WebKitExperimental" so we
+            need to read it that way on that platform. PCM is not supported on other
+            platforms than macOS and iOS at this point.
+
+            * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+            (WebKit::WebProcessPool::platformInitializeNetworkProcess):
+
 2021-01-11  Kimmo Kinnunen  <[email protected]>
 
         WebKit::IPC::Encoder needs definitions of all custom enum values at the Encoder definition time

Modified: branches/safari-611-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (271465 => 271466)


--- branches/safari-611-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm	2021-01-13 23:18:36 UTC (rev 271465)
+++ branches/safari-611-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm	2021-01-13 23:18:38 UTC (rev 271466)
@@ -491,7 +491,12 @@
 #endif
 
     parameters.enablePrivateClickMeasurement = ![defaults objectForKey:WebPreferencesKey::privateClickMeasurementEnabledKey()] || [defaults boolForKey:WebPreferencesKey::privateClickMeasurementEnabledKey()];
-    parameters.enablePrivateClickMeasurementDebugMode = [defaults boolForKey:[NSString stringWithFormat:@"Experimental%@", WebPreferencesKey::privateClickMeasurementDebugModeEnabledKey().createCFString().get()]];
+#if PLATFORM(MAC)
+    NSString *format = @"Experimental%@";
+#else
+    NSString *format = @"WebKitExperimental%@";
+#endif
+    parameters.enablePrivateClickMeasurementDebugMode = [defaults boolForKey:[NSString stringWithFormat:format, WebPreferencesKey::privateClickMeasurementDebugModeEnabledKey().createCFString().get()]];
 }
 
 void WebProcessPool::platformInvalidateContext()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to