Changeset 265035 in webkit

Timestamp:

Jul 29, 2020 1:45:12 AM (4 years ago)

Author:

youenn@apple.com

Message:

TestWebKitAPI.WebKit.QuotaDelegate flaky times out
​https://bugs.webkit.org/show_bug.cgi?id=214842

Reviewed by Geoffrey Garen.

Source/WebKit:

Add some release logging.

• UIProcess/Network/NetworkProcessProxy.cpp:

(WebKit::NetworkProcessProxy::requestStorageSpace):

Tools:

• TestWebKitAPI/Tests/WebKitCocoa/StorageQuota.mm:

In case the page is not visible, quota increase delegate will be denied.
Delay the cache storage hence the quota increase until the page is visible.

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/StorageQuota.mm (modified) (4 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-07-29  Youenn Fablet  <youenn@apple.com>
+
+        TestWebKitAPI.WebKit.QuotaDelegate flaky times out
+        https://bugs.webkit.org/show_bug.cgi?id=214842
+
+        Reviewed by Geoffrey Garen.
+
+        Add some release logging.
+
+        * UIProcess/Network/NetworkProcessProxy.cpp:
+        (WebKit::NetworkProcessProxy::requestStorageSpace):
+
 2020-07-29  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp

@@ -1371 +1371 @@
 void NetworkProcessProxy::requestStorageSpace(PAL::SessionID sessionID, const WebCore::ClientOrigin& origin, uint64_t currentQuota, uint64_t currentSize, uint64_t spaceRequired, CompletionHandler<void(Optional<uint64_t> quota)>&& completionHandler)
 {
+    RELEASE_LOG(Storage, "%p - NetworkProcessProxy::requestStorageSpace", this);
     auto* store = websiteDataStoreFromSessionID(sessionID);
 
@@ -1390 +1391 @@
 
         WebPageProxy::forMostVisibleWebPageIfAny(sessionID, origin.topOrigin, [completionHandler = WTFMove(completionHandler), origin, currentQuota, currentSize, spaceRequired](auto* page) mutable {
+            RELEASE_LOG(Storage, "NetworkProcessProxy::requestStorageSpace trying to get a visible page: %d", !!page);
             if (!page) {
                 completionHandler({ });

trunk/Tools/ChangeLog

@@ +1 @@
+2020-07-29  Youenn Fablet  <youenn@apple.com>
+
+        TestWebKitAPI.WebKit.QuotaDelegate flaky times out
+        https://bugs.webkit.org/show_bug.cgi?id=214842
+
+        Reviewed by Geoffrey Garen.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/StorageQuota.mm:
+        In case the page is not visible, quota increase delegate will be denied.
+        Delay the cache storage hence the quota increase until the page is visible.
+
 2020-07-28  Dean Jackson  <dino@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/StorageQuota.mm

@@ -153 +153 @@
     }
 }
-doTest();
+
+window.onload = () => {
+    if (document.visibilityState === 'visible')
+        doTest();
+    else {
+        document.addEventListener("visibilitychange", function() {
+            if (document.visibilityState === 'visible')
+                doTest();
+        });
+    }
+}
 
 function doTestAgain()
@@ -230 +240 @@
     setVisible(webView1.get());
 
-    NSLog(@"QuotaDelegate 1");
-
     receivedQuotaDelegateCalled = false;
     [webView1 loadRequest:server.request()];
     Util::run(&receivedQuotaDelegateCalled);
-
-    NSLog(@"QuotaDelegate 2");
 
     auto webView2 = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get() addToWindow:YES]);
@@ -248 +254 @@
     Util::run(&receivedMessage);
 
-    NSLog(@"QuotaDelegate 3");
-
     EXPECT_FALSE(delegate2.get().quotaDelegateCalled);
     [delegate1 grantQuota];
@@ -257 +261 @@
     Util::run(&receivedMessage);
 
-    NSLog(@"QuotaDelegate 4");
-
     while (!delegate2.get().quotaDelegateCalled)
         TestWebKitAPI::Util::sleep(0.1);
-
-    NSLog(@"QuotaDelegate 5");
 
     [delegate2 denyQuota];