Changeset 271466 in webkit

Timestamp:

Jan 13, 2021, 3:18:38 PM (6 years ago)

Author:

Russell Epstein

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

Location:

branches/safari-611-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/WebProcessPoolCocoa.mm (modified) (1 diff)

branches/safari-611-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2021-01-13  Russell Epstein  <repstein@apple.com>
+
+        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  <wilander@apple.com>
+
+            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  <kkinnunen@apple.com>
 

branches/safari-611-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm

@@ -492 +492 @@
 
     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()]];
 }