Title: [230232] trunk/Source/WebKit
- Revision
- 230232
- Author
- you...@apple.com
- Date
- 2018-04-03 20:03:42 -0700 (Tue, 03 Apr 2018)
Log Message
Make NetworkProcess get ContentBlocker information from UIProcess
https://bugs.webkit.org/show_bug.cgi?id=184205
<rdar://problem/39146551>
Unreviewed.
Updated decode/encode methods to not hit null identifier assertion.
* Shared/WebPageCreationParameters.cpp:
(WebKit::WebPageCreationParameters::encode const):
(WebKit::WebPageCreationParameters::decode):
* Shared/WebPageGroupData.cpp:
(WebKit::WebPageGroupData::encode const):
(WebKit::WebPageGroupData::decode):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (230231 => 230232)
--- trunk/Source/WebKit/ChangeLog 2018-04-04 02:41:42 UTC (rev 230231)
+++ trunk/Source/WebKit/ChangeLog 2018-04-04 03:03:42 UTC (rev 230232)
@@ -1,3 +1,19 @@
+2018-04-03 Youenn Fablet <you...@apple.com>
+
+ Make NetworkProcess get ContentBlocker information from UIProcess
+ https://bugs.webkit.org/show_bug.cgi?id=184205
+ <rdar://problem/39146551>
+
+ Unreviewed.
+ Updated decode/encode methods to not hit null identifier assertion.
+
+ * Shared/WebPageCreationParameters.cpp:
+ (WebKit::WebPageCreationParameters::encode const):
+ (WebKit::WebPageCreationParameters::decode):
+ * Shared/WebPageGroupData.cpp:
+ (WebKit::WebPageGroupData::encode const):
+ (WebKit::WebPageGroupData::decode):
+
2018-04-03 Andy Estes <aes...@apple.com>
[iOS] WKWebView shouldn't know about WKPDFView
Modified: trunk/Source/WebKit/Shared/WebPageCreationParameters.cpp (230231 => 230232)
--- trunk/Source/WebKit/Shared/WebPageCreationParameters.cpp 2018-04-04 02:41:42 UTC (rev 230231)
+++ trunk/Source/WebKit/Shared/WebPageCreationParameters.cpp 2018-04-04 03:03:42 UTC (rev 230232)
@@ -54,7 +54,7 @@
encoder << itemStates;
encoder << sessionID;
encoder << highestUsedBackForwardItemID;
- encoder << userContentControllerID;
+ encoder << userContentControllerID.toUInt64();
encoder << visitedLinkTableID;
encoder << websiteDataStoreID;
encoder << canRunBeforeUnloadConfirmPanel;
@@ -180,11 +180,11 @@
if (!decoder.decode(parameters.highestUsedBackForwardItemID))
return std::nullopt;
- std::optional<UserContentControllerIdentifier> userContentControllerIdentifier;
+ std::optional<uint64_t> userContentControllerIdentifier;
decoder >> userContentControllerIdentifier;
if (!userContentControllerIdentifier)
return std::nullopt;
- parameters.userContentControllerID = *userContentControllerIdentifier;
+ parameters.userContentControllerID = makeObjectIdentifier<UserContentControllerIdentifierType>(*userContentControllerIdentifier);
if (!decoder.decode(parameters.visitedLinkTableID))
return std::nullopt;
Modified: trunk/Source/WebKit/Shared/WebPageGroupData.cpp (230231 => 230232)
--- trunk/Source/WebKit/Shared/WebPageGroupData.cpp 2018-04-04 02:41:42 UTC (rev 230231)
+++ trunk/Source/WebKit/Shared/WebPageGroupData.cpp 2018-04-04 03:03:42 UTC (rev 230232)
@@ -36,7 +36,7 @@
encoder << pageGroupID;
encoder << visibleToInjectedBundle;
encoder << visibleToHistoryClient;
- encoder << userContentControllerIdentifier;
+ encoder << userContentControllerIdentifier.toUInt64();
}
std::optional<WebPageGroupData> WebPageGroupData::decode(IPC::Decoder& decoder)
@@ -53,11 +53,11 @@
bool visibleToHistoryClient;
if (!decoder.decode(visibleToHistoryClient))
return std::nullopt;
- std::optional<UserContentControllerIdentifier> userContentControllerIdentifier;
+ std::optional<uint64_t> userContentControllerIdentifier;
decoder >> userContentControllerIdentifier;
if (!userContentControllerIdentifier)
return std::nullopt;
- return { { id, pageGroupID, visibleToInjectedBundle, visibleToHistoryClient, *userContentControllerIdentifier } };
+ return { { id, pageGroupID, visibleToInjectedBundle, visibleToHistoryClient, makeObjectIdentifier<UserContentControllerIdentifierType>(*userContentControllerIdentifier) } };
}
} // namespace WebKit
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
