Changeset 246163 in webkit

Timestamp:

Jun 6, 2019, 12:15:56 PM (7 years ago)

Author:

sihui_liu@apple.com

Message:

NetworkHTTPSUpgradeChecker should construct and destruct database on the background thread
​https://bugs.webkit.org/show_bug.cgi?id=198496

Reviewed by Chris Dumez.

• NetworkProcess/NetworkHTTPSUpgradeChecker.cpp:

(WebKit::NetworkHTTPSUpgradeChecker::NetworkHTTPSUpgradeChecker):
(WebKit::NetworkHTTPSUpgradeChecker::~NetworkHTTPSUpgradeChecker):

• NetworkProcess/NetworkHTTPSUpgradeChecker.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkHTTPSUpgradeChecker.cpp (modified) (5 diffs)
• NetworkProcess/NetworkHTTPSUpgradeChecker.h (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-06-06  Sihui Liu  <sihui_liu@apple.com>
+
+        NetworkHTTPSUpgradeChecker should construct and destruct database on the background thread
+        https://bugs.webkit.org/show_bug.cgi?id=198496
+
+        Reviewed by Chris Dumez.
+
+        * NetworkProcess/NetworkHTTPSUpgradeChecker.cpp:
+        (WebKit::NetworkHTTPSUpgradeChecker::NetworkHTTPSUpgradeChecker):
+        (WebKit::NetworkHTTPSUpgradeChecker::~NetworkHTTPSUpgradeChecker):
+        * NetworkProcess/NetworkHTTPSUpgradeChecker.h:
+
 2019-06-06  Truitt Savell  <tsavell@apple.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp

@@ -40 +40 @@
 namespace WebKit {
 
+constexpr auto httpsUpgradeCheckerQuery = "SELECT host FROM hosts WHERE host = ?"_s;
+
 static const String& networkHTTPSUpgradeCheckerDatabasePath()
 {
@@ -56 +58 @@
 NetworkHTTPSUpgradeChecker::NetworkHTTPSUpgradeChecker()
     : m_workQueue(WorkQueue::create("HTTPS Upgrade Checker Thread"))
-    , m_database(makeUniqueRef<WebCore::SQLiteDatabase>())
-    , m_statement(makeUniqueRef<WebCore::SQLiteStatement>(m_database.get(), "SELECT host FROM hosts WHERE host = ?;"_s))
 {
     ASSERT(RunLoop::isMain());
@@ -68 +68 @@
         }
 
+        m_database = std::make_unique<SQLiteDatabase>();
         bool isDatabaseOpen = m_database->open(path, WebCore::SQLiteDatabase::OpenMode::ReadOnly);
         if (!isDatabaseOpen) {
@@ -80 +81 @@
         m_database->disableThreadingChecks();
 
+        m_statement = std::make_unique<SQLiteStatement>(*m_database, httpsUpgradeCheckerQuery);
         int isStatementPrepared = (m_statement->prepare() == SQLITE_OK);
         ASSERT(isStatementPrepared);
@@ -91 +93 @@
 NetworkHTTPSUpgradeChecker::~NetworkHTTPSUpgradeChecker()
 {
-    // This object should be owned by a singleton object.
-    ASSERT_NOT_REACHED();
+    if (m_database)
+        m_workQueue->dispatch([database = WTFMove(m_database), statement = WTFMove(m_statement)] { });
 }
 

trunk/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.h

@@ -45 +45 @@
 public:
     NetworkHTTPSUpgradeChecker();
-    NO_RETURN_DUE_TO_ASSERT ~NetworkHTTPSUpgradeChecker();
+    ~NetworkHTTPSUpgradeChecker();
 
     // Returns `true` after internal setup is successfully completed. If there is an error with setup, or if setup is in-progress, it will return `false`.
@@ -55 +55 @@
 private:
     Ref<WorkQueue> m_workQueue;
-    UniqueRef<WebCore::SQLiteDatabase> m_database;
-    UniqueRef<WebCore::SQLiteStatement> m_statement;
+    std::unique_ptr<WebCore::SQLiteDatabase> m_database;
+    std::unique_ptr<WebCore::SQLiteStatement> m_statement;
     std::atomic<bool> m_didSetupCompleteSuccessfully { false };
 };