Changeset 270598 in webkit

Timestamp:

Dec 9, 2020, 1:24:40 PM (6 years ago)

Author:

wilander@apple.com

Message:

PCM: Make JSON key names use underscores according to the W3C conversation
​https://bugs.webkit.org/show_bug.cgi?id=219696
<rdar://problem/72143642>

Reviewed by Brent Fulgham.

Further discussion in ​https://github.com/privacycg/private-click-measurement/issues/30
concluded that the JSON report should use underscores in its keys instead of dashes.
This patch makes that change and shortens the "report_version" key to just "version".

Source/WebCore:

Existing tests updated.

• loader/PrivateClickMeasurement.cpp:

(WebCore::PrivateClickMeasurement::json const):

Tools:

• TestWebKitAPI/Tests/WebCore/PrivateClickMeasurement.cpp:

(TestWebKitAPI::TEST):

LayoutTests:

• http/tests/privateClickMeasurement/expired-attribution-report-gets-sent-on-session-start-expected.txt:
• http/tests/privateClickMeasurement/send-attribution-conversion-request-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/privateClickMeasurement/expired-attribution-report-gets-sent-on-session-start-expected.txt (modified) (1 diff)
• LayoutTests/http/tests/privateClickMeasurement/send-attribution-conversion-request-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/PrivateClickMeasurement.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebCore/PrivateClickMeasurement.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-12-09  John Wilander  <wilander@apple.com>
+
+        PCM: Make JSON key names use underscores according to the W3C conversation
+        https://bugs.webkit.org/show_bug.cgi?id=219696
+        <rdar://problem/72143642>
+
+        Reviewed by Brent Fulgham.
+
+        Further discussion in https://github.com/privacycg/private-click-measurement/issues/30
+        concluded that the JSON report should use underscores in its keys instead of dashes.
+        This patch makes that change and shortens the "report_version" key to just "version".
+
+        * http/tests/privateClickMeasurement/expired-attribution-report-gets-sent-on-session-start-expected.txt:
+        * http/tests/privateClickMeasurement/send-attribution-conversion-request-expected.txt:
+
 2020-12-09  Antti Koivisto  <antti@apple.com>
 

trunk/LayoutTests/http/tests/privateClickMeasurement/expired-attribution-report-gets-sent-on-session-start-expected.txt

@@ -12 +12 @@
 No cookies in attribution request.
 Request body:
-{"source-engagement-type":"click","source-site":"127.0.0.1","source-id":3,"attributed-on-site":"localhost","trigger-data":12,"report-version":1}
+{"source_engagement_type":"click","source_site":"127.0.0.1","source_id":3,"attributed_on_site":"localhost","trigger_data":12,"version":1}
 
 

trunk/LayoutTests/http/tests/privateClickMeasurement/send-attribution-conversion-request-expected.txt

@@ -17 +17 @@
 No cookies in attribution request.
 Request body:
-{"source-engagement-type":"click","source-site":"127.0.0.1","source-id":3,"attributed-on-site":"localhost","trigger-data":12,"report-version":1}
+{"source_engagement_type":"click","source_site":"127.0.0.1","source_id":3,"attributed_on_site":"localhost","trigger_data":12,"version":1}
 
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-12-09  John Wilander  <wilander@apple.com>
+
+        PCM: Make JSON key names use underscores according to the W3C conversation
+        https://bugs.webkit.org/show_bug.cgi?id=219696
+        <rdar://problem/72143642>
+
+        Reviewed by Brent Fulgham.
+
+        Further discussion in https://github.com/privacycg/private-click-measurement/issues/30
+        concluded that the JSON report should use underscores in its keys instead of dashes.
+        This patch makes that change and shortens the "report_version" key to just "version".
+
+        Existing tests updated.
+
+        * loader/PrivateClickMeasurement.cpp:
+        (WebCore::PrivateClickMeasurement::json const):
+
 2020-12-09  Antoine Quint  <graouts@webkit.org>
 

trunk/Source/WebCore/loader/PrivateClickMeasurement.cpp

@@ -161 +161 @@
         return reportDetails;
 
-    reportDetails->setString("source-engagement-type"_s, "click"_s);
-    reportDetails->setString("source-site"_s, m_sourceSite.registrableDomain.string());
-    reportDetails->setInteger("source-id"_s, m_sourceID.id);
-    reportDetails->setString("attributed-on-site"_s, m_attributeOnSite.registrableDomain.string());
-    reportDetails->setInteger("trigger-data"_s, m_attributionTriggerData->data);
-    reportDetails->setInteger("report-version"_s, 1);
+    reportDetails->setString("source_engagement_type"_s, "click"_s);
+    reportDetails->setString("source_site"_s, m_sourceSite.registrableDomain.string());
+    reportDetails->setInteger("source_id"_s, m_sourceID.id);
+    reportDetails->setString("attributed_on_site"_s, m_attributeOnSite.registrableDomain.string());
+    reportDetails->setInteger("trigger_data"_s, m_attributionTriggerData->data);
+    reportDetails->setInteger("version"_s, 1);
     return reportDetails;
 }

trunk/Tools/ChangeLog

@@ +1 @@
+2020-12-09  John Wilander  <wilander@apple.com>
+
+        PCM: Make JSON key names use underscores according to the W3C conversation
+        https://bugs.webkit.org/show_bug.cgi?id=219696
+        <rdar://problem/72143642>
+
+        Reviewed by Brent Fulgham.
+
+        Further discussion in https://github.com/privacycg/private-click-measurement/issues/30
+        concluded that the JSON report should use underscores in its keys instead of dashes.
+        This patch makes that change and shortens the "report_version" key to just "version".
+
+        * TestWebKitAPI/Tests/WebCore/PrivateClickMeasurement.cpp:
+        (TestWebKitAPI::TEST):
+
 2020-12-09  Alex Christensen  <achristensen@webkit.org>
 

trunk/Tools/TestWebKitAPI/Tests/WebCore/PrivateClickMeasurement.cpp

@@ -51 +51 @@
     ASSERT_EQ(attributionURL.string(), "https://webkit.org/.well-known/private-click-measurement/");
 
-    ASSERT_EQ(attribution.json()->toJSONString(), "{\"source-engagement-type\":\"click\",\"source-site\":\"webkit.org\",\"source-id\":0,\"attributed-on-site\":\"example.com\",\"trigger-data\":0,\"report-version\":1}");
+    ASSERT_EQ(attribution.json()->toJSONString(), "{\"source_engagement_type\":\"click\",\"source_site\":\"webkit.org\",\"source_id\":0,\"attributed_on_site\":\"example.com\",\"trigger_data\":0,\"version\":1}");
 }
 
@@ -63 +63 @@
     ASSERT_EQ(attributionURL.string(), "https://webkit.org/.well-known/private-click-measurement/");
 
-    ASSERT_EQ(attribution.json()->toJSONString(), "{\"source-engagement-type\":\"click\",\"source-site\":\"webkit.org\",\"source-id\":192,\"attributed-on-site\":\"example.com\",\"trigger-data\":9,\"report-version\":1}");
+    ASSERT_EQ(attribution.json()->toJSONString(), "{\"source_engagement_type\":\"click\",\"source_site\":\"webkit.org\",\"source_id\":192,\"attributed_on_site\":\"example.com\",\"trigger_data\":9,\"version\":1}");
 }
 
@@ -75 +75 @@
     ASSERT_EQ(attributionURL.string(), "https://webkit.org/.well-known/private-click-measurement/");
 
-    ASSERT_EQ(attribution.json()->toJSONString(), "{\"source-engagement-type\":\"click\",\"source-site\":\"webkit.org\",\"source-id\":255,\"attributed-on-site\":\"example.com\",\"trigger-data\":15,\"report-version\":1}");
+    ASSERT_EQ(attribution.json()->toJSONString(), "{\"source_engagement_type\":\"click\",\"source_site\":\"webkit.org\",\"source_id\":255,\"attributed_on_site\":\"example.com\",\"trigger_data\":15,\"version\":1}");
 }