Title: [246069] trunk/Source/WebKit
Revision
246069
Author
[email protected]
Date
2019-06-04 10:09:04 -0700 (Tue, 04 Jun 2019)

Log Message

Lazily construct the NetworkHTTPSUpgradeChecker
https://bugs.webkit.org/show_bug.cgi?id=198500

Reviewed by Alex Christensen.

Lazily construct the NetworkHTTPSUpgradeChecker since the feature is off by default and this
avoids unnecessarily opening its database in the common case.

* NetworkProcess/NetworkProcess.h:
* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
(WebKit::NetworkProcess::networkHTTPSUpgradeChecker):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (246068 => 246069)


--- trunk/Source/WebKit/ChangeLog	2019-06-04 16:11:38 UTC (rev 246068)
+++ trunk/Source/WebKit/ChangeLog	2019-06-04 17:09:04 UTC (rev 246069)
@@ -1,3 +1,17 @@
+2019-06-04  Chris Dumez  <[email protected]>
+
+        Lazily construct the NetworkHTTPSUpgradeChecker
+        https://bugs.webkit.org/show_bug.cgi?id=198500
+
+        Reviewed by Alex Christensen.
+
+        Lazily construct the NetworkHTTPSUpgradeChecker since the feature is off by default and this
+        avoids unnecessarily opening its database in the common case.
+
+        * NetworkProcess/NetworkProcess.h:
+        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+        (WebKit::NetworkProcess::networkHTTPSUpgradeChecker):
+
 2019-06-04  Youenn Fablet  <[email protected]>
 
         REGRESSION (r245913) [ Debug ] ASSERTION FAILED: m_swConnectionsByIdentifier.contains(connection.serverConnectionIdentifier()) Layout Test http/wpt/service-workers/update-service-worker.https.html is a flaky crash

Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (246068 => 246069)


--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h	2019-06-04 16:11:38 UTC (rev 246068)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h	2019-06-04 17:09:04 UTC (rev 246069)
@@ -316,7 +316,7 @@
 #endif
 
 #if PLATFORM(COCOA)
-    NetworkHTTPSUpgradeChecker& networkHTTPSUpgradeChecker() { return m_networkHTTPSUpgradeChecker; }
+    NetworkHTTPSUpgradeChecker& networkHTTPSUpgradeChecker();
 #endif
 
     const String& uiProcessBundleIdentifier() const { return m_uiProcessBundleIdentifier; }
@@ -546,7 +546,7 @@
 #endif
 
 #if PLATFORM(COCOA)
-    NetworkHTTPSUpgradeChecker m_networkHTTPSUpgradeChecker;
+    std::unique_ptr<NetworkHTTPSUpgradeChecker> m_networkHTTPSUpgradeChecker;
 #endif
 
     class StorageQuotaManagers {

Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm (246068 => 246069)


--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm	2019-06-04 16:11:38 UTC (rev 246068)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm	2019-06-04 17:09:04 UTC (rev 246069)
@@ -304,4 +304,11 @@
 {
 }
 
+NetworkHTTPSUpgradeChecker& NetworkProcess::networkHTTPSUpgradeChecker()
+{
+    if (!m_networkHTTPSUpgradeChecker)
+        m_networkHTTPSUpgradeChecker = std::make_unique<NetworkHTTPSUpgradeChecker>();
+    return *m_networkHTTPSUpgradeChecker;
+}
+
 } // namespace WebKit
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to