Title: [248675] trunk/Source/WebKit
- Revision
- 248675
- Author
- you...@apple.com
- Date
- 2019-08-14 10:16:58 -0700 (Wed, 14 Aug 2019)
Log Message
Remove use of emptySessionID from WebPageCreationParameters
https://bugs.webkit.org/show_bug.cgi?id=200708
Reviewed by Alex Christensen.
Make WebPageCreationParameters constructor take a SessionID.
Update constructor call sites.
* Shared/WebPageCreationParameters.cpp:
(WebKit::WebPageCreationParameters::decode):
* Shared/WebPageCreationParameters.h:
(WebKit::WebPageCreationParameters::WebPageCreationParameters):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::maybeInitializeSandboxExtensionHandle):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (248674 => 248675)
--- trunk/Source/WebKit/ChangeLog 2019-08-14 17:12:58 UTC (rev 248674)
+++ trunk/Source/WebKit/ChangeLog 2019-08-14 17:16:58 UTC (rev 248675)
@@ -1,5 +1,22 @@
2019-08-14 Youenn Fablet <you...@apple.com>
+ Remove use of emptySessionID from WebPageCreationParameters
+ https://bugs.webkit.org/show_bug.cgi?id=200708
+
+ Reviewed by Alex Christensen.
+
+ Make WebPageCreationParameters constructor take a SessionID.
+ Update constructor call sites.
+
+ * Shared/WebPageCreationParameters.cpp:
+ (WebKit::WebPageCreationParameters::decode):
+ * Shared/WebPageCreationParameters.h:
+ (WebKit::WebPageCreationParameters::WebPageCreationParameters):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::maybeInitializeSandboxExtensionHandle):
+
+2019-08-14 Youenn Fablet <you...@apple.com>
+
Remove API::PageConfiguration::m_sessionID
https://bugs.webkit.org/show_bug.cgi?id=200670
Modified: trunk/Source/WebKit/Shared/WebPageCreationParameters.cpp (248674 => 248675)
--- trunk/Source/WebKit/Shared/WebPageCreationParameters.cpp 2019-08-14 17:12:58 UTC (rev 248674)
+++ trunk/Source/WebKit/Shared/WebPageCreationParameters.cpp 2019-08-14 17:16:58 UTC (rev 248675)
@@ -32,6 +32,7 @@
void WebPageCreationParameters::encode(IPC::Encoder& encoder) const
{
+ encoder << sessionID;
encoder << viewSize;
encoder << activityState;
@@ -52,7 +53,6 @@
encoder << paginationLineGridEnabled;
encoder << userAgent;
encoder << itemStates;
- encoder << sessionID;
encoder << userContentControllerID;
encoder << visitedLinkTableID;
encoder << websiteDataStoreID;
@@ -137,7 +137,13 @@
Optional<WebPageCreationParameters> WebPageCreationParameters::decode(IPC::Decoder& decoder)
{
- WebPageCreationParameters parameters;
+ Optional<PAL::SessionID> sessionID;
+ decoder >> sessionID;
+ if (!sessionID)
+ return WTF::nullopt;
+
+ WebPageCreationParameters parameters { *sessionID };
+
if (!decoder.decode(parameters.viewSize))
return WTF::nullopt;
if (!decoder.decode(parameters.activityState))
@@ -191,9 +197,6 @@
return WTF::nullopt;
parameters.itemStates = WTFMove(*itemStates);
- if (!decoder.decode(parameters.sessionID))
- return WTF::nullopt;
-
Optional<UserContentControllerIdentifier> userContentControllerIdentifier;
decoder >> userContentControllerIdentifier;
if (!userContentControllerIdentifier)
Modified: trunk/Source/WebKit/Shared/WebPageCreationParameters.h (248674 => 248675)
--- trunk/Source/WebKit/Shared/WebPageCreationParameters.h 2019-08-14 17:12:58 UTC (rev 248674)
+++ trunk/Source/WebKit/Shared/WebPageCreationParameters.h 2019-08-14 17:16:58 UTC (rev 248675)
@@ -64,9 +64,15 @@
namespace WebKit {
struct WebPageCreationParameters {
+ explicit WebPageCreationParameters(PAL::SessionID sessionID)
+ : sessionID(sessionID)
+ {
+ }
+
void encode(IPC::Encoder&) const;
static Optional<WebPageCreationParameters> decode(IPC::Decoder&);
+ PAL::SessionID sessionID;
WebCore::IntSize viewSize;
OptionSet<WebCore::ActivityState::Flag> activityState;
@@ -97,7 +103,6 @@
String userAgent;
Vector<BackForwardListItemState> itemStates;
- PAL::SessionID sessionID { PAL::SessionID::emptySessionID() };
UserContentControllerIdentifier userContentControllerID;
uint64_t visitedLinkTableID;
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (248674 => 248675)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2019-08-14 17:12:58 UTC (rev 248674)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2019-08-14 17:16:58 UTC (rev 248675)
@@ -7169,7 +7169,7 @@
WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea)
{
- WebPageCreationParameters parameters;
+ WebPageCreationParameters parameters { process.websiteDataStore().sessionID() };
parameters.viewSize = pageClient().viewSize();
parameters.activityState = m_activityState;
@@ -7191,7 +7191,6 @@
parameters.paginationLineGridEnabled = m_paginationLineGridEnabled;
parameters.userAgent = userAgent();
parameters.itemStates = m_backForwardList->itemStates();
- parameters.sessionID = process.websiteDataStore().sessionID();
parameters.userContentControllerID = m_userContentController->identifier();
parameters.visitedLinkTableID = m_visitedLinkStore->identifier();
parameters.websiteDataStoreID = process.websiteDataStore().identifier();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
