Diff
Modified: trunk/Source/WebKit/ChangeLog (264601 => 264602)
--- trunk/Source/WebKit/ChangeLog 2020-07-20 14:24:05 UTC (rev 264601)
+++ trunk/Source/WebKit/ChangeLog 2020-07-20 15:17:25 UTC (rev 264602)
@@ -1,3 +1,19 @@
+2020-07-20 David Kilzer <[email protected]>
+
+ WebPageProxyIdentifier parameter of WebPageProxy::CreateNewPage() should not be Optional
+ <https://webkit.org/b/214542>
+ <rdar://problem/65768644>
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::createNewPage):
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::createNewPage):
+ * UIProcess/WebPageProxy.messages.in:
+ - Remove Optional<> wrapper for WebPageProxyIdentifier
+ parameter since the value is used unconditionally.
+
2020-07-20 Adrian Perez de Castro <[email protected]>
Some classes have final destructors but are non-final
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (264601 => 264602)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2020-07-20 14:24:05 UTC (rev 264601)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2020-07-20 15:17:25 UTC (rev 264602)
@@ -5584,12 +5584,12 @@
#endif
}
-void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, Optional<WebPageProxyIdentifier> originatingPageID, ResourceRequest&& request, WindowFeatures&& windowFeatures, NavigationActionData&& navigationActionData, Messages::WebPageProxy::CreateNewPage::DelayedReply&& reply)
+void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPageProxyIdentifier originatingPageID, ResourceRequest&& request, WindowFeatures&& windowFeatures, NavigationActionData&& navigationActionData, Messages::WebPageProxy::CreateNewPage::DelayedReply&& reply)
{
MESSAGE_CHECK(m_process, originatingFrameInfoData.frameID);
MESSAGE_CHECK(m_process, m_process->webFrame(*originatingFrameInfoData.frameID));
- auto* originatingPage = m_process->webPage(*originatingPageID);
+ auto* originatingPage = m_process->webPage(originatingPageID);
auto originatingFrameInfo = API::FrameInfo::create(WTFMove(originatingFrameInfoData), originatingPage);
auto mainFrameURL = m_mainFrame ? m_mainFrame->url() : URL();
auto completionHandler = [this, protectedThis = makeRef(*this), mainFrameURL, request, reply = WTFMove(reply)] (RefPtr<WebPageProxy> newPage) mutable {
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (264601 => 264602)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2020-07-20 14:24:05 UTC (rev 264601)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2020-07-20 15:17:25 UTC (rev 264602)
@@ -1893,7 +1893,7 @@
void didUpdateHistoryTitle(const String& title, const String& url, WebCore::FrameIdentifier);
// UI client
- void createNewPage(FrameInfoData&&, Optional<WebPageProxyIdentifier> originatingPageID, WebCore::ResourceRequest&&, WebCore::WindowFeatures&&, NavigationActionData&&, Messages::WebPageProxy::CreateNewPageDelayedReply&&);
+ void createNewPage(FrameInfoData&&, WebPageProxyIdentifier originatingPageID, WebCore::ResourceRequest&&, WebCore::WindowFeatures&&, NavigationActionData&&, Messages::WebPageProxy::CreateNewPageDelayedReply&&);
void showPage();
void runJavaScriptAlert(WebCore::FrameIdentifier, WebKit::FrameInfoData&&, const String&, Messages::WebPageProxy::RunJavaScriptAlertDelayedReply&&);
void runJavaScriptConfirm(WebCore::FrameIdentifier, WebKit::FrameInfoData&&, const String&, Messages::WebPageProxy::RunJavaScriptConfirmDelayedReply&&);
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in (264601 => 264602)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2020-07-20 14:24:05 UTC (rev 264601)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2020-07-20 15:17:25 UTC (rev 264602)
@@ -22,7 +22,7 @@
messages -> WebPageProxy {
# UI messages
- CreateNewPage(struct WebKit::FrameInfoData originatingFrameInfoData, Optional<WebKit::WebPageProxyIdentifier> originatingPageID, WebCore::ResourceRequest request, struct WebCore::WindowFeatures windowFeatures, struct WebKit::NavigationActionData navigationActionData) -> (Optional<WebCore::PageIdentifier> newPageID, Optional<WebKit::WebPageCreationParameters> newPageParameters) Synchronous
+ CreateNewPage(struct WebKit::FrameInfoData originatingFrameInfoData, WebKit::WebPageProxyIdentifier originatingPageID, WebCore::ResourceRequest request, struct WebCore::WindowFeatures windowFeatures, struct WebKit::NavigationActionData navigationActionData) -> (Optional<WebCore::PageIdentifier> newPageID, Optional<WebKit::WebPageCreationParameters> newPageParameters) Synchronous
ShowPage()
ClosePage()
RunJavaScriptAlert(WebCore::FrameIdentifier frameID, struct WebKit::FrameInfoData frameInfo, String message) -> () Synchronous