Changeset 241826 in webkit

Timestamp:

Feb 20, 2019 11:43:44 AM (5 years ago)

Author:

achristensen@apple.com

Message:

Move API::HTTPCookieStore ownership from API::WebsiteDataStore to WebKit::WebsiteDataStore
​https://bugs.webkit.org/show_bug.cgi?id=194842

Reviewed by Geoff Garen.

We need a way to get from WebKit::WebsiteDataStore to API::HTTPCookieStore. It can't be done before this.
This made an existing reference cycle easier to see, and we should fix it in a followup patch.

• UIProcess/API/APIWebsiteDataStore.cpp:

(API::WebsiteDataStore::httpCookieStore):

• UIProcess/API/APIWebsiteDataStore.h:
• UIProcess/WebsiteData/WebsiteDataStore.cpp:

(WebKit::WebsiteDataStore::cookieStore):

• UIProcess/WebsiteData/WebsiteDataStore.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/APIHTTPCookieStore.cpp (modified) (1 diff)
• UIProcess/API/APIHTTPCookieStore.h (modified) (3 diffs)
• UIProcess/API/APIWebsiteDataStore.cpp (modified) (1 diff)
• UIProcess/API/APIWebsiteDataStore.h (modified) (1 diff)
• UIProcess/WebsiteData/WebsiteDataStore.cpp (modified) (1 diff)
• UIProcess/WebsiteData/WebsiteDataStore.h (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-02-20  Alex Christensen  <achristensen@webkit.org>
+
+        Move API::HTTPCookieStore ownership from API::WebsiteDataStore to WebKit::WebsiteDataStore
+        https://bugs.webkit.org/show_bug.cgi?id=194842
+
+        Reviewed by Geoff Garen.
+
+        We need a way to get from WebKit::WebsiteDataStore to API::HTTPCookieStore.  It can't be done before this.
+        This made an existing reference cycle easier to see, and we should fix it in a followup patch.
+
+        * UIProcess/API/APIWebsiteDataStore.cpp:
+        (API::WebsiteDataStore::httpCookieStore):
+        * UIProcess/API/APIWebsiteDataStore.h:
+        * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+        (WebKit::WebsiteDataStore::cookieStore):
+        * UIProcess/WebsiteData/WebsiteDataStore.h:
+
 2019-02-20  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/API/APIHTTPCookieStore.cpp

@@ -38 +38 @@
 namespace API {
 
-HTTPCookieStore::HTTPCookieStore(WebsiteDataStore& websiteDataStore)
-    : m_owningDataStore(websiteDataStore.websiteDataStore())
+HTTPCookieStore::HTTPCookieStore(WebKit::WebsiteDataStore& websiteDataStore)
+    : m_owningDataStore(websiteDataStore)
 {
     if (!m_owningDataStore->processPoolForCookieStorageOperations())

trunk/Source/WebKit/UIProcess/API/APIHTTPCookieStore.h

@@ -52 +52 @@
 class HTTPCookieStore final : public ObjectImpl<Object::Type::HTTPCookieStore> {
 public:
-    static Ref<HTTPCookieStore> create(WebsiteDataStore& websiteDataStore)
+    static Ref<HTTPCookieStore> create(WebKit::WebsiteDataStore& websiteDataStore)
     {
         return adoptRef(*new HTTPCookieStore(websiteDataStore));
@@ -76 +76 @@
 
 private:
-    HTTPCookieStore(WebsiteDataStore&);
+    HTTPCookieStore(WebKit::WebsiteDataStore&);
 
     void registerForNewProcessPoolNotifications();
@@ -88 +88 @@
     void stopObservingChangesToDefaultUIProcessCookieStore();
     
+    // FIXME: This is a reference cycle.
     Ref<WebKit::WebsiteDataStore> m_owningDataStore;
     HashSet<Observer*> m_observers;

trunk/Source/WebKit/UIProcess/API/APIWebsiteDataStore.cpp

@@ -86 +86 @@
 HTTPCookieStore& WebsiteDataStore::httpCookieStore()
 {
-    if (!m_apiHTTPCookieStore)
-        m_apiHTTPCookieStore = HTTPCookieStore::create(*this);
-
-    return *m_apiHTTPCookieStore;
+    return m_websiteDataStore->cookieStore();
 }
 

trunk/Source/WebKit/UIProcess/API/APIWebsiteDataStore.h

@@ -92 +92 @@
 
     Ref<WebKit::WebsiteDataStore> m_websiteDataStore;
-    RefPtr<HTTPCookieStore> m_apiHTTPCookieStore;
 };
 

trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp

@@ -2098 +2098 @@
 #endif
 
+API::HTTPCookieStore& WebsiteDataStore::cookieStore()
+{
+    if (!m_cookieStore)
+        m_cookieStore = API::HTTPCookieStore::create(*this);
+
+    return *m_cookieStore;
+}
+
 void WebsiteDataStore::didCreateNetworkProcess()
 {

trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h

@@ -56 +56 @@
 #include <WebKitAdditions/WebsiteDataStoreAdditions.h>
 #endif
+
+namespace API {
+class HTTPCookieStore;
+}
 
 namespace WebCore {
@@ -230 +234 @@
     void setClient(UniqueRef<WebsiteDataStoreClient>&& client) { m_client = WTFMove(client); }
 
+    API::HTTPCookieStore& cookieStore();
+
 #if HAVE(LOAD_OPTIMIZER)
 WEBSITEDATASTORE_LOADOPTIMIZER_ADDITIONS_1
@@ -310 +316 @@
 
     UniqueRef<WebsiteDataStoreClient> m_client;
+
+    RefPtr<API::HTTPCookieStore> m_cookieStore;
 };