Diff
Modified: trunk/Source/WebKit/ChangeLog (221898 => 221899)
--- trunk/Source/WebKit/ChangeLog 2017-09-12 00:48:27 UTC (rev 221898)
+++ trunk/Source/WebKit/ChangeLog 2017-09-12 02:05:21 UTC (rev 221899)
@@ -1,5 +1,33 @@
2017-09-11 Alex Christensen <[email protected]>
+ Clean up API::UIClient
+ https://bugs.webkit.org/show_bug.cgi?id=176568
+
+ Reviewed by Brady Eidson.
+
+ We don't need createNewPage and createNewPageAsync.
+ An async version can support synchronous delegate calls by just calling the completion handler synchronously.
+
+ * UIProcess/API/APIUIClient.h:
+ (API::UIClient::createNewPage):
+ (API::UIClient::createNewPageAsync): Deleted.
+ (API::UIClient::canCreateNewPageAsync): Deleted.
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageUIClient):
+ * UIProcess/API/glib/WebKitUIClient.cpp:
+ * UIProcess/API/glib/WebKitUIClient.h:
+ * UIProcess/Cocoa/UIDelegate.h:
+ * UIProcess/Cocoa/UIDelegate.mm:
+ (WebKit::UIDelegate::UIClient::createNewPage):
+ (WebKit::UIDelegate::UIClient::createNewPageCommon): Deleted.
+ (WebKit::UIDelegate::UIClient::canCreateNewPageAsync): Deleted.
+ (WebKit::UIDelegate::UIClient::createNewPageAsync): Deleted.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::createNewPage):
+ * UIProcess/WebPageProxy.h:
+
+2017-09-11 Alex Christensen <[email protected]>
+
Fix memory leak introduced in r221894.
https://bugs.webkit.org/show_bug.cgi?id=176753
Modified: trunk/Source/WebKit/UIProcess/API/APIUIClient.h (221898 => 221899)
--- trunk/Source/WebKit/UIProcess/API/APIUIClient.h 2017-09-12 00:48:27 UTC (rev 221898)
+++ trunk/Source/WebKit/UIProcess/API/APIUIClient.h 2017-09-12 02:05:21 UTC (rev 221899)
@@ -71,9 +71,7 @@
public:
virtual ~UIClient() { }
- virtual RefPtr<WebKit::WebPageProxy> createNewPage(WebKit::WebPageProxy*, FrameInfo&, WebCore::ResourceRequest&&, const WebCore::WindowFeatures&, WebKit::NavigationActionData&&) { return nullptr; }
- virtual void createNewPageAsync(WebKit::WebPageProxy*, FrameInfo&, WebCore::ResourceRequest&&, const WebCore::WindowFeatures&, WebKit::NavigationActionData&&, WTF::Function<void(RefPtr<WebKit::WebPageProxy>&&)>&& completionHandler) { }
- virtual bool canCreateNewPageAsync() { return false; }
+ virtual void createNewPage(WebKit::WebPageProxy&, Ref<FrameInfo>&&, WebCore::ResourceRequest&&, WebCore::WindowFeatures&&, WebKit::NavigationActionData&&, WTF::Function<void(RefPtr<WebKit::WebPageProxy>&&)>&&) { }
virtual void showPage(WebKit::WebPageProxy*) { }
virtual void fullscreenMayReturnToInline(WebKit::WebPageProxy*) { }
virtual void didEnterFullscreen(WebKit::WebPageProxy*) { }
Modified: trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp (221898 => 221899)
--- trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp 2017-09-12 00:48:27 UTC (rev 221898)
+++ trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp 2017-09-12 02:05:21 UTC (rev 221899)
@@ -1565,19 +1565,19 @@
}
private:
- RefPtr<WebPageProxy> createNewPage(WebPageProxy* page, API::FrameInfo& sourceFrameInfo, ResourceRequest&& resourceRequest, const WindowFeatures& windowFeatures, NavigationActionData&& navigationActionData) final
+ void createNewPage(WebPageProxy& page, Ref<API::FrameInfo>&& sourceFrameInfo, WebCore::ResourceRequest&& resourceRequest, WebCore::WindowFeatures&& windowFeatures, NavigationActionData&& navigationActionData, WTF::Function<void(RefPtr<WebPageProxy>&&)>&& completionHandler) final
{
if (m_client.createNewPage) {
- auto configuration = page->configuration().copy();
- configuration->setRelatedPage(page);
+ auto configuration = page.configuration().copy();
+ configuration->setRelatedPage(&page);
- auto userInitiatedActivity = page->process().userInitiatedActivity(navigationActionData.userGestureTokenIdentifier);
- bool shouldOpenAppLinks = !hostsAreEqual(sourceFrameInfo.request().url(), resourceRequest.url());
- auto apiNavigationAction = API::NavigationAction::create(WTFMove(navigationActionData), &sourceFrameInfo, nullptr, WTFMove(resourceRequest), WebCore::URL(), shouldOpenAppLinks, WTFMove(userInitiatedActivity));
+ auto userInitiatedActivity = page.process().userInitiatedActivity(navigationActionData.userGestureTokenIdentifier);
+ bool shouldOpenAppLinks = !hostsAreEqual(sourceFrameInfo->request().url(), resourceRequest.url());
+ auto apiNavigationAction = API::NavigationAction::create(WTFMove(navigationActionData), sourceFrameInfo.ptr(), nullptr, WTFMove(resourceRequest), WebCore::URL(), shouldOpenAppLinks, WTFMove(userInitiatedActivity));
auto apiWindowFeatures = API::WindowFeatures::create(windowFeatures);
- return adoptRef(toImpl(m_client.createNewPage(toAPI(page), toAPI(configuration.ptr()), toAPI(apiNavigationAction.ptr()), toAPI(apiWindowFeatures.ptr()), m_client.base.clientInfo)));
+ return completionHandler(adoptRef(toImpl(m_client.createNewPage(toAPI(&page), toAPI(configuration.ptr()), toAPI(apiNavigationAction.ptr()), toAPI(apiWindowFeatures.ptr()), m_client.base.clientInfo))));
}
if (m_client.createNewPage_deprecatedForUseWithV1 || m_client.createNewPage_deprecatedForUseWithV0) {
@@ -1602,14 +1602,14 @@
if (m_client.createNewPage_deprecatedForUseWithV1) {
Ref<API::URLRequest> request = API::URLRequest::create(resourceRequest);
- return adoptRef(toImpl(m_client.createNewPage_deprecatedForUseWithV1(toAPI(page), toAPI(request.ptr()), toAPI(featuresMap.ptr()), toAPI(navigationActionData.modifiers), toAPI(navigationActionData.mouseButton), m_client.base.clientInfo)));
+ return completionHandler(adoptRef(toImpl(m_client.createNewPage_deprecatedForUseWithV1(toAPI(&page), toAPI(request.ptr()), toAPI(featuresMap.ptr()), toAPI(navigationActionData.modifiers), toAPI(navigationActionData.mouseButton), m_client.base.clientInfo))));
}
ASSERT(m_client.createNewPage_deprecatedForUseWithV0);
- return adoptRef(toImpl(m_client.createNewPage_deprecatedForUseWithV0(toAPI(page), toAPI(featuresMap.ptr()), toAPI(navigationActionData.modifiers), toAPI(navigationActionData.mouseButton), m_client.base.clientInfo)));
+ return completionHandler(adoptRef(toImpl(m_client.createNewPage_deprecatedForUseWithV0(toAPI(&page), toAPI(featuresMap.ptr()), toAPI(navigationActionData.modifiers), toAPI(navigationActionData.mouseButton), m_client.base.clientInfo))));
}
- return nullptr;
+ completionHandler(nullptr);
}
void showPage(WebPageProxy* page) final
Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp (221898 => 221899)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp 2017-09-12 00:48:27 UTC (rev 221898)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp 2017-09-12 02:05:21 UTC (rev 221899)
@@ -46,11 +46,11 @@
}
private:
- RefPtr<WebPageProxy> createNewPage(WebPageProxy*, API::FrameInfo&, WebCore::ResourceRequest&& resourceRequest, const WebCore::WindowFeatures& windowFeatures, NavigationActionData&& navigationActionData) override
+ void createNewPage(WebPageProxy&, Ref<API::FrameInfo>&&, WebCore::ResourceRequest&& resourceRequest, WebCore::WindowFeatures&& windowFeatures, NavigationActionData&& navigationActionData, WTF::Function<void(RefPtr<WebPageProxy>&&)>&& completionHandler)
{
GRefPtr<WebKitURIRequest> request = adoptGRef(webkitURIRequestCreateForResourceRequest(resourceRequest));
WebKitNavigationAction navigationAction(request.get(), navigationActionData);
- return webkitWebViewCreateNewPage(m_webView, windowFeatures, &navigationAction);
+ completionHandler(webkitWebViewCreateNewPage(m_webView, windowFeatures, &navigationAction));
}
void showPage(WebPageProxy*) final
Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitUIClient.h (221898 => 221899)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitUIClient.h 2017-09-12 00:48:27 UTC (rev 221898)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitUIClient.h 2017-09-12 02:05:21 UTC (rev 221899)
@@ -17,11 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WebKitUIClient_h
-#define WebKitUIClient_h
+#pragma once
#include "WebKitWebView.h"
void attachUIClientToView(WebKitWebView*);
-
-#endif
Modified: trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.h (221898 => 221899)
--- trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.h 2017-09-12 00:48:27 UTC (rev 221898)
+++ trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.h 2017-09-12 02:05:21 UTC (rev 221899)
@@ -79,11 +79,7 @@
private:
// API::UIClient
- RefPtr<WebPageProxy> createNewPage(WebPageProxy*, API::FrameInfo&, WebCore::ResourceRequest&&, const WebCore::WindowFeatures&, NavigationActionData&&) final;
- void createNewPageAsync(WebPageProxy*, API::FrameInfo&, WebCore::ResourceRequest&&, const WebCore::WindowFeatures&, NavigationActionData&&, WTF::Function<void(RefPtr<WebPageProxy>&&)>&& completionHandler) final;
- bool canCreateNewPageAsync() final;
- RefPtr<WebPageProxy> createNewPageCommon(WebPageProxy*, API::FrameInfo&, WebCore::ResourceRequest&&, const WebCore::WindowFeatures&, NavigationActionData&&, WTF::Function<void(RefPtr<WebPageProxy>&&)>&& completionHandler);
-
+ void createNewPage(WebPageProxy&, Ref<API::FrameInfo>&&, WebCore::ResourceRequest&&, WebCore::WindowFeatures&&, NavigationActionData&&, WTF::Function<void(RefPtr<WebPageProxy>&&)>&&) final;
void close(WebPageProxy*) final;
void fullscreenMayReturnToInline(WebPageProxy*) final;
void didEnterFullscreen(WebPageProxy*) final;
Modified: trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm (221898 => 221899)
--- trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm 2017-09-12 00:48:27 UTC (rev 221898)
+++ trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm 2017-09-12 02:05:21 UTC (rev 221899)
@@ -192,7 +192,7 @@
{
}
-RefPtr<WebPageProxy> UIDelegate::UIClient::createNewPageCommon(WebPageProxy* page, API::FrameInfo& sourceFrameInfo, WebCore::ResourceRequest&& request, const WebCore::WindowFeatures& windowFeatures, NavigationActionData&& navigationActionData, WTF::Function<void(RefPtr<WebPageProxy>&&)>&& completionHandler)
+void UIDelegate::UIClient::createNewPage(WebPageProxy& page, Ref<API::FrameInfo>&& sourceFrameInfo, WebCore::ResourceRequest&& request, WebCore::WindowFeatures&& windowFeatures, NavigationActionData&& navigationActionData, WTF::Function<void(RefPtr<WebPageProxy>&&)>&& completionHandler)
{
auto delegate = m_uiDelegate.m_delegate.get();
ASSERT(delegate);
@@ -200,13 +200,13 @@
auto configuration = adoptNS([m_uiDelegate.m_webView->_configuration copy]);
[configuration _setRelatedWebView:m_uiDelegate.m_webView];
- auto userInitiatedActivity = page->process().userInitiatedActivity(navigationActionData.userGestureTokenIdentifier);
- bool shouldOpenAppLinks = !hostsAreEqual(sourceFrameInfo.request().url(), request.url());
- auto apiNavigationAction = API::NavigationAction::create(WTFMove(navigationActionData), &sourceFrameInfo, nullptr, WTFMove(request), WebCore::URL(), shouldOpenAppLinks, WTFMove(userInitiatedActivity));
+ auto userInitiatedActivity = page.process().userInitiatedActivity(navigationActionData.userGestureTokenIdentifier);
+ bool shouldOpenAppLinks = !hostsAreEqual(sourceFrameInfo->request().url(), request.url());
+ auto apiNavigationAction = API::NavigationAction::create(WTFMove(navigationActionData), sourceFrameInfo.ptr(), nullptr, WTFMove(request), WebCore::URL(), shouldOpenAppLinks, WTFMove(userInitiatedActivity));
auto apiWindowFeatures = API::WindowFeatures::create(windowFeatures);
- if (completionHandler) {
+ if (m_uiDelegate.m_delegateMethods.webViewCreateWebViewWithConfigurationForNavigationActionWindowFeaturesAsync) {
RefPtr<CompletionHandlerCallChecker> checker = CompletionHandlerCallChecker::create(delegate.get(), @selector(_webView:createWebViewWithConfiguration:forNavigationAction:windowFeatures:completionHandler:));
[(id <WKUIDelegatePrivate>)delegate _webView:m_uiDelegate.m_webView createWebViewWithConfiguration:configuration.get() forNavigationAction:wrapper(apiNavigationAction) windowFeatures:wrapper(apiWindowFeatures) completionHandler:BlockPtr<void (WKWebView *)>::fromCallable([completionHandler = WTFMove(completionHandler), checker = WTFMove(checker), relatedWebView = RetainPtr<WKWebView>(m_uiDelegate.m_webView)](WKWebView *webView) {
@@ -224,50 +224,20 @@
completionHandler(webView->_page.get());
}).get()];
-
- return nullptr;
+ return;
}
+ if (!m_uiDelegate.m_delegateMethods.webViewCreateWebViewWithConfigurationForNavigationActionWindowFeatures)
+ return completionHandler(nullptr);
RetainPtr<WKWebView> webView = [delegate webView:m_uiDelegate.m_webView createWebViewWithConfiguration:configuration.get() forNavigationAction:wrapper(apiNavigationAction) windowFeatures:wrapper(apiWindowFeatures)];
-
if (!webView)
- return nullptr;
+ return completionHandler(nullptr);
if ([webView->_configuration _relatedWebView] != m_uiDelegate.m_webView)
[NSException raise:NSInternalInconsistencyException format:@"Returned WKWebView was not created with the given configuration."];
-
- return webView->_page.get();
+ completionHandler(webView->_page.get());
}
-RefPtr<WebPageProxy> UIDelegate::UIClient::createNewPage(WebPageProxy* page, API::FrameInfo& originatingFrameInfo, WebCore::ResourceRequest&& request, const WebCore::WindowFeatures& windowFeatures, NavigationActionData&& navigationActionData)
-{
- if (!m_uiDelegate.m_delegateMethods.webViewCreateWebViewWithConfigurationForNavigationActionWindowFeatures)
- return nullptr;
-
- auto delegate = m_uiDelegate.m_delegate.get();
- if (!delegate)
- return nullptr;
-
- return createNewPageCommon(page, originatingFrameInfo, WTFMove(request), windowFeatures, WTFMove(navigationActionData), nullptr);
-}
-
-bool UIDelegate::UIClient::canCreateNewPageAsync()
-{
- return m_uiDelegate.m_delegateMethods.webViewCreateWebViewWithConfigurationForNavigationActionWindowFeaturesAsync
- && m_uiDelegate.m_delegate.get();
-}
-
-void UIDelegate::UIClient::createNewPageAsync(WebPageProxy* page, API::FrameInfo& originatingFrameInfo, WebCore::ResourceRequest&& request, const WebCore::WindowFeatures& windowFeatures, NavigationActionData&& navigationActionData, WTF::Function<void(RefPtr<WebPageProxy>&&)>&& completionHandler)
-{
- ASSERT(canCreateNewPageAsync());
- ASSERT(m_uiDelegate.m_delegateMethods.webViewCreateWebViewWithConfigurationForNavigationActionWindowFeaturesAsync);
-
- auto delegate = m_uiDelegate.m_delegate.get();
- ASSERT(delegate);
-
- createNewPageCommon(page, originatingFrameInfo, WTFMove(request), windowFeatures, WTFMove(navigationActionData), WTFMove(completionHandler));
-}
-
void UIDelegate::UIClient::runJavaScriptAlert(WebPageProxy*, const WTF::String& message, WebFrameProxy* webFrameProxy, const WebCore::SecurityOriginData& securityOriginData, Function<void()>&& completionHandler)
{
if (!m_uiDelegate.m_delegateMethods.webViewRunJavaScriptAlertPanelWithMessageInitiatedByFrameCompletionHandler) {
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (221898 => 221899)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2017-09-12 00:48:27 UTC (rev 221898)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2017-09-12 02:05:21 UTC (rev 221899)
@@ -3864,7 +3864,7 @@
// UIClient
-void WebPageProxy::createNewPage(const FrameInfoData& originatingFrameInfoData, uint64_t originatingPageID, ResourceRequest&& request, const WindowFeatures& windowFeatures, NavigationActionData&& navigationActionData, Ref<Messages::WebPageProxy::CreateNewPage::DelayedReply>&& reply)
+void WebPageProxy::createNewPage(const FrameInfoData& originatingFrameInfoData, uint64_t originatingPageID, ResourceRequest&& request, WindowFeatures&& windowFeatures, NavigationActionData&& navigationActionData, Ref<Messages::WebPageProxy::CreateNewPage::DelayedReply>&& reply)
{
MESSAGE_CHECK(m_process->webFrame(originatingFrameInfoData.frameID));
auto originatingFrameInfo = API::FrameInfo::create(originatingFrameInfoData, m_process->webPage(originatingPageID));
@@ -3871,7 +3871,7 @@
auto mainFrameURL = m_mainFrame->url();
- auto completionHandler = [this, protectedThis = RefPtr<WebPageProxy>(this), mainFrameURL, request, reply = WTFMove(reply)](RefPtr<WebPageProxy> newPage) {
+ m_uiClient->createNewPage(*this, WTFMove(originatingFrameInfo), WTFMove(request), WTFMove(windowFeatures), WTFMove(navigationActionData), [this, protectedThis = RefPtr<WebPageProxy>(this), mainFrameURL, request, reply = WTFMove(reply)](RefPtr<WebPageProxy> newPage) {
if (!newPage) {
reply->send(0, { });
return;
@@ -3881,18 +3881,7 @@
WebsiteDataStore::cloneSessionData(*this, *newPage);
newPage->m_shouldSuppressAppLinksInNextNavigationPolicyDecision = hostsAreEqual(URL(ParsedURLString, mainFrameURL), request.url());
-
- };
-
- if (m_uiClient->canCreateNewPageAsync()) {
- m_uiClient->createNewPageAsync(this, originatingFrameInfo, WTFMove(request), windowFeatures, WTFMove(navigationActionData), [completionHandler = WTFMove(completionHandler)](RefPtr<WebPageProxy> newPage) {
- completionHandler(newPage);
- });
- return;
- }
-
- RefPtr<WebPageProxy> newPage = m_uiClient->createNewPage(this, originatingFrameInfo, WTFMove(request), windowFeatures, WTFMove(navigationActionData));
- completionHandler(WTFMove(newPage));
+ });
}
void WebPageProxy::showPage()
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (221898 => 221899)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2017-09-12 00:48:27 UTC (rev 221898)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2017-09-12 02:05:21 UTC (rev 221899)
@@ -1293,7 +1293,7 @@
void didUpdateHistoryTitle(const String& title, const String& url, uint64_t frameID);
// UI client
- void createNewPage(const FrameInfoData&, uint64_t originatingPageID, WebCore::ResourceRequest&&, const WebCore::WindowFeatures&, NavigationActionData&&, Ref<Messages::WebPageProxy::CreateNewPage::DelayedReply>&&);
+ void createNewPage(const FrameInfoData&, uint64_t originatingPageID, WebCore::ResourceRequest&&, WebCore::WindowFeatures&&, NavigationActionData&&, Ref<Messages::WebPageProxy::CreateNewPage::DelayedReply>&&);
void showPage();
void runJavaScriptAlert(uint64_t frameID, const WebCore::SecurityOriginData&, const String&, Ref<Messages::WebPageProxy::RunJavaScriptAlert::DelayedReply>&&);
void runJavaScriptConfirm(uint64_t frameID, const WebCore::SecurityOriginData&, const String&, Ref<Messages::WebPageProxy::RunJavaScriptConfirm::DelayedReply>&&);
