Changeset 265774 in webkit

Timestamp:

Aug 17, 2020 2:54:42 PM (4 years ago)

Author:

pvollan@apple.com

Message:

[Cocoa] Avoid waiting for Launch Services on every load
​https://bugs.webkit.org/show_bug.cgi?id=215569

Reviewed by Darin Adler.

Currently, we are waiting for the Launch Services database to be present on every load in the WebContent process.
It should be sufficient to wait only on the first load. Since we now are waiting only once per WebContent process,
increase the maximum wait time from 1s to 5s.

No new tests, covered by existing tests.

• WebProcess/WebPage/Cocoa/WebPageCocoa.mm:

(WebKit::WebPage::platformDidReceiveLoadParameters):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/Cocoa/WebPageCocoa.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-08-17  Per Arne Vollan  <pvollan@apple.com>
+
+        [Cocoa] Avoid waiting for Launch Services on every load
+        https://bugs.webkit.org/show_bug.cgi?id=215569
+
+        Reviewed by Darin Adler.
+
+        Currently, we are waiting for the Launch Services database to be present on every load in the WebContent process.
+        It should be sufficient to wait only on the first load. Since we now are waiting only once per WebContent process,
+        increase the maximum wait time from 1s to 5s.
+
+        No new tests, covered by existing tests.
+
+        * WebProcess/WebPage/Cocoa/WebPageCocoa.mm:
+        (WebKit::WebPage::platformDidReceiveLoadParameters):
+
 2020-08-17  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm

@@ -66 +66 @@
 {
 #if HAVE(LSDATABASECONTEXT)
-    auto startTime = WallTime::now();
-    bool databaseUpdated = LaunchServicesDatabaseManager::singleton().waitForDatabaseUpdate(1_s);
-    auto elapsedTime = WallTime::now() - startTime;
-    if (elapsedTime.value() > 0.5)
-        RELEASE_LOG(Loading, "Waiting for Launch Services database update took %f seconds", elapsedTime.value());
-    ASSERT_UNUSED(databaseUpdated, databaseUpdated);
-    if (!databaseUpdated)
-        RELEASE_LOG_ERROR(Loading, "Timed out waiting for Launch Services database update.");
+    static bool hasWaitedForLaunchServicesDatabase = false;
+    if (!hasWaitedForLaunchServicesDatabase) {
+        auto startTime = WallTime::now();
+        bool databaseUpdated = LaunchServicesDatabaseManager::singleton().waitForDatabaseUpdate(5_s);
+        auto elapsedTime = WallTime::now() - startTime;
+        if (elapsedTime.value() > 0.5)
+            RELEASE_LOG(Loading, "Waiting for Launch Services database update took %f seconds", elapsedTime.value());
+        ASSERT_UNUSED(databaseUpdated, databaseUpdated);
+        if (!databaseUpdated)
+            RELEASE_LOG_ERROR(Loading, "Timed out waiting for Launch Services database update.");
+        hasWaitedForLaunchServicesDatabase = true;
+    }
 #endif