Changeset 249206 in webkit

Timestamp:

Aug 28, 2019, 10:14:27 AM (7 years ago)

Author:

Chris Dumez

Message:

Have WebPageProxy generate the page identifier by itself
​https://bugs.webkit.org/show_bug.cgi?id=201223

Reviewed by Ryosuke Niwa.

Have WebPageProxy generate the page identifier by itself instead of
having the WebProcessProxy do it.

• UIProcess/ServiceWorkerProcessProxy.cpp:

(WebKit::m_serviceWorkerPageID):

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::create):
(WebKit::WebPageProxy::WebPageProxy):

• UIProcess/WebPageProxy.h:
• UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::createWebPage):
(WebKit::WebProcessProxy::generatePageID): Deleted.

• UIProcess/WebProcessProxy.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ServiceWorkerProcessProxy.cpp (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (2 diffs)
• UIProcess/WebPageProxy.h (modified) (4 diffs)
• UIProcess/WebProcessProxy.cpp (modified) (2 diffs)
• UIProcess/WebProcessProxy.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-08-28  Chris Dumez  <cdumez@apple.com>
+
+        Have WebPageProxy generate the page identifier by itself
+        https://bugs.webkit.org/show_bug.cgi?id=201223
+
+        Reviewed by Ryosuke Niwa.
+
+        Have WebPageProxy generate the page identifier by itself instead of
+        having the WebProcessProxy do it.
+
+        * UIProcess/ServiceWorkerProcessProxy.cpp:
+        (WebKit::m_serviceWorkerPageID):
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::create):
+        (WebKit::WebPageProxy::WebPageProxy):
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::createWebPage):
+        (WebKit::WebProcessProxy::generatePageID): Deleted.
+        * UIProcess/WebProcessProxy.h:
+
 2019-08-28  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/UIProcess/ServiceWorkerProcessProxy.cpp

@@ -54 +54 @@
     : WebProcessProxy { pool, &store, IsPrewarmed::No }
     , m_registrableDomain(registrableDomain)
-    , m_serviceWorkerPageID(generatePageID())
+    , m_serviceWorkerPageID(PageIdentifier::generate())
 {
 }

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -388 +388 @@
 }
 
-Ref<WebPageProxy> WebPageProxy::create(PageClient& pageClient, WebProcessProxy& process, PageIdentifier pageID, Ref<API::PageConfiguration>&& configuration)
-{
-    return adoptRef(*new WebPageProxy(pageClient, process, pageID, WTFMove(configuration)));
-}
-
-WebPageProxy::WebPageProxy(PageClient& pageClient, WebProcessProxy& process, PageIdentifier pageID, Ref<API::PageConfiguration>&& configuration)
-    : m_pageClient(makeWeakPtr(pageClient))
+Ref<WebPageProxy> WebPageProxy::create(PageClient& pageClient, WebProcessProxy& process, Ref<API::PageConfiguration>&& configuration)
+{
+    return adoptRef(*new WebPageProxy(pageClient, process, WTFMove(configuration)));
+}
+
+WebPageProxy::WebPageProxy(PageClient& pageClient, WebProcessProxy& process, Ref<API::PageConfiguration>&& configuration)
+    : m_pageID(PageIdentifier::generate())
+    , m_pageClient(makeWeakPtr(pageClient))
     , m_configuration(WTFMove(configuration))
     , m_navigationClient(makeUniqueRef<API::NavigationClient>())
@@ -429 +430 @@
     , m_waitsForPaintAfterViewDidMoveToWindow(m_configuration->waitsForPaintAfterViewDidMoveToWindow())
     , m_hasRunningProcess(process.state() != WebProcessProxy::State::Terminated)
-    , m_pageID(pageID)
     , m_controlledByAutomation(m_configuration->isControlledByAutomation())
 #if PLATFORM(COCOA)

trunk/Source/WebKit/UIProcess/WebPageProxy.h

@@ -386 +386 @@
     , public CanMakeWeakPtr<WebPageProxy> {
 public:
-    static Ref<WebPageProxy> create(PageClient&, WebProcessProxy&, WebCore::PageIdentifier, Ref<API::PageConfiguration>&&);
+    static Ref<WebPageProxy> create(PageClient&, WebProcessProxy&, Ref<API::PageConfiguration>&&);
     virtual ~WebPageProxy();
 
@@ -1571 +1571 @@
 
 private:
-    WebPageProxy(PageClient&, WebProcessProxy&, WebCore::PageIdentifier, Ref<API::PageConfiguration>&&);
+    WebPageProxy(PageClient&, WebProcessProxy&, Ref<API::PageConfiguration>&&);
     void platformInitialize();
 
@@ -2114 +2114 @@
     void makeStorageSpaceRequest(WebCore::FrameIdentifier, const String& originIdentifier, const String& databaseName, const String& displayName, uint64_t currentQuota, uint64_t currentOriginUsage, uint64_t currentDatabaseUsage, uint64_t expectedUsage, CompletionHandler<void(uint64_t)>&&);
 
+    const WebCore::PageIdentifier m_pageID;
     WeakPtr<PageClient> m_pageClient;
     Ref<API::PageConfiguration> m_configuration;
@@ -2353 +2354 @@
 #endif
 
-    const WebCore::PageIdentifier m_pageID;
-
     bool m_isPageSuspended { false };
     bool m_addsVisitedLinks { true };

trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp

@@ -111 +111 @@
 }
 
-PageIdentifier WebProcessProxy::generatePageID()
-{
-    return PageIdentifier::generate();
-}
-
 static WebProcessProxy::WebPageProxyMap& globalPageMap()
 {
@@ -390 +385 @@
 Ref<WebPageProxy> WebProcessProxy::createWebPage(PageClient& pageClient, Ref<API::PageConfiguration>&& pageConfiguration)
 {
-    auto pageID = generatePageID();
-    Ref<WebPageProxy> webPage = WebPageProxy::create(pageClient, *this, pageID, WTFMove(pageConfiguration));
+    Ref<WebPageProxy> webPage = WebPageProxy::create(pageClient, *this, WTFMove(pageConfiguration));
 
     addExistingWebPage(webPage.get(), BeginsUsingDataStore::Yes);

trunk/Source/WebKit/UIProcess/WebProcessProxy.h

@@ -314 +314 @@
 
 protected:
-    static WebCore::PageIdentifier generatePageID();
     WebProcessProxy(WebProcessPool&, WebsiteDataStore*, IsPrewarmed);