Title: [222712] trunk/Source/WebKit
- Revision
- 222712
- Author
- [email protected]
- Date
- 2017-10-02 09:54:12 -0700 (Mon, 02 Oct 2017)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (222711 => 222712)
--- trunk/Source/WebKit/ChangeLog 2017-10-02 16:50:13 UTC (rev 222711)
+++ trunk/Source/WebKit/ChangeLog 2017-10-02 16:54:12 UTC (rev 222712)
@@ -1,5 +1,18 @@
2017-10-02 Alex Christensen <[email protected]>
+ 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 <[email protected]>
+
Expose more WKPreferences SPI to match C SPI
https://bugs.webkit.org/show_bug.cgi?id=177697
<rdar://problem/24110556>
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (222711 => 222712)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2017-10-02 16:50:13 UTC (rev 222711)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2017-10-02 16:54:12 UTC (rev 222712)
@@ -357,7 +357,6 @@
, m_backForwardList(WebBackForwardList::create(*this))
, m_waitsForPaintAfterViewDidMoveToWindow(m_configuration->waitsForPaintAfterViewDidMoveToWindow())
, m_pageID(pageID)
- , m_sessionID(m_configuration->sessionID())
, m_controlledByAutomation(m_configuration->isControlledByAutomation())
#if PLATFORM(COCOA)
, m_isSmartInsertDeleteEnabled(TextChecker::isSmartInsertDeleteEnabled())
@@ -434,6 +433,11 @@
#endif
}
+PAL::SessionID WebPageProxy::sessionID() const
+{
+ return m_websiteDataStore->sessionID();
+}
+
const API::PageConfiguration& WebPageProxy::configuration() const
{
return m_configuration.get();
@@ -5656,7 +5660,7 @@
parameters.paginationLineGridEnabled = m_paginationLineGridEnabled;
parameters.userAgent = userAgent();
parameters.itemStates = m_backForwardList->itemStates();
- parameters.sessionID = m_sessionID;
+ parameters.sessionID = sessionID();
parameters.highestUsedBackForwardItemID = WebBackForwardListItem::highestUsedItemID();
parameters.userContentControllerID = m_userContentController->identifier();
parameters.visitedLinkTableID = m_visitedLinkStore->identifier();
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (222711 => 222712)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2017-10-02 16:50:13 UTC (rev 222711)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2017-10-02 16:54:12 UTC (rev 222712)
@@ -296,8 +296,7 @@
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(); }
WebFrameProxy* focusedFrame() const { return m_focusedFrame.get(); }
@@ -1856,9 +1855,6 @@
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 };
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
