Title: [223286] trunk/Source/WebKit
Revision
223286
Author
[email protected]
Date
2017-10-13 10:30:50 -0700 (Fri, 13 Oct 2017)

Log Message

Fix API tests after r223269.
https://bugs.webkit.org/show_bug.cgi?id=178246

* UIProcess/API/APIContentRuleListStore.cpp:
(API::ContentRuleListStore::getContentRuleListSource):
Version 10 also has the ability to recover content rule list source.

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (223285 => 223286)


--- trunk/Source/WebKit/ChangeLog	2017-10-13 17:30:36 UTC (rev 223285)
+++ trunk/Source/WebKit/ChangeLog	2017-10-13 17:30:50 UTC (rev 223286)
@@ -1,3 +1,12 @@
+2017-10-13  Alex Christensen  <[email protected]>
+
+        Fix API tests after r223269.
+        https://bugs.webkit.org/show_bug.cgi?id=178246
+
+        * UIProcess/API/APIContentRuleListStore.cpp:
+        (API::ContentRuleListStore::getContentRuleListSource):
+        Version 10 also has the ability to recover content rule list source.
+
 2017-10-11  Gustavo Noronha Silva  <[email protected]>
 
         [GLib] WebKitNavigationAction should tell whether it is a redirect

Modified: trunk/Source/WebKit/UIProcess/API/APIContentRuleListStore.cpp (223285 => 223286)


--- trunk/Source/WebKit/UIProcess/API/APIContentRuleListStore.cpp	2017-10-13 17:30:36 UTC (rev 223285)
+++ trunk/Source/WebKit/UIProcess/API/APIContentRuleListStore.cpp	2017-10-13 17:30:50 UTC (rev 223286)
@@ -504,6 +504,7 @@
         
         switch (metaData.version) {
         case 9:
+        case 10:
             if (!metaData.sourceSize) {
                 complete({ });
                 return;

Modified: trunk/Source/WebKit/UIProcess/API/APIContentRuleListStore.h (223285 => 223286)


--- trunk/Source/WebKit/UIProcess/API/APIContentRuleListStore.h	2017-10-13 17:30:36 UTC (rev 223285)
+++ trunk/Source/WebKit/UIProcess/API/APIContentRuleListStore.h	2017-10-13 17:30:50 UTC (rev 223286)
@@ -52,6 +52,7 @@
     // to prevent crashing while loading old data.
     // Also update ContentRuleListStore::getContentRuleListSource to be able to find the original JSON
     // source from old versions.
+    // Update ContentRuleListStore::getContentRuleListSource with this.
     const static uint32_t CurrentContentRuleListFileVersion = 10;
 
     static ContentRuleListStore& defaultStore(bool legacyFilename);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to