Diff
Modified: trunk/Source/WebKit/ChangeLog (240483 => 240484)
--- trunk/Source/WebKit/ChangeLog 2019-01-25 18:48:29 UTC (rev 240483)
+++ trunk/Source/WebKit/ChangeLog 2019-01-25 18:49:01 UTC (rev 240484)
@@ -1,3 +1,43 @@
+2019-01-25 Chris Dumez <[email protected]>
+
+ Drop WebKit::WebKitPolicyAction type as it is no longer needed
+ https://bugs.webkit.org/show_bug.cgi?id=193827
+
+ Reviewed by Antti Koivisto.
+
+ Drop WebKit::WebKitPolicyAction type as it is no longer needed. It is now identical to
+ WebCore::PolicyAction.
+
+ * Shared/WebPolicyAction.h: Removed.
+ * UIProcess/WebFramePolicyListenerProxy.cpp:
+ (WebKit::WebFramePolicyListenerProxy::didReceiveSafeBrowsingResults):
+ (WebKit::WebFramePolicyListenerProxy::use):
+ (WebKit::WebFramePolicyListenerProxy::download):
+ (WebKit::WebFramePolicyListenerProxy::ignore):
+ * UIProcess/WebFramePolicyListenerProxy.h:
+ * UIProcess/WebFrameProxy.cpp:
+ (WebKit::WebFrameProxy::setUpPolicyListenerProxy):
+ * UIProcess/WebFrameProxy.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::receivedNavigationPolicyDecision):
+ (WebKit::WebPageProxy::receivedPolicyDecision):
+ (WebKit::WebPageProxy::decidePolicyForNavigationAction):
+ (WebKit::WebPageProxy::decidePolicyForNavigationActionSync):
+ (WebKit::WebPageProxy::decidePolicyForNewWindowAction):
+ (WebKit::WebPageProxy::decidePolicyForResponseShared):
+ * UIProcess/WebPageProxy.h:
+ * WebKit.xcodeproj/project.pbxproj:
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForResponse):
+ (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
+ * WebProcess/WebPage/WebFrame.cpp:
+ (WebKit::WebFrame::didReceivePolicyDecision):
+ (WebKit::toPolicyAction): Deleted.
+ * WebProcess/WebPage/WebFrame.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::didReceivePolicyDecision):
+ * WebProcess/WebPage/WebPage.h:
+
2019-01-25 Per Arne Vollan <[email protected]>
[iOS] Add logging of calls
Deleted: trunk/Source/WebKit/Shared/WebPolicyAction.h (240483 => 240484)
--- trunk/Source/WebKit/Shared/WebPolicyAction.h 2019-01-25 18:48:29 UTC (rev 240483)
+++ trunk/Source/WebKit/Shared/WebPolicyAction.h 2019-01-25 18:49:01 UTC (rev 240484)
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2018 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#include <wtf/Forward.h>
-
-namespace WebKit {
-
-// FIXME: Remove this type and use WebCore::PolicyAction instead.
-enum class WebPolicyAction : uint8_t {
- Use,
- Download,
- Ignore
-};
-
-}
-
-namespace WTF {
-
-template<> struct EnumTraits<WebKit::WebPolicyAction> {
- using values = EnumValues<
- WebKit::WebPolicyAction,
- WebKit::WebPolicyAction::Use,
- WebKit::WebPolicyAction::Download,
- WebKit::WebPolicyAction::Ignore
- >;
-};
-
-} // namespace WTF
-
Modified: trunk/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.cpp (240483 => 240484)
--- trunk/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.cpp 2019-01-25 18:48:29 UTC (rev 240483)
+++ trunk/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.cpp 2019-01-25 18:49:01 UTC (rev 240484)
@@ -50,7 +50,7 @@
ASSERT(!m_safeBrowsingWarning);
if (m_policyResult) {
if (m_reply)
- m_reply(WebPolicyAction::Use, m_policyResult->first.get(), m_policyResult->second, WTFMove(safeBrowsingWarning));
+ m_reply(WebCore::PolicyAction::Use, m_policyResult->first.get(), m_policyResult->second, WTFMove(safeBrowsingWarning));
} else
m_safeBrowsingWarning = WTFMove(safeBrowsingWarning);
}
@@ -59,7 +59,7 @@
{
if (m_safeBrowsingWarning) {
if (m_reply)
- m_reply(WebPolicyAction::Use, policies, processSwapRequestedByClient, WTFMove(*m_safeBrowsingWarning));
+ m_reply(WebCore::PolicyAction::Use, policies, processSwapRequestedByClient, WTFMove(*m_safeBrowsingWarning));
} else if (!m_policyResult)
m_policyResult = {{ policies, processSwapRequestedByClient }};
}
@@ -67,13 +67,13 @@
void WebFramePolicyListenerProxy::download()
{
if (m_reply)
- m_reply(WebPolicyAction::Download, nullptr, ProcessSwapRequestedByClient::No, { });
+ m_reply(WebCore::PolicyAction::Download, nullptr, ProcessSwapRequestedByClient::No, { });
}
void WebFramePolicyListenerProxy::ignore()
{
if (m_reply)
- m_reply(WebPolicyAction::Ignore, nullptr, ProcessSwapRequestedByClient::No, { });
+ m_reply(WebCore::PolicyAction::Ignore, nullptr, ProcessSwapRequestedByClient::No, { });
}
} // namespace WebKit
Modified: trunk/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.h (240483 => 240484)
--- trunk/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.h 2019-01-25 18:48:29 UTC (rev 240483)
+++ trunk/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.h 2019-01-25 18:49:01 UTC (rev 240484)
@@ -26,7 +26,7 @@
#pragma once
#include "APIObject.h"
-#include "WebPolicyAction.h"
+#include <WebCore/FrameLoaderTypes.h>
#include <wtf/CompletionHandler.h>
#include <wtf/Vector.h>
@@ -44,7 +44,7 @@
class WebFramePolicyListenerProxy : public API::ObjectImpl<API::Object::Type::FramePolicyListener> {
public:
- using Reply = CompletionHandler<void(WebPolicyAction, API::WebsitePolicies*, ProcessSwapRequestedByClient, RefPtr<SafeBrowsingWarning>&&)>;
+ using Reply = CompletionHandler<void(WebCore::PolicyAction, API::WebsitePolicies*, ProcessSwapRequestedByClient, RefPtr<SafeBrowsingWarning>&&)>;
static Ref<WebFramePolicyListenerProxy> create(Reply&& reply, ShouldExpectSafeBrowsingResult expect)
{
return adoptRef(*new WebFramePolicyListenerProxy(WTFMove(reply), expect));
Modified: trunk/Source/WebKit/UIProcess/WebFrameProxy.cpp (240483 => 240484)
--- trunk/Source/WebKit/UIProcess/WebFrameProxy.cpp 2019-01-25 18:48:29 UTC (rev 240483)
+++ trunk/Source/WebKit/UIProcess/WebFrameProxy.cpp 2019-01-25 18:49:01 UTC (rev 240484)
@@ -178,11 +178,11 @@
m_title = title;
}
-WebFramePolicyListenerProxy& WebFrameProxy::setUpPolicyListenerProxy(CompletionHandler<void(WebPolicyAction, API::WebsitePolicies*, ProcessSwapRequestedByClient, RefPtr<SafeBrowsingWarning>&&)>&& completionHandler, ShouldExpectSafeBrowsingResult expect)
+WebFramePolicyListenerProxy& WebFrameProxy::setUpPolicyListenerProxy(CompletionHandler<void(PolicyAction, API::WebsitePolicies*, ProcessSwapRequestedByClient, RefPtr<SafeBrowsingWarning>&&)>&& completionHandler, ShouldExpectSafeBrowsingResult expect)
{
if (m_activeListener)
m_activeListener->ignore();
- m_activeListener = WebFramePolicyListenerProxy::create([this, protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)] (WebPolicyAction action, API::WebsitePolicies* policies, ProcessSwapRequestedByClient processSwapRequestedByClient, RefPtr<SafeBrowsingWarning>&& safeBrowsingWarning) mutable {
+ m_activeListener = WebFramePolicyListenerProxy::create([this, protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)] (PolicyAction action, API::WebsitePolicies* policies, ProcessSwapRequestedByClient processSwapRequestedByClient, RefPtr<SafeBrowsingWarning>&& safeBrowsingWarning) mutable {
completionHandler(action, policies, processSwapRequestedByClient, WTFMove(safeBrowsingWarning));
m_activeListener = nullptr;
}, expect);
Modified: trunk/Source/WebKit/UIProcess/WebFrameProxy.h (240483 => 240484)
--- trunk/Source/WebKit/UIProcess/WebFrameProxy.h 2019-01-25 18:48:29 UTC (rev 240483)
+++ trunk/Source/WebKit/UIProcess/WebFrameProxy.h 2019-01-25 18:49:01 UTC (rev 240484)
@@ -117,7 +117,7 @@
void didSameDocumentNavigation(const URL&); // eg. anchor navigation, session state change.
void didChangeTitle(const String&);
- WebFramePolicyListenerProxy& setUpPolicyListenerProxy(CompletionHandler<void(WebPolicyAction, API::WebsitePolicies*, ProcessSwapRequestedByClient, RefPtr<SafeBrowsingWarning>&&)>&&, ShouldExpectSafeBrowsingResult);
+ WebFramePolicyListenerProxy& setUpPolicyListenerProxy(CompletionHandler<void(WebCore::PolicyAction, API::WebsitePolicies*, ProcessSwapRequestedByClient, RefPtr<SafeBrowsingWarning>&&)>&&, ShouldExpectSafeBrowsingResult);
#if ENABLE(CONTENT_FILTERING)
void contentFilterDidBlockLoad(WebCore::ContentFilterUnblockHandler contentFilterUnblockHandler) { m_contentFilterUnblockHandler = WTFMove(contentFilterUnblockHandler); }
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (240483 => 240484)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2019-01-25 18:48:29 UTC (rev 240483)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2019-01-25 18:49:01 UTC (rev 240484)
@@ -2660,7 +2660,7 @@
class WebPageProxy::PolicyDecisionSender : public RefCounted<PolicyDecisionSender> {
public:
- using SendFunction = CompletionHandler<void(WebPolicyAction, uint64_t newNavigationID, DownloadID, Optional<WebsitePoliciesData>)>;
+ using SendFunction = CompletionHandler<void(PolicyAction, uint64_t newNavigationID, DownloadID, Optional<WebsitePoliciesData>)>;
static Ref<PolicyDecisionSender> create(SendFunction&& sendFunction)
{
return adoptRef(*new PolicyDecisionSender(WTFMove(sendFunction)));
@@ -2678,7 +2678,7 @@
SendFunction m_sendFunction;
};
-void WebPageProxy::receivedNavigationPolicyDecision(WebPolicyAction policyAction, API::Navigation* navigation, ProcessSwapRequestedByClient processSwapRequestedByClient, WebFrameProxy& frame, API::WebsitePolicies* policies, Ref<PolicyDecisionSender>&& sender)
+void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, API::Navigation* navigation, ProcessSwapRequestedByClient processSwapRequestedByClient, WebFrameProxy& frame, API::WebsitePolicies* policies, Ref<PolicyDecisionSender>&& sender)
{
Optional<WebsitePoliciesData> data;
if (policies) {
@@ -2687,7 +2687,7 @@
changeWebsiteDataStore(policies->websiteDataStore()->websiteDataStore());
}
- if (policyAction != WebPolicyAction::Use || !frame.isMainFrame() || !navigation) {
+ if (policyAction != PolicyAction::Use || !frame.isMainFrame() || !navigation) {
receivedPolicyDecision(policyAction, navigation, WTFMove(data), WTFMove(sender));
return;
}
@@ -2700,7 +2700,7 @@
}
if (processForNavigation.ptr() != &process()) {
- policyAction = WebPolicyAction::Ignore;
+ policyAction = PolicyAction::Ignore;
RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "decidePolicyForNavigationAction, swapping process %i with process %i for navigation, reason: %{public}s", processIdentifier(), processForNavigation->processIdentifier(), reason.utf8().data());
LOG(ProcessSwapping, "(ProcessSwapping) Switching from process %i to new process (%i) for navigation %" PRIu64 " '%s'", processIdentifier(), processForNavigation->processIdentifier(), navigation->navigationID(), navigation->loggingString());
} else
@@ -2720,23 +2720,23 @@
});
}
-void WebPageProxy::receivedPolicyDecision(WebPolicyAction action, API::Navigation* navigation, Optional<WebsitePoliciesData>&& websitePolicies, Ref<PolicyDecisionSender>&& sender)
+void WebPageProxy::receivedPolicyDecision(PolicyAction action, API::Navigation* navigation, Optional<WebsitePoliciesData>&& websitePolicies, Ref<PolicyDecisionSender>&& sender)
{
if (!isValid()) {
- sender->send(WebPolicyAction::Ignore, 0, DownloadID(), WTF::nullopt);
+ sender->send(PolicyAction::Ignore, 0, DownloadID(), WTF::nullopt);
return;
}
auto transaction = m_pageLoadState.transaction();
- if (action == WebPolicyAction::Ignore)
+ if (action == PolicyAction::Ignore)
m_pageLoadState.clearPendingAPIRequestURL(transaction);
- if (navigation && navigation->shouldForceDownload() && action == WebPolicyAction::Use)
- action = ""
+ if (navigation && navigation->shouldForceDownload() && action == PolicyAction::Use)
+ action = ""
DownloadID downloadID = { };
- if (action == WebPolicyAction::Download) {
+ if (action == PolicyAction::Download) {
// Create a download proxy.
auto* download = m_process->processPool().createDownloadProxy(m_decidePolicyForResponseRequest, this);
if (navigation) {
@@ -4399,7 +4399,7 @@
#if ENABLE(CONTENT_FILTERING)
if (frame.didHandleContentFilterUnblockNavigation(request))
- return receivedPolicyDecision(WebPolicyAction::Ignore, m_navigationState->navigation(newNavigationID), WTF::nullopt, WTFMove(sender));
+ return receivedPolicyDecision(PolicyAction::Ignore, m_navigationState->navigation(newNavigationID), WTF::nullopt, WTFMove(sender));
#else
UNUSED_PARAM(newNavigationID);
#endif
@@ -4408,9 +4408,9 @@
if (!m_preferences->safeBrowsingEnabled())
shouldExpectSafeBrowsingResult = ShouldExpectSafeBrowsingResult::No;
- auto listener = makeRef(frame.setUpPolicyListenerProxy([this, protectedThis = makeRef(*this), frame = makeRef(frame), sender = WTFMove(sender), navigation] (WebPolicyAction policyAction, API::WebsitePolicies* policies, ProcessSwapRequestedByClient processSwapRequestedByClient, RefPtr<SafeBrowsingWarning>&& safeBrowsingWarning) mutable {
+ auto listener = makeRef(frame.setUpPolicyListenerProxy([this, protectedThis = makeRef(*this), frame = makeRef(frame), sender = WTFMove(sender), navigation] (PolicyAction policyAction, API::WebsitePolicies* policies, ProcessSwapRequestedByClient processSwapRequestedByClient, RefPtr<SafeBrowsingWarning>&& safeBrowsingWarning) mutable {
- auto completionHandler = [this, protectedThis = protectedThis.copyRef(), frame = frame.copyRef(), sender = WTFMove(sender), navigation = WTFMove(navigation), processSwapRequestedByClient, policies = makeRefPtr(policies)] (WebPolicyAction policyAction) mutable {
+ auto completionHandler = [this, protectedThis = protectedThis.copyRef(), frame = frame.copyRef(), sender = WTFMove(sender), navigation = WTFMove(navigation), processSwapRequestedByClient, policies = makeRefPtr(policies)] (PolicyAction policyAction) mutable {
receivedNavigationPolicyDecision(policyAction, navigation.get(), processSwapRequestedByClient, frame, policies.get(), WTFMove(sender));
};
@@ -4428,12 +4428,12 @@
m_pageClient->showSafeBrowsingWarning(*safeBrowsingWarning, [protectedThis = WTFMove(protectedThis), completionHandler = WTFMove(completionHandler), policyAction] (auto&& result) mutable {
switchOn(result, [&] (const URL& url) {
- completionHandler(WebPolicyAction::Ignore);
+ completionHandler(PolicyAction::Ignore);
protectedThis->loadRequest({ url });
}, [&] (ContinueUnsafeLoad continueUnsafeLoad) {
switch (continueUnsafeLoad) {
case ContinueUnsafeLoad::No:
- completionHandler(WebPolicyAction::Ignore);
+ completionHandler(PolicyAction::Ignore);
break;
case ContinueUnsafeLoad::Yes:
completionHandler(policyAction);
@@ -4551,7 +4551,7 @@
decidePolicyForNavigationAction(m_process.copyRef(), *frame, WTFMove(frameSecurityOrigin), navigationID, WTFMove(navigationActionData), WTFMove(frameInfoData), originatingPageID, originalRequest, WTFMove(request), WTFMove(requestBody), WTFMove(redirectResponse), userData, sender.copyRef());
// If the client did not respond synchronously, proceed with the load.
- sender->send(WebPolicyAction::Use, navigationID, DownloadID(), WTF::nullopt);
+ sender->send(PolicyAction::Use, navigationID, DownloadID(), WTF::nullopt);
}
void WebPageProxy::decidePolicyForNewWindowAction(uint64_t frameID, const SecurityOriginData& frameSecurityOrigin, NavigationActionData&& navigationActionData, ResourceRequest&& request, const String& frameName, uint64_t listenerID, const UserData& userData)
@@ -4562,7 +4562,7 @@
MESSAGE_CHECK(m_process, frame);
MESSAGE_CHECK_URL(m_process, request.url());
- auto listener = makeRef(frame->setUpPolicyListenerProxy([this, protectedThis = makeRef(*this), listenerID, frameID] (WebPolicyAction policyAction, API::WebsitePolicies*, ProcessSwapRequestedByClient processSwapRequestedByClient, RefPtr<SafeBrowsingWarning>&& safeBrowsingWarning) mutable {
+ auto listener = makeRef(frame->setUpPolicyListenerProxy([this, protectedThis = makeRef(*this), listenerID, frameID] (PolicyAction policyAction, API::WebsitePolicies*, ProcessSwapRequestedByClient processSwapRequestedByClient, RefPtr<SafeBrowsingWarning>&& safeBrowsingWarning) mutable {
// FIXME: Assert the API::WebsitePolicies* is nullptr here once clients of WKFramePolicyListenerUseWithPolicies go away.
RELEASE_ASSERT(processSwapRequestedByClient == ProcessSwapRequestedByClient::No);
ASSERT_UNUSED(safeBrowsingWarning, !safeBrowsingWarning);
@@ -4605,7 +4605,7 @@
MESSAGE_CHECK_URL(process, response.url());
RefPtr<API::Navigation> navigation = navigationID ? m_navigationState->navigation(navigationID) : nullptr;
- auto listener = makeRef(frame->setUpPolicyListenerProxy([this, protectedThis = makeRef(*this), frameID, listenerID, navigation = WTFMove(navigation), process = process.copyRef()] (WebPolicyAction policyAction, API::WebsitePolicies*, ProcessSwapRequestedByClient processSwapRequestedByClient, RefPtr<SafeBrowsingWarning>&& safeBrowsingWarning) mutable {
+ auto listener = makeRef(frame->setUpPolicyListenerProxy([this, protectedThis = makeRef(*this), frameID, listenerID, navigation = WTFMove(navigation), process = process.copyRef()] (PolicyAction policyAction, API::WebsitePolicies*, ProcessSwapRequestedByClient processSwapRequestedByClient, RefPtr<SafeBrowsingWarning>&& safeBrowsingWarning) mutable {
// FIXME: Assert the API::WebsitePolicies* is nullptr here once clients of WKFramePolicyListenerUseWithPolicies go away.
RELEASE_ASSERT(processSwapRequestedByClient == ProcessSwapRequestedByClient::No);
ASSERT_UNUSED(safeBrowsingWarning, !safeBrowsingWarning);
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (240483 => 240484)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2019-01-25 18:48:29 UTC (rev 240483)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2019-01-25 18:49:01 UTC (rev 240484)
@@ -970,8 +970,8 @@
#endif
class PolicyDecisionSender;
- void receivedPolicyDecision(WebPolicyAction, API::Navigation*, Optional<WebsitePoliciesData>&&, Ref<PolicyDecisionSender>&&);
- void receivedNavigationPolicyDecision(WebPolicyAction, API::Navigation*, ProcessSwapRequestedByClient, WebFrameProxy&, API::WebsitePolicies*, Ref<PolicyDecisionSender>&&);
+ void receivedPolicyDecision(WebCore::PolicyAction, API::Navigation*, Optional<WebsitePoliciesData>&&, Ref<PolicyDecisionSender>&&);
+ void receivedNavigationPolicyDecision(WebCore::PolicyAction, API::Navigation*, ProcessSwapRequestedByClient, WebFrameProxy&, API::WebsitePolicies*, Ref<PolicyDecisionSender>&&);
void backForwardRemovedItem(const WebCore::BackForwardItemIdentifier&);
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in (240483 => 240484)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2019-01-25 18:48:29 UTC (rev 240483)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2019-01-25 18:49:01 UTC (rev 240484)
@@ -107,7 +107,7 @@
# Policy messages
DecidePolicyForResponse(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, uint64_t navigationID, WebCore::ResourceResponse response, WebCore::ResourceRequest request, bool canShowMIMEType, uint64_t listenerID, WebKit::UserData userData)
DecidePolicyForNavigationActionAsync(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, uint64_t navigationID, struct WebKit::NavigationActionData navigationActionData, struct WebKit::FrameInfoData originatingFrameInfoData, uint64_t originatingPageID, WebCore::ResourceRequest originalRequest, WebCore::ResourceRequest request, IPC::FormDataReference requestBody, WebCore::ResourceResponse redirectResponse, WebKit::UserData userData, uint64_t listenerID)
- DecidePolicyForNavigationActionSync(uint64_t frameID, bool isMainFrame, struct WebCore::SecurityOriginData frameSecurityOrigin, uint64_t navigationID, struct WebKit::NavigationActionData navigationActionData, struct WebKit::FrameInfoData originatingFrameInfoData, uint64_t originatingPageID, WebCore::ResourceRequest originalRequest, WebCore::ResourceRequest request, IPC::FormDataReference requestBody, WebCore::ResourceResponse redirectResponse, WebKit::UserData userData) -> (enum:uint8_t WebKit::WebPolicyAction policyAction, uint64_t newNavigationID, WebKit::DownloadID downloadID, Optional<WebKit::WebsitePoliciesData> websitePolicies) Delayed
+ DecidePolicyForNavigationActionSync(uint64_t frameID, bool isMainFrame, struct WebCore::SecurityOriginData frameSecurityOrigin, uint64_t navigationID, struct WebKit::NavigationActionData navigationActionData, struct WebKit::FrameInfoData originatingFrameInfoData, uint64_t originatingPageID, WebCore::ResourceRequest originalRequest, WebCore::ResourceRequest request, IPC::FormDataReference requestBody, WebCore::ResourceResponse redirectResponse, WebKit::UserData userData) -> (enum:uint8_t WebCore::PolicyAction policyAction, uint64_t newNavigationID, WebKit::DownloadID downloadID, Optional<WebKit::WebsitePoliciesData> websitePolicies) Delayed
DecidePolicyForNewWindowAction(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, struct WebKit::NavigationActionData navigationActionData, WebCore::ResourceRequest request, String frameName, uint64_t listenerID, WebKit::UserData userData)
UnableToImplementPolicy(uint64_t frameID, WebCore::ResourceError error, WebKit::UserData userData)
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (240483 => 240484)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2019-01-25 18:48:29 UTC (rev 240483)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2019-01-25 18:49:01 UTC (rev 240484)
@@ -891,7 +891,6 @@
466BC03C1FA266DA002FA9C1 /* WebSWContextManagerConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 466BC0391FA266C9002FA9C1 /* WebSWContextManagerConnection.h */; };
46A2B6091E5676A600C3DEDA /* BackgroundProcessResponsivenessTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A2B6071E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.h */; };
46DF063C1F3905F8001980BB /* NetworkCORSPreflightChecker.h in Headers */ = {isa = PBXBuildFile; fileRef = 46DF063A1F3905E5001980BB /* NetworkCORSPreflightChecker.h */; };
- 46F636D021C41A1D00413010 /* WebPolicyAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 46F636CF21C41A1D00413010 /* WebPolicyAction.h */; };
4A3CC18B19B0640F00D14AEF /* UserMediaPermissionRequestManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A410F3A19AF7B04002EBAB5 /* UserMediaPermissionRequestManagerProxy.h */; };
4A3CC18D19B0641900D14AEF /* UserMediaPermissionRequestProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A410F3C19AF7B04002EBAB5 /* UserMediaPermissionRequestProxy.h */; };
4A3CC18F19B07B8A00D14AEF /* WKUserMediaPermissionRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A410F3619AF7AC3002EBAB5 /* WKUserMediaPermissionRequest.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -3087,7 +3086,6 @@
46A2B6071E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BackgroundProcessResponsivenessTimer.h; sourceTree = "<group>"; };
46DF06391F3905E5001980BB /* NetworkCORSPreflightChecker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCORSPreflightChecker.cpp; sourceTree = "<group>"; };
46DF063A1F3905E5001980BB /* NetworkCORSPreflightChecker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCORSPreflightChecker.h; sourceTree = "<group>"; };
- 46F636CF21C41A1D00413010 /* WebPolicyAction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebPolicyAction.h; sourceTree = "<group>"; };
4A410F3519AF7AC3002EBAB5 /* WKUserMediaPermissionRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKUserMediaPermissionRequest.cpp; sourceTree = "<group>"; };
4A410F3619AF7AC3002EBAB5 /* WKUserMediaPermissionRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUserMediaPermissionRequest.h; sourceTree = "<group>"; };
4A410F3919AF7B04002EBAB5 /* UserMediaPermissionRequestManagerProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserMediaPermissionRequestManagerProxy.cpp; sourceTree = "<group>"; };
@@ -5127,7 +5125,6 @@
BC7B625112A43C9600D174A4 /* WebPageGroupData.cpp */,
BC7B625012A43C9600D174A4 /* WebPageGroupData.h */,
C0337DDC127A521C008FF4F4 /* WebPlatformTouchPoint.cpp */,
- 46F636CF21C41A1D00413010 /* WebPolicyAction.h */,
BC5744ED12638FB3006F0F12 /* WebPopupItem.cpp */,
BC5744EE12638FB3006F0F12 /* WebPopupItem.h */,
7CDE739F1F9DA37A00390312 /* WebPreferences.yaml */,
@@ -9504,7 +9501,6 @@
0F850FE71ED7C39F00FB77A7 /* WebPerformanceLoggingClient.h in Headers */,
1A3E736111CC2659007BD539 /* WebPlatformStrategies.h in Headers */,
31D5929F166E060000E6BF02 /* WebPlugInClient.h in Headers */,
- 46F636D021C41A1D00413010 /* WebPolicyAction.h in Headers */,
BC5744F012638FB3006F0F12 /* WebPopupItem.h in Headers */,
D3B9484711FF4B6500032B39 /* WebPopupMenu.h in Headers */,
BC574E631267D080006F0F12 /* WebPopupMenuProxy.h in Headers */,
@@ -10707,7 +10703,6 @@
buildActionMask = 2147483647;
files = (
2D92A784212B6AB100F493FD /* ActivityAssertion.cpp in Sources */,
- 5CE43B7221F7CC020093BCC5 /* APIHTTPCookieStoreCocoa.mm in Sources */,
2D92A77B212B6A7100F493FD /* ArgumentCoders.cpp in Sources */,
2DEB1D2E2127473600933906 /* ArgumentCodersCF.cpp in Sources */,
2D92A77C212B6A7100F493FD /* Attachment.cpp in Sources */,
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (240483 => 240484)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2019-01-25 18:48:29 UTC (rev 240483)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2019-01-25 18:49:01 UTC (rev 240484)
@@ -55,7 +55,6 @@
#include "WebPage.h"
#include "WebPageGroupProxy.h"
#include "WebPageProxyMessages.h"
-#include "WebPolicyAction.h"
#include "WebProcess.h"
#include "WebProcessPoolMessages.h"
#include "WebsitePoliciesData.h"
@@ -70,6 +69,7 @@
#include <WebCore/Frame.h>
#include <WebCore/FrameLoadRequest.h>
#include <WebCore/FrameLoader.h>
+#include <WebCore/FrameLoaderTypes.h>
#include <WebCore/FrameView.h>
#include <WebCore/HTMLAppletElement.h>
#include <WebCore/HTMLFormElement.h>
@@ -758,7 +758,7 @@
Ref<WebFrame> protector(*m_frame);
uint64_t listenerID = m_frame->setUpPolicyListener(WTFMove(function), WebFrame::ForNavigationAction::No);
if (!webPage->send(Messages::WebPageProxy::DecidePolicyForResponse(m_frame->frameID(), SecurityOriginData::fromFrame(coreFrame), navigationID, response, request, canShowResponse, listenerID, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get()))))
- m_frame->didReceivePolicyDecision(listenerID, WebPolicyAction::Ignore, 0, { }, { });
+ m_frame->didReceivePolicyDecision(listenerID, PolicyAction::Ignore, 0, { }, { });
}
void WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction(const NavigationAction& navigationAction, const ResourceRequest& request, FormState* formState, const String& frameName, FramePolicyFunction&& function)
@@ -895,12 +895,12 @@
if (policyDecisionMode == PolicyDecisionMode::Synchronous) {
uint64_t newNavigationID;
- WebPolicyAction policyAction;
+ PolicyAction policyAction;
DownloadID downloadID;
Optional<WebsitePoliciesData> websitePolicies;
if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForNavigationActionSync(m_frame->frameID(), m_frame->isMainFrame(), SecurityOriginData::fromFrame(coreFrame), documentLoader->navigationID(), navigationActionData, originatingFrameInfoData, originatingPageID, navigationAction.resourceRequest(), request, IPC::FormDataReference { request.httpBody() }, redirectResponse, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())), Messages::WebPageProxy::DecidePolicyForNavigationActionSync::Reply(policyAction, newNavigationID, downloadID, websitePolicies))) {
- m_frame->didReceivePolicyDecision(listenerID, WebPolicyAction::Ignore, 0, { }, { });
+ m_frame->didReceivePolicyDecision(listenerID, PolicyAction::Ignore, 0, { }, { });
return;
}
@@ -910,7 +910,7 @@
ASSERT(policyDecisionMode == PolicyDecisionMode::Asynchronous);
if (!webPage->send(Messages::WebPageProxy::DecidePolicyForNavigationActionAsync(m_frame->frameID(), SecurityOriginData::fromFrame(coreFrame), documentLoader->navigationID(), navigationActionData, originatingFrameInfoData, originatingPageID, navigationAction.resourceRequest(), request, IPC::FormDataReference { request.httpBody() }, redirectResponse, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get()), listenerID)))
- m_frame->didReceivePolicyDecision(listenerID, WebPolicyAction::Ignore, 0, { }, { });
+ m_frame->didReceivePolicyDecision(listenerID, PolicyAction::Ignore, 0, { }, { });
}
void WebFrameLoaderClient::cancelPolicyCheck()
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebFrame.cpp (240483 => 240484)
--- trunk/Source/WebKit/WebProcess/WebPage/WebFrame.cpp 2019-01-25 18:48:29 UTC (rev 240483)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebFrame.cpp 2019-01-25 18:49:01 UTC (rev 240484)
@@ -43,7 +43,6 @@
#include "WebDocumentLoader.h"
#include "WebPage.h"
#include "WebPageProxyMessages.h"
-#include "WebPolicyAction.h"
#include "WebProcess.h"
#include "WebsitePoliciesData.h"
#include <_javascript_Core/APICast.h>
@@ -254,22 +253,8 @@
completionHandler();
}
-static WebCore::PolicyAction toPolicyAction(WebPolicyAction policyAction)
+void WebFrame::didReceivePolicyDecision(uint64_t listenerID, PolicyAction action, uint64_t navigationID, DownloadID downloadID, Optional<WebsitePoliciesData>&& websitePolicies)
{
- switch (policyAction) {
- case WebPolicyAction::Use:
- return WebCore::PolicyAction::Use;
- case WebPolicyAction::Ignore:
- return WebCore::PolicyAction::Ignore;
- case WebPolicyAction::Download:
- return WebCore::PolicyAction::Download;
- }
- ASSERT_NOT_REACHED();
- return WebCore::PolicyAction::Ignore;
-}
-
-void WebFrame::didReceivePolicyDecision(uint64_t listenerID, WebPolicyAction action, uint64_t navigationID, DownloadID downloadID, Optional<WebsitePoliciesData>&& websitePolicies)
-{
if (!m_coreFrame || !m_policyListenerID || listenerID != m_policyListenerID || !m_policyFunction)
return;
@@ -287,7 +272,7 @@
documentLoader->setNavigationID(navigationID);
}
- function(toPolicyAction(action));
+ function(action);
}
void WebFrame::startDownload(const WebCore::ResourceRequest& request, const String& suggestedName)
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebFrame.h (240483 => 240484)
--- trunk/Source/WebKit/WebProcess/WebPage/WebFrame.h 2019-01-25 18:48:29 UTC (rev 240483)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebFrame.h 2019-01-25 18:49:01 UTC (rev 240484)
@@ -65,8 +65,6 @@
struct FrameInfoData;
struct WebsitePoliciesData;
-enum class WebPolicyAction : uint8_t;
-
class WebFrame : public API::ObjectImpl<API::Object::Type::BundleFrame> {
public:
static Ref<WebFrame> createWithCoreMainFrame(WebPage*, WebCore::Frame*);
@@ -87,7 +85,7 @@
enum class ForNavigationAction { No, Yes };
uint64_t setUpPolicyListener(WebCore::FramePolicyFunction&&, ForNavigationAction);
void invalidatePolicyListener();
- void didReceivePolicyDecision(uint64_t listenerID, WebPolicyAction, uint64_t navigationID, DownloadID, Optional<WebsitePoliciesData>&&);
+ void didReceivePolicyDecision(uint64_t listenerID, WebCore::PolicyAction, uint64_t navigationID, DownloadID, Optional<WebsitePoliciesData>&&);
uint64_t setUpWillSubmitFormListener(CompletionHandler<void()>&&);
void continueWillSubmitForm(uint64_t);
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (240483 => 240484)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2019-01-25 18:48:29 UTC (rev 240483)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2019-01-25 18:49:01 UTC (rev 240484)
@@ -111,7 +111,6 @@
#include "WebPerformanceLoggingClient.h"
#include "WebPlugInClient.h"
#include "WebPluginInfoProvider.h"
-#include "WebPolicyAction.h"
#include "WebPopupMenu.h"
#include "WebPreferencesDefinitions.h"
#include "WebPreferencesKeys.h"
@@ -3050,7 +3049,7 @@
m_page->setSessionID(sessionID);
}
-void WebPage::didReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, WebPolicyAction policyAction, uint64_t navigationID, const DownloadID& downloadID, Optional<WebsitePoliciesData>&& websitePolicies)
+void WebPage::didReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, PolicyAction policyAction, uint64_t navigationID, const DownloadID& downloadID, Optional<WebsitePoliciesData>&& websitePolicies)
{
WebFrame* frame = WebProcess::singleton().webFrame(frameID);
if (!frame)
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (240483 => 240484)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2019-01-25 18:48:29 UTC (rev 240483)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2019-01-25 18:49:01 UTC (rev 240484)
@@ -240,7 +240,6 @@
enum FindOptions : uint16_t;
enum class DragControllerAction : uint8_t;
-enum class WebPolicyAction : uint8_t;
struct AttributedString;
struct DataDetectionResult;
@@ -1301,7 +1300,7 @@
bool parentProcessHasServiceWorkerEntitlement() const { return true; }
#endif
- void didReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, WebPolicyAction, uint64_t navigationID, const DownloadID&, Optional<WebsitePoliciesData>&&);
+ void didReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, WebCore::PolicyAction, uint64_t navigationID, const DownloadID&, Optional<WebsitePoliciesData>&&);
void continueWillSubmitForm(uint64_t frameID, uint64_t listenerID);
void setUserAgent(const String&);
void setCustomTextEncodingName(const String&);
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in (240483 => 240484)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in 2019-01-25 18:48:29 UTC (rev 240483)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in 2019-01-25 18:49:01 UTC (rev 240484)
@@ -167,7 +167,7 @@
DidRemoveBackForwardItem(struct WebCore::BackForwardItemIdentifier backForwardItemID)
UpdateWebsitePolicies(struct WebKit::WebsitePoliciesData websitePolicies)
- DidReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, enum:uint8_t WebKit::WebPolicyAction policyAction, uint64_t navigationID, WebKit::DownloadID downloadID, Optional<WebKit::WebsitePoliciesData> websitePolicies)
+ DidReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, enum:uint8_t WebCore::PolicyAction policyAction, uint64_t navigationID, WebKit::DownloadID downloadID, Optional<WebKit::WebsitePoliciesData> websitePolicies)
ContinueWillSubmitForm(uint64_t frameID, uint64_t listenerID)
ClearSelection()
