Changeset 230473 in webkit

Timestamp:

Apr 9, 2018 11:30:54 PM (6 years ago)

Author:

zandobersek@gmail.com

Message:

WKTR: Enable DOM cache, SW registration directory cleanup on non-Cocoa platforms
​https://bugs.webkit.org/show_bug.cgi?id=184414

Reviewed by Michael Catanzaro.

Enable clearServiceWorkerRegistrations(), clearDOMCache() and
clearDOMCaches() implementations in WebKitTestRunner's TestController
class for non-Cocoa platforms. Implementations depend on the generic
WK2 C API that other ports can leverage as well.

The clearDOMCache() and clearDOMCaches() calls are now operational for
tests that invoke them. clearServiceWorkerRegistrations() and
clearDOMCaches() are also called between each test, cleaning up relevant
resources.

The TestController::getAllStorageAccessEntries() stub for non-Cocoa
platforms is moved into the main !PLATFORM(COCOA) block.

• WebKitTestRunner/TestController.cpp:

(WTR::TestController::getAllStorageAccessEntries):
(WTR::clearServiceWorkerRegistrationsCallback):
(WTR::TestController::clearServiceWorkerRegistrations):
(WTR::clearDOMCacheCallback):
(WTR::TestController::clearDOMCache):
(WTR::TestController::clearDOMCaches):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/TestController.cpp (modified) (7 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-04-09  Zan Dobersek  <zdobersek@igalia.com>
+
+        WKTR: Enable DOM cache, SW registration directory cleanup on non-Cocoa platforms
+        https://bugs.webkit.org/show_bug.cgi?id=184414
+
+        Reviewed by Michael Catanzaro.
+
+        Enable clearServiceWorkerRegistrations(), clearDOMCache() and
+        clearDOMCaches() implementations in WebKitTestRunner's TestController
+        class for non-Cocoa platforms. Implementations depend on the generic
+        WK2 C API that other ports can leverage as well.
+
+        The clearDOMCache() and clearDOMCaches() calls are now operational for
+        tests that invoke them. clearServiceWorkerRegistrations() and
+        clearDOMCaches() are also called between each test, cleaning up relevant
+        resources.
+
+        The TestController::getAllStorageAccessEntries() stub for non-Cocoa
+        platforms is moved into the main !PLATFORM(COCOA) block.
+
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::getAllStorageAccessEntries):
+        (WTR::clearServiceWorkerRegistrationsCallback):
+        (WTR::TestController::clearServiceWorkerRegistrations):
+        (WTR::clearDOMCacheCallback):
+        (WTR::TestController::clearDOMCache):
+        (WTR::TestController::clearDOMCaches):
+
 2018-04-09  Zalan Bujtas  <zalan@apple.com>
 

trunk/Tools/WebKitTestRunner/TestController.cpp

@@ -2421 +2421 @@
 }
 
+void TestController::getAllStorageAccessEntries()
+{
+}
+
 #endif
 
-#if PLATFORM(COCOA) && WK_API_ENABLED
 struct ClearServiceWorkerRegistrationsCallbackContext {
     explicit ClearServiceWorkerRegistrationsCallbackContext(TestController& controller)
@@ -2440 +2443 @@
     context->testController.notifyDone();
 }
-#endif
 
 void TestController::clearServiceWorkerRegistrations()
 {
-#if PLATFORM(COCOA) && WK_API_ENABLED
     auto websiteDataStore = WKContextGetWebsiteDataStore(platformContext());
     ClearServiceWorkerRegistrationsCallbackContext context(*this);
@@ -2450 +2451 @@
     WKWebsiteDataStoreRemoveAllServiceWorkerRegistrations(websiteDataStore, &context, clearServiceWorkerRegistrationsCallback);
     runUntil(context.done, noTimeout);
-#endif
-}
-
-#if PLATFORM(COCOA) && WK_API_ENABLED
+}
+
 struct ClearDOMCacheCallbackContext {
     explicit ClearDOMCacheCallbackContext(TestController& controller)
@@ -2470 +2469 @@
     context->testController.notifyDone();
 }
-#endif
 
 void TestController::clearDOMCache(WKStringRef origin)
 {
-#if PLATFORM(COCOA) && WK_API_ENABLED
     auto websiteDataStore = WKContextGetWebsiteDataStore(platformContext());
     ClearDOMCacheCallbackContext context(*this);
@@ -2481 +2478 @@
     WKWebsiteDataStoreRemoveFetchCacheForOrigin(websiteDataStore, cacheOrigin.get(), &context, clearDOMCacheCallback);
     runUntil(context.done, noTimeout);
-#endif
 }
 
 void TestController::clearDOMCaches()
 {
-#if PLATFORM(COCOA) && WK_API_ENABLED
     auto websiteDataStore = WKContextGetWebsiteDataStore(platformContext());
     ClearDOMCacheCallbackContext context(*this);
@@ -2492 +2487 @@
     WKWebsiteDataStoreRemoveAllFetchCaches(websiteDataStore, &context, clearDOMCacheCallback);
     runUntil(context.done, noTimeout);
-#endif
 }
 
@@ -2830 +2824 @@
 }
 
-#if !PLATFORM(COCOA)
-void TestController::getAllStorageAccessEntries()
-{
-    // FIXME: Implement C API version of this test.
-}
-#endif
-
 } // namespace WTR