Changeset 240484 in webkit


Ignore:
Timestamp:
Jan 25, 2019 10:49:01 AM (5 years ago)
Author:
Chris Dumez
Message:

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:
Location:
trunk/Source/WebKit
Files:
1 deleted
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r240478 r240484  
     12019-01-25  Chris Dumez  <cdumez@apple.com>
     2
     3        Drop WebKit::WebKitPolicyAction type as it is no longer needed
     4        https://bugs.webkit.org/show_bug.cgi?id=193827
     5
     6        Reviewed by Antti Koivisto.
     7
     8        Drop WebKit::WebKitPolicyAction type as it is no longer needed. It is now identical to
     9        WebCore::PolicyAction.
     10
     11        * Shared/WebPolicyAction.h: Removed.
     12        * UIProcess/WebFramePolicyListenerProxy.cpp:
     13        (WebKit::WebFramePolicyListenerProxy::didReceiveSafeBrowsingResults):
     14        (WebKit::WebFramePolicyListenerProxy::use):
     15        (WebKit::WebFramePolicyListenerProxy::download):
     16        (WebKit::WebFramePolicyListenerProxy::ignore):
     17        * UIProcess/WebFramePolicyListenerProxy.h:
     18        * UIProcess/WebFrameProxy.cpp:
     19        (WebKit::WebFrameProxy::setUpPolicyListenerProxy):
     20        * UIProcess/WebFrameProxy.h:
     21        * UIProcess/WebPageProxy.cpp:
     22        (WebKit::WebPageProxy::receivedNavigationPolicyDecision):
     23        (WebKit::WebPageProxy::receivedPolicyDecision):
     24        (WebKit::WebPageProxy::decidePolicyForNavigationAction):
     25        (WebKit::WebPageProxy::decidePolicyForNavigationActionSync):
     26        (WebKit::WebPageProxy::decidePolicyForNewWindowAction):
     27        (WebKit::WebPageProxy::decidePolicyForResponseShared):
     28        * UIProcess/WebPageProxy.h:
     29        * WebKit.xcodeproj/project.pbxproj:
     30        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
     31        (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForResponse):
     32        (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
     33        * WebProcess/WebPage/WebFrame.cpp:
     34        (WebKit::WebFrame::didReceivePolicyDecision):
     35        (WebKit::toPolicyAction): Deleted.
     36        * WebProcess/WebPage/WebFrame.h:
     37        * WebProcess/WebPage/WebPage.cpp:
     38        (WebKit::WebPage::didReceivePolicyDecision):
     39        * WebProcess/WebPage/WebPage.h:
     40
    1412019-01-25  Per Arne Vollan  <pvollan@apple.com>
    242

  • trunk/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.cpp

    r239219 r240484  
    5151    if (m_policyResult) {
    5252        if (m_reply)
    53             m_reply(WebPolicyAction::Use, m_policyResult->first.get(), m_policyResult->second, WTFMove(safeBrowsingWarning));
     53            m_reply(WebCore::PolicyAction::Use, m_policyResult->first.get(), m_policyResult->second, WTFMove(safeBrowsingWarning));
    5454    } else
    5555        m_safeBrowsingWarning = WTFMove(safeBrowsingWarning);
    … …  
    6060    if (m_safeBrowsingWarning) {
    6161        if (m_reply)
    62             m_reply(WebPolicyAction::Use, policies, processSwapRequestedByClient, WTFMove(*m_safeBrowsingWarning));
     62            m_reply(WebCore::PolicyAction::Use, policies, processSwapRequestedByClient, WTFMove(*m_safeBrowsingWarning));
    6363    } else if (!m_policyResult)
    6464        m_policyResult = {{ policies, processSwapRequestedByClient }};
    … …  
    6868{
    6969    if (m_reply)
    70         m_reply(WebPolicyAction::Download, nullptr, ProcessSwapRequestedByClient::No, { });
     70        m_reply(WebCore::PolicyAction::Download, nullptr, ProcessSwapRequestedByClient::No, { });
    7171}
    7272
    … …  
    7474{
    7575    if (m_reply)
    76         m_reply(WebPolicyAction::Ignore, nullptr, ProcessSwapRequestedByClient::No, { });
     76        m_reply(WebCore::PolicyAction::Ignore, nullptr, ProcessSwapRequestedByClient::No, { });
    7777}
    7878

  • trunk/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.h

    r239427 r240484  
    2727
    2828#include "APIObject.h"
    29 #include "WebPolicyAction.h"
     29#include <WebCore/FrameLoaderTypes.h>
    3030#include <wtf/CompletionHandler.h>
    3131#include <wtf/Vector.h>
    … …  
    4545public:
    4646
    47     using Reply = CompletionHandler<void(WebPolicyAction, API::WebsitePolicies*, ProcessSwapRequestedByClient, RefPtr<SafeBrowsingWarning>&&)>;
     47    using Reply = CompletionHandler<void(WebCore::PolicyAction, API::WebsitePolicies*, ProcessSwapRequestedByClient, RefPtr<SafeBrowsingWarning>&&)>;
    4848    static Ref<WebFramePolicyListenerProxy> create(Reply&& reply, ShouldExpectSafeBrowsingResult expect)
    4949    {

  • trunk/Source/WebKit/UIProcess/WebFrameProxy.cpp

    r240046 r240484  
    179179}
    180180
    181 WebFramePolicyListenerProxy& WebFrameProxy::setUpPolicyListenerProxy(CompletionHandler<void(WebPolicyAction, API::WebsitePolicies*, ProcessSwapRequestedByClient, RefPtr<SafeBrowsingWarning>&&)>&& completionHandler, ShouldExpectSafeBrowsingResult expect)
     181WebFramePolicyListenerProxy& WebFrameProxy::setUpPolicyListenerProxy(CompletionHandler<void(PolicyAction, API::WebsitePolicies*, ProcessSwapRequestedByClient, RefPtr<SafeBrowsingWarning>&&)>&& completionHandler, ShouldExpectSafeBrowsingResult expect)
    182182{
    183183    if (m_activeListener)
    184184        m_activeListener->ignore();
    185     m_activeListener = WebFramePolicyListenerProxy::create([this, protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)] (WebPolicyAction action, API::WebsitePolicies* policies, ProcessSwapRequestedByClient processSwapRequestedByClient, RefPtr<SafeBrowsingWarning>&& safeBrowsingWarning) mutable {
     185    m_activeListener = WebFramePolicyListenerProxy::create([this, protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)] (PolicyAction action, API::WebsitePolicies* policies, ProcessSwapRequestedByClient processSwapRequestedByClient, RefPtr<SafeBrowsingWarning>&& safeBrowsingWarning) mutable {
    186186        completionHandler(action, policies, processSwapRequestedByClient, WTFMove(safeBrowsingWarning));
    187187        m_activeListener = nullptr;

  • trunk/Source/WebKit/UIProcess/WebFrameProxy.h

    r239219 r240484  
    118118    void didChangeTitle(const String&);
    119119
    120     WebFramePolicyListenerProxy& setUpPolicyListenerProxy(CompletionHandler<void(WebPolicyAction, API::WebsitePolicies*, ProcessSwapRequestedByClient, RefPtr<SafeBrowsingWarning>&&)>&&, ShouldExpectSafeBrowsingResult);
     120    WebFramePolicyListenerProxy& setUpPolicyListenerProxy(CompletionHandler<void(WebCore::PolicyAction, API::WebsitePolicies*, ProcessSwapRequestedByClient, RefPtr<SafeBrowsingWarning>&&)>&&, ShouldExpectSafeBrowsingResult);
    121121
    122122#if ENABLE(CONTENT_FILTERING)

  • trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

    r240443 r240484  
    26612661class WebPageProxy::PolicyDecisionSender : public RefCounted<PolicyDecisionSender> {
    26622662public:
    2663     using SendFunction = CompletionHandler<void(WebPolicyAction, uint64_t newNavigationID, DownloadID, Optional<WebsitePoliciesData>)>;
     2663    using SendFunction = CompletionHandler<void(PolicyAction, uint64_t newNavigationID, DownloadID, Optional<WebsitePoliciesData>)>;
    26642664    static Ref<PolicyDecisionSender> create(SendFunction&& sendFunction)
    26652665    {
    … …  
    26792679};
    26802680
    2681 void WebPageProxy::receivedNavigationPolicyDecision(WebPolicyAction policyAction, API::Navigation* navigation, ProcessSwapRequestedByClient processSwapRequestedByClient, WebFrameProxy& frame, API::WebsitePolicies* policies, Ref<PolicyDecisionSender>&& sender)
     2681void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, API::Navigation* navigation, ProcessSwapRequestedByClient processSwapRequestedByClient, WebFrameProxy& frame, API::WebsitePolicies* policies, Ref<PolicyDecisionSender>&& sender)
    26822682{
    26832683    Optional<WebsitePoliciesData> data;
    … …  
    26882688    }
    26892689
    2690     if (policyAction != WebPolicyAction::Use || !frame.isMainFrame() || !navigation) {
     2690    if (policyAction != PolicyAction::Use || !frame.isMainFrame() || !navigation) {
    26912691        receivedPolicyDecision(policyAction, navigation, WTFMove(data), WTFMove(sender));
    26922692        return;
    … …  
    27012701
    27022702        if (processForNavigation.ptr() != &process()) {
    2703             policyAction = WebPolicyAction::Ignore;
     2703            policyAction = PolicyAction::Ignore;
    27042704            RELEASE_LOG_IF_ALLOWED(ProcessSwapping, "decidePolicyForNavigationAction, swapping process %i with process %i for navigation, reason: %{public}s", processIdentifier(), processForNavigation->processIdentifier(), reason.utf8().data());
    27052705            LOG(ProcessSwapping, "(ProcessSwapping) Switching from process %i to new process (%i) for navigation %" PRIu64 " '%s'", processIdentifier(), processForNavigation->processIdentifier(), navigation->navigationID(), navigation->loggingString());
    … …  
    27212721}
    27222722
    2723 void WebPageProxy::receivedPolicyDecision(WebPolicyAction action, API::Navigation* navigation, Optional<WebsitePoliciesData>&& websitePolicies, Ref<PolicyDecisionSender>&& sender)
     2723void WebPageProxy::receivedPolicyDecision(PolicyAction action, API::Navigation* navigation, Optional<WebsitePoliciesData>&& websitePolicies, Ref<PolicyDecisionSender>&& sender)
    27242724{
    27252725    if (!isValid()) {
    2726         sender->send(WebPolicyAction::Ignore, 0, DownloadID(), WTF::nullopt);
     2726        sender->send(PolicyAction::Ignore, 0, DownloadID(), WTF::nullopt);
    27272727        return;
    27282728    }
    … …  
    27302730    auto transaction = m_pageLoadState.transaction();
    27312731
    2732     if (action == WebPolicyAction::Ignore)
     2732    if (action == PolicyAction::Ignore)
    27332733        m_pageLoadState.clearPendingAPIRequestURL(transaction);
    27342734
    2735     if (navigation && navigation->shouldForceDownload() && action == WebPolicyAction::Use)
    2736         action = WebPolicyAction::Download;
     2735    if (navigation && navigation->shouldForceDownload() && action == PolicyAction::Use)
     2736        action = PolicyAction::Download;
    27372737
    27382738    DownloadID downloadID = { };
    2739     if (action == WebPolicyAction::Download) {
     2739    if (action == PolicyAction::Download) {
    27402740        // Create a download proxy.
    27412741        auto* download = m_process->processPool().createDownloadProxy(m_decidePolicyForResponseRequest, this);
    … …  
    44004400#if ENABLE(CONTENT_FILTERING)
    44014401    if (frame.didHandleContentFilterUnblockNavigation(request))
    4402         return receivedPolicyDecision(WebPolicyAction::Ignore, m_navigationState->navigation(newNavigationID), WTF::nullopt, WTFMove(sender));
     4402        return receivedPolicyDecision(PolicyAction::Ignore, m_navigationState->navigation(newNavigationID), WTF::nullopt, WTFMove(sender));
    44034403#else
    44044404    UNUSED_PARAM(newNavigationID);
    … …  
    44094409        shouldExpectSafeBrowsingResult = ShouldExpectSafeBrowsingResult::No;
    44104410
    4411     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 {
     4411    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 {
    44124412       
    4413         auto completionHandler = [this, protectedThis = protectedThis.copyRef(), frame = frame.copyRef(), sender = WTFMove(sender), navigation = WTFMove(navigation), processSwapRequestedByClient, policies = makeRefPtr(policies)] (WebPolicyAction policyAction) mutable {
     4413        auto completionHandler = [this, protectedThis = protectedThis.copyRef(), frame = frame.copyRef(), sender = WTFMove(sender), navigation = WTFMove(navigation), processSwapRequestedByClient, policies = makeRefPtr(policies)] (PolicyAction policyAction) mutable {
    44144414            receivedNavigationPolicyDecision(policyAction, navigation.get(), processSwapRequestedByClient, frame, policies.get(), WTFMove(sender));
    44154415        };
    … …  
    44294429            m_pageClient->showSafeBrowsingWarning(*safeBrowsingWarning, [protectedThis = WTFMove(protectedThis), completionHandler = WTFMove(completionHandler), policyAction] (auto&& result) mutable {
    44304430                switchOn(result, [&] (const URL& url) {
    4431                     completionHandler(WebPolicyAction::Ignore);
     4431                    completionHandler(PolicyAction::Ignore);
    44324432                    protectedThis->loadRequest({ url });
    44334433                }, [&] (ContinueUnsafeLoad continueUnsafeLoad) {
    44344434                    switch (continueUnsafeLoad) {
    44354435                    case ContinueUnsafeLoad::No:
    4436                         completionHandler(WebPolicyAction::Ignore);
     4436                        completionHandler(PolicyAction::Ignore);
    44374437                        break;
    44384438                    case ContinueUnsafeLoad::Yes:
    … …  
    45524552
    45534553    // If the client did not respond synchronously, proceed with the load.
    4554     sender->send(WebPolicyAction::Use, navigationID, DownloadID(), WTF::nullopt);
     4554    sender->send(PolicyAction::Use, navigationID, DownloadID(), WTF::nullopt);
    45554555}
    45564556
    … …  
    45634563    MESSAGE_CHECK_URL(m_process, request.url());
    45644564
    4565     auto listener = makeRef(frame->setUpPolicyListenerProxy([this, protectedThis = makeRef(*this), listenerID, frameID] (WebPolicyAction policyAction, API::WebsitePolicies*, ProcessSwapRequestedByClient processSwapRequestedByClient, RefPtr<SafeBrowsingWarning>&& safeBrowsingWarning) mutable {
     4565    auto listener = makeRef(frame->setUpPolicyListenerProxy([this, protectedThis = makeRef(*this), listenerID, frameID] (PolicyAction policyAction, API::WebsitePolicies*, ProcessSwapRequestedByClient processSwapRequestedByClient, RefPtr<SafeBrowsingWarning>&& safeBrowsingWarning) mutable {
    45664566        // FIXME: Assert the API::WebsitePolicies* is nullptr here once clients of WKFramePolicyListenerUseWithPolicies go away.
    45674567        RELEASE_ASSERT(processSwapRequestedByClient == ProcessSwapRequestedByClient::No);
    … …  
    46064606
    46074607    RefPtr<API::Navigation> navigation = navigationID ? m_navigationState->navigation(navigationID) : nullptr;
    4608     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 {
     4608    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 {
    46094609        // FIXME: Assert the API::WebsitePolicies* is nullptr here once clients of WKFramePolicyListenerUseWithPolicies go away.
    46104610        RELEASE_ASSERT(processSwapRequestedByClient == ProcessSwapRequestedByClient::No);

  • trunk/Source/WebKit/UIProcess/WebPageProxy.h

    r240342 r240484  
    971971
    972972    class PolicyDecisionSender;
    973     void receivedPolicyDecision(WebPolicyAction, API::Navigation*, Optional<WebsitePoliciesData>&&, Ref<PolicyDecisionSender>&&);
    974     void receivedNavigationPolicyDecision(WebPolicyAction, API::Navigation*, ProcessSwapRequestedByClient, WebFrameProxy&, API::WebsitePolicies*, Ref<PolicyDecisionSender>&&);
     973    void receivedPolicyDecision(WebCore::PolicyAction, API::Navigation*, Optional<WebsitePoliciesData>&&, Ref<PolicyDecisionSender>&&);
     974    void receivedNavigationPolicyDecision(WebCore::PolicyAction, API::Navigation*, ProcessSwapRequestedByClient, WebFrameProxy&, API::WebsitePolicies*, Ref<PolicyDecisionSender>&&);
    975975
    976976    void backForwardRemovedItem(const WebCore::BackForwardItemIdentifier&);

  • trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in

    r240342 r240484  
    108108    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)
    109109    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)
    110     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
     110    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
    111111    DecidePolicyForNewWindowAction(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, struct WebKit::NavigationActionData navigationActionData, WebCore::ResourceRequest request, String frameName, uint64_t listenerID, WebKit::UserData userData)
    112112    UnableToImplementPolicy(uint64_t frameID, WebCore::ResourceError error, WebKit::UserData userData)

  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r240360 r240484  
    892892                46A2B6091E5676A600C3DEDA /* BackgroundProcessResponsivenessTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A2B6071E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.h */; };
    893893                46DF063C1F3905F8001980BB /* NetworkCORSPreflightChecker.h in Headers */ = {isa = PBXBuildFile; fileRef = 46DF063A1F3905E5001980BB /* NetworkCORSPreflightChecker.h */; };
    894                 46F636D021C41A1D00413010 /* WebPolicyAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 46F636CF21C41A1D00413010 /* WebPolicyAction.h */; };
    895894                4A3CC18B19B0640F00D14AEF /* UserMediaPermissionRequestManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A410F3A19AF7B04002EBAB5 /* UserMediaPermissionRequestManagerProxy.h */; };
    896895                4A3CC18D19B0641900D14AEF /* UserMediaPermissionRequestProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A410F3C19AF7B04002EBAB5 /* UserMediaPermissionRequestProxy.h */; };
    … …  
    30883087                46DF06391F3905E5001980BB /* NetworkCORSPreflightChecker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCORSPreflightChecker.cpp; sourceTree = "<group>"; };
    30893088                46DF063A1F3905E5001980BB /* NetworkCORSPreflightChecker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCORSPreflightChecker.h; sourceTree = "<group>"; };
    3090                 46F636CF21C41A1D00413010 /* WebPolicyAction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebPolicyAction.h; sourceTree = "<group>"; };
    30913089                4A410F3519AF7AC3002EBAB5 /* WKUserMediaPermissionRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKUserMediaPermissionRequest.cpp; sourceTree = "<group>"; };
    30923090                4A410F3619AF7AC3002EBAB5 /* WKUserMediaPermissionRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUserMediaPermissionRequest.h; sourceTree = "<group>"; };
    … …  
    51285126                                BC7B625012A43C9600D174A4 /* WebPageGroupData.h */,
    51295127                                C0337DDC127A521C008FF4F4 /* WebPlatformTouchPoint.cpp */,
    5130                                 46F636CF21C41A1D00413010 /* WebPolicyAction.h */,
    51315128                                BC5744ED12638FB3006F0F12 /* WebPopupItem.cpp */,
    51325129                                BC5744EE12638FB3006F0F12 /* WebPopupItem.h */,
    … …  
    95059502                                1A3E736111CC2659007BD539 /* WebPlatformStrategies.h in Headers */,
    95069503                                31D5929F166E060000E6BF02 /* WebPlugInClient.h in Headers */,
    9507                                 46F636D021C41A1D00413010 /* WebPolicyAction.h in Headers */,
    95089504                                BC5744F012638FB3006F0F12 /* WebPopupItem.h in Headers */,
    95099505                                D3B9484711FF4B6500032B39 /* WebPopupMenu.h in Headers */,
    … …  
    1070810704                        files = (
    1070910705                                2D92A784212B6AB100F493FD /* ActivityAssertion.cpp in Sources */,
    10710                                 5CE43B7221F7CC020093BCC5 /* APIHTTPCookieStoreCocoa.mm in Sources */,
    1071110706                                2D92A77B212B6A7100F493FD /* ArgumentCoders.cpp in Sources */,
    1071210707                                2DEB1D2E2127473600933906 /* ArgumentCodersCF.cpp in Sources */,

  • trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

    r240249 r240484  
    5656#include "WebPageGroupProxy.h"
    5757#include "WebPageProxyMessages.h"
    58 #include "WebPolicyAction.h"
    5958#include "WebProcess.h"
    6059#include "WebProcessPoolMessages.h"
    … …  
    7170#include <WebCore/FrameLoadRequest.h>
    7271#include <WebCore/FrameLoader.h>
     72#include <WebCore/FrameLoaderTypes.h>
    7373#include <WebCore/FrameView.h>
    7474#include <WebCore/HTMLAppletElement.h>
    … …  
    759759    uint64_t listenerID = m_frame->setUpPolicyListener(WTFMove(function), WebFrame::ForNavigationAction::No);
    760760    if (!webPage->send(Messages::WebPageProxy::DecidePolicyForResponse(m_frame->frameID(), SecurityOriginData::fromFrame(coreFrame), navigationID, response, request, canShowResponse, listenerID, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get()))))
    761         m_frame->didReceivePolicyDecision(listenerID, WebPolicyAction::Ignore, 0, { }, { });
     761        m_frame->didReceivePolicyDecision(listenerID, PolicyAction::Ignore, 0, { }, { });
    762762}
    763763
    … …  
    896896    if (policyDecisionMode == PolicyDecisionMode::Synchronous) {
    897897        uint64_t newNavigationID;
    898         WebPolicyAction policyAction;
     898        PolicyAction policyAction;
    899899        DownloadID downloadID;
    900900        Optional<WebsitePoliciesData> websitePolicies;
    901901
    902902        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))) {
    903             m_frame->didReceivePolicyDecision(listenerID, WebPolicyAction::Ignore, 0, { }, { });
     903            m_frame->didReceivePolicyDecision(listenerID, PolicyAction::Ignore, 0, { }, { });
    904904            return;
    905905        }
    … …  
    911911    ASSERT(policyDecisionMode == PolicyDecisionMode::Asynchronous);
    912912    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)))
    913         m_frame->didReceivePolicyDecision(listenerID, WebPolicyAction::Ignore, 0, { }, { });
     913        m_frame->didReceivePolicyDecision(listenerID, PolicyAction::Ignore, 0, { }, { });
    914914}
    915915

  • trunk/Source/WebKit/WebProcess/WebPage/WebFrame.cpp

    r240046 r240484  
    4444#include "WebPage.h"
    4545#include "WebPageProxyMessages.h"
    46 #include "WebPolicyAction.h"
    4746#include "WebProcess.h"
    4847#include "WebsitePoliciesData.h"
    … …  
    255254}
    256255
    257 static WebCore::PolicyAction toPolicyAction(WebPolicyAction policyAction)
    258 {
    259     switch (policyAction) {
    260     case WebPolicyAction::Use:
    261         return WebCore::PolicyAction::Use;
    262     case WebPolicyAction::Ignore:
    263         return WebCore::PolicyAction::Ignore;
    264     case WebPolicyAction::Download:
    265         return WebCore::PolicyAction::Download;
    266     }
    267     ASSERT_NOT_REACHED();
    268     return WebCore::PolicyAction::Ignore;
    269 }
    270 
    271 void WebFrame::didReceivePolicyDecision(uint64_t listenerID, WebPolicyAction action, uint64_t navigationID, DownloadID downloadID, Optional<WebsitePoliciesData>&& websitePolicies)
     256void WebFrame::didReceivePolicyDecision(uint64_t listenerID, PolicyAction action, uint64_t navigationID, DownloadID downloadID, Optional<WebsitePoliciesData>&& websitePolicies)
    272257{
    273258    if (!m_coreFrame || !m_policyListenerID || listenerID != m_policyListenerID || !m_policyFunction)
    … …  
    288273    }
    289274
    290     function(toPolicyAction(action));
     275    function(action);
    291276}
    292277

  • trunk/Source/WebKit/WebProcess/WebPage/WebFrame.h

    r239427 r240484  
    6666struct WebsitePoliciesData;
    6767
    68 enum class WebPolicyAction : uint8_t;
    69 
    7068class WebFrame : public API::ObjectImpl<API::Object::Type::BundleFrame> {
    7169public:
    … …  
    8886    uint64_t setUpPolicyListener(WebCore::FramePolicyFunction&&, ForNavigationAction);
    8987    void invalidatePolicyListener();
    90     void didReceivePolicyDecision(uint64_t listenerID, WebPolicyAction, uint64_t navigationID, DownloadID, Optional<WebsitePoliciesData>&&);
     88    void didReceivePolicyDecision(uint64_t listenerID, WebCore::PolicyAction, uint64_t navigationID, DownloadID, Optional<WebsitePoliciesData>&&);
    9189
    9290    uint64_t setUpWillSubmitFormListener(CompletionHandler<void()>&&);

  • trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

    r240476 r240484  
    112112#include "WebPlugInClient.h"
    113113#include "WebPluginInfoProvider.h"
    114 #include "WebPolicyAction.h"
    115114#include "WebPopupMenu.h"
    116115#include "WebPreferencesDefinitions.h"
    … …  
    30513050}
    30523051
    3053 void WebPage::didReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, WebPolicyAction policyAction, uint64_t navigationID, const DownloadID& downloadID, Optional<WebsitePoliciesData>&& websitePolicies)
     3052void WebPage::didReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, PolicyAction policyAction, uint64_t navigationID, const DownloadID& downloadID, Optional<WebsitePoliciesData>&& websitePolicies)
    30543053{
    30553054    WebFrame* frame = WebProcess::singleton().webFrame(frameID);

  • trunk/Source/WebKit/WebProcess/WebPage/WebPage.h

    r240298 r240484  
    241241enum FindOptions : uint16_t;
    242242enum class DragControllerAction : uint8_t;
    243 enum class WebPolicyAction : uint8_t;
    244243
    245244struct AttributedString;
    … …  
    13021301#endif
    13031302
    1304     void didReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, WebPolicyAction, uint64_t navigationID, const DownloadID&, Optional<WebsitePoliciesData>&&);
     1303    void didReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, WebCore::PolicyAction, uint64_t navigationID, const DownloadID&, Optional<WebsitePoliciesData>&&);
    13051304    void continueWillSubmitForm(uint64_t frameID, uint64_t listenerID);
    13061305    void setUserAgent(const String&);

  • trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in

    r239640 r240484  
    168168
    169169    UpdateWebsitePolicies(struct WebKit::WebsitePoliciesData websitePolicies)
    170     DidReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, enum:uint8_t WebKit::WebPolicyAction policyAction, uint64_t navigationID, WebKit::DownloadID downloadID, Optional<WebKit::WebsitePoliciesData> websitePolicies)
     170    DidReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, enum:uint8_t WebCore::PolicyAction policyAction, uint64_t navigationID, WebKit::DownloadID downloadID, Optional<WebKit::WebsitePoliciesData> websitePolicies)
    171171    ContinueWillSubmitForm(uint64_t frameID, uint64_t listenerID)
    172172
Note: See TracChangeset for help on using the changeset viewer.