Changeset 271184 in webkit

Timestamp:

Jan 5, 2021, 5:08:52 PM (6 years ago)

Author:

wilander@apple.com

Message:

PCM: Experimental debug mode stops working after initial use
​https://bugs.webkit.org/show_bug.cgi?id=220336
<rdar://problem/72398086>

Reviewed by Brent Fulgham.

The existing experimental PCM debug mode uses
RuntimeEnabledFeatures::sharedFeatures().privateClickMeasurementDebugModeEnabled()
which is not correct in the network process. This makes the flag to lose its
state after navigations in new tabs.

This patch moves the flag to be alongside the PCM feature flag in
WebKit::NetworkProcess.

• NetworkProcess/NetworkProcess.cpp:

(WebKit::NetworkProcess::setPrivateClickMeasurementDebugMode):
(WebKit::NetworkProcess::privateClickMeasurementDebugModeEnabled const):

• NetworkProcess/NetworkProcess.h:
• NetworkProcess/PrivateClickMeasurementManager.cpp:

(WebKit::PrivateClickMeasurementManager::debugModeEnabled const):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkProcess.cpp (modified) (2 diffs)
• NetworkProcess/NetworkProcess.h (modified) (2 diffs)
• NetworkProcess/PrivateClickMeasurementManager.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-01-05  John Wilander  <wilander@apple.com>
+
+        PCM: Experimental debug mode stops working after initial use
+        https://bugs.webkit.org/show_bug.cgi?id=220336
+        <rdar://problem/72398086>
+
+        Reviewed by Brent Fulgham.
+
+        The existing experimental PCM debug mode uses
+        RuntimeEnabledFeatures::sharedFeatures().privateClickMeasurementDebugModeEnabled()
+        which is not correct in the network process. This makes the flag to lose its
+        state after navigations in new tabs.
+
+        This patch moves the flag to be alongside the PCM feature flag in
+        WebKit::NetworkProcess.
+
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::setPrivateClickMeasurementDebugMode):
+        (WebKit::NetworkProcess::privateClickMeasurementDebugModeEnabled const):
+        * NetworkProcess/NetworkProcess.h:
+        * NetworkProcess/PrivateClickMeasurementManager.cpp:
+        (WebKit::PrivateClickMeasurementManager::debugModeEnabled const):
+
 2021-01-05  Kimmo Kinnunen  <kkinnunen@apple.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp

@@ -1325 +1325 @@
 }
 
-void NetworkProcess::setPrivateClickMeasurementDebugMode(bool debugMode)
-{
-    if (RuntimeEnabledFeatures::sharedFeatures().privateClickMeasurementDebugModeEnabled() == debugMode)
-        return;
-
-    RuntimeEnabledFeatures::sharedFeatures().setPrivateClickMeasurementDebugModeEnabled(debugMode);
-
-    String message = debugMode ? "[Private Click Measurement] Turned Debug Mode on."_s : "[Private Click Measurement] Turned Debug Mode off."_s;
+void NetworkProcess::setPrivateClickMeasurementDebugMode(bool enabled)
+{
+    if (m_privateClickMeasurementDebugModeEnabled == enabled)
+        return;
+
+    m_privateClickMeasurementDebugModeEnabled = enabled;
+
+    String message = enabled ? "[Private Click Measurement] Turned Debug Mode on."_s : "[Private Click Measurement] Turned Debug Mode off."_s;
     for (auto& networkConnectionToWebProcess : m_webProcessConnections.values()) {
         if (networkConnectionToWebProcess->sessionID().isEphemeral())
@@ -1338 +1338 @@
         networkConnectionToWebProcess->broadcastConsoleMessage(MessageSource::PrivateClickMeasurement, MessageLevel::Info, message);
     }
+}
+
+bool NetworkProcess::privateClickMeasurementDebugModeEnabled() const
+{
+    return m_privateClickMeasurementDebugModeEnabled;
 }
 

trunk/Source/WebKit/NetworkProcess/NetworkProcess.h

@@ -280 +280 @@
     bool privateClickMeasurementEnabled() const;
     void setPrivateClickMeasurementDebugMode(bool);
+    bool privateClickMeasurementDebugModeEnabled() const;
 
     using CacheStorageRootPathCallback = CompletionHandler<void(String&&)>;
@@ -595 +596 @@
 
     bool m_privateClickMeasurementEnabled { true };
+    bool m_privateClickMeasurementDebugModeEnabled { false };
 };
 

trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurementManager.cpp

@@ -335 +335 @@
 bool PrivateClickMeasurementManager::debugModeEnabled() const
 {
-    return RuntimeEnabledFeatures::sharedFeatures().privateClickMeasurementDebugModeEnabled() && !m_sessionID.isEphemeral();
+    return m_networkProcess->privateClickMeasurementDebugModeEnabled() && !m_sessionID.isEphemeral();
 }