Changeset 222712 in webkit

Timestamp:

Oct 2, 2017 9:54:12 AM (7 years ago)

Author:

achristensen@apple.com

Message:

Remove unnecessary copy of SessionID in WebPageProxy
​https://bugs.webkit.org/show_bug.cgi?id=177702

Reviewed by Darin Adler.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::sessionID const):
(WebKit::WebPageProxy::creationParameters):

• UIProcess/WebPageProxy.h:

(WebKit::WebPageProxy::sessionID const): Deleted.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (3 diffs)
• UIProcess/WebPageProxy.h (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-10-02  Alex Christensen  <achristensen@webkit.org>
+
+        Remove unnecessary copy of SessionID in WebPageProxy
+        https://bugs.webkit.org/show_bug.cgi?id=177702
+
+        Reviewed by Darin Adler.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::sessionID const):
+        (WebKit::WebPageProxy::creationParameters):
+        * UIProcess/WebPageProxy.h:
+        (WebKit::WebPageProxy::sessionID const): Deleted.
+
 2017-10-02  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -358 +358 @@
     , m_waitsForPaintAfterViewDidMoveToWindow(m_configuration->waitsForPaintAfterViewDidMoveToWindow())
     , m_pageID(pageID)
-    , m_sessionID(m_configuration->sessionID())
     , m_controlledByAutomation(m_configuration->isControlledByAutomation())
 #if PLATFORM(COCOA)
@@ -433 +432 @@
     webPageProxyCounter.decrement();
 #endif
+}
+
+PAL::SessionID WebPageProxy::sessionID() const
+{
+    return m_websiteDataStore->sessionID();
 }
 
@@ -5657 +5661 @@
     parameters.userAgent = userAgent();
     parameters.itemStates = m_backForwardList->itemStates();
-    parameters.sessionID = m_sessionID;
+    parameters.sessionID = sessionID();
     parameters.highestUsedBackForwardItemID = WebBackForwardListItem::highestUsedItemID();
     parameters.userContentControllerID = m_userContentController->identifier();

trunk/Source/WebKit/UIProcess/WebPageProxy.h

@@ -297 +297 @@
     uint64_t pageID() const { return m_pageID; }
 
-    // FIXME: Don't keep a separate sessionID - Rely on the WebsiteDataStore
-    PAL::SessionID sessionID() const { return m_sessionID; }
+    PAL::SessionID sessionID() const;
 
     WebFrameProxy* mainFrame() const { return m_mainFrame.get(); }
@@ -1857 +1856 @@
     const uint64_t m_pageID;
 
-    // FIXME: Don't keep a separate sessionID - Rely on the WebsiteDataStore
-    const PAL::SessionID m_sessionID;
-
     bool m_isPageSuspended { false };
     bool m_addsVisitedLinks { true };