Attachment 348643 Details for Bug 189195 – Patch

[patch] Patch

bug-189195-20180831095419.patch (text/plain), 21.48 KB, created by Chris Dumez on 2018-08-31 09:54:20 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2018-08-31 09:54:20 PDT

Size: 21.48 KB

patch

obsolete

>Subversion Revision: 235532
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index c10fc048b7e074cd0dbb248efdba5d327002c374..fb8a201ba75dc8544ff35d30239708309c2c6241 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,38 @@
>+2018-08-31  Chris Dumez  <cdumez@apple.com>
>+
>+        Rename ShouldProcessSwapIfPossible to ProcessSwapRequestedByClient for clarity
>+        https://bugs.webkit.org/show_bug.cgi?id=189195
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Rename ShouldProcessSwapIfPossible to ProcessSwapRequestedByClient for clarity, since it indicates the client
>+        requested a process swap via its navigation policy decision.
>+
>+        * UIProcess/API/C/WKFramePolicyListener.cpp:
>+        (WKFramePolicyListenerUseInNewProcess):
>+        (useWithPolicies):
>+        (WKFramePolicyListenerUseWithPolicies):
>+        (WKFramePolicyListenerUseInNewProcessWithPolicies):
>+        * UIProcess/Cocoa/NavigationState.mm:
>+        (WebKit::NavigationState::NavigationClient::decidePolicyForNavigationAction):
>+        * UIProcess/WebFramePolicyListenerProxy.cpp:
>+        (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::decidePolicyForNavigationAction):
>+        (WebKit::WebPageProxy::decidePolicyForNewWindowAction):
>+        (WebKit::WebPageProxy::decidePolicyForResponse):
>+        * UIProcess/WebPageProxy.h:
>+        * UIProcess/WebProcessPool.cpp:
>+        (WebKit::WebProcessPool::processForNavigation):
>+        (WebKit::WebProcessPool::processForNavigationInternal):
>+        * UIProcess/WebProcessPool.h:
>+
> 2018-08-30  Chris Dumez  <cdumez@apple.com>
> 
>         Add WKPageLoadFile SPI variant which returns a navigation object
>diff --git a/Source/WebKit/UIProcess/API/C/WKFramePolicyListener.cpp b/Source/WebKit/UIProcess/API/C/WKFramePolicyListener.cpp
>index 88331122a31eefcc46d51512fae76491b3fe7352..a85b5bcd7ca5d6852b6b980e05abcdf5bd4d4c3a 100644
>--- a/Source/WebKit/UIProcess/API/C/WKFramePolicyListener.cpp
>+++ b/Source/WebKit/UIProcess/API/C/WKFramePolicyListener.cpp
>@@ -48,27 +48,27 @@ void WKFramePolicyListenerUse(WKFramePolicyListenerRef policyListenerRef)
> 
> void WKFramePolicyListenerUseInNewProcess(WKFramePolicyListenerRef policyListenerRef)
> {
>-    toImpl(policyListenerRef)->use(nullptr, ShouldProcessSwapIfPossible::Yes);
>+    toImpl(policyListenerRef)->use(nullptr, ProcessSwapRequestedByClient::Yes);
> }
> 
>-static void useWithPolicies(WKFramePolicyListenerRef policyListenerRef, WKWebsitePoliciesRef websitePolicies, ShouldProcessSwapIfPossible shouldProcessSwapIfPossible)
>+static void useWithPolicies(WKFramePolicyListenerRef policyListenerRef, WKWebsitePoliciesRef websitePolicies, ProcessSwapRequestedByClient processSwapRequestedByClient)
> {
>     if (auto* websiteDataStore = toImpl(websitePolicies)->websiteDataStore()) {
>         auto sessionID = websiteDataStore->websiteDataStore().sessionID();
>         RELEASE_ASSERT_WITH_MESSAGE(sessionID.isEphemeral() || sessionID == PAL::SessionID::defaultSessionID(), "If WebsitePolicies specifies a WebsiteDataStore, the data store's session must be default or non-persistent.");
>     }
> 
>-    toImpl(policyListenerRef)->use(toImpl(websitePolicies), shouldProcessSwapIfPossible);
>+    toImpl(policyListenerRef)->use(toImpl(websitePolicies), processSwapRequestedByClient);
> }
> 
> void WKFramePolicyListenerUseWithPolicies(WKFramePolicyListenerRef policyListenerRef, WKWebsitePoliciesRef websitePolicies)
> {
>-    useWithPolicies(policyListenerRef, websitePolicies, ShouldProcessSwapIfPossible::No);
>+    useWithPolicies(policyListenerRef, websitePolicies, ProcessSwapRequestedByClient::No);
> }
> 
> void WKFramePolicyListenerUseInNewProcessWithPolicies(WKFramePolicyListenerRef policyListenerRef, WKWebsitePoliciesRef websitePolicies)
> {
>-    useWithPolicies(policyListenerRef, websitePolicies, ShouldProcessSwapIfPossible::Yes);
>+    useWithPolicies(policyListenerRef, websitePolicies, ProcessSwapRequestedByClient::Yes);
> }
> 
> void WKFramePolicyListenerDownload(WKFramePolicyListenerRef policyListenerRef)
>diff --git a/Source/WebKit/UIProcess/Cocoa/NavigationState.mm b/Source/WebKit/UIProcess/Cocoa/NavigationState.mm
>index 8487e6e305fc64900bd31a7186ecc6c02b33ddc7..d5acd6438d0f553f958a720666ff42d1c03bafd4 100644
>--- a/Source/WebKit/UIProcess/Cocoa/NavigationState.mm
>+++ b/Source/WebKit/UIProcess/Cocoa/NavigationState.mm
>@@ -552,7 +552,7 @@ void NavigationState::NavigationClient::decidePolicyForNavigationAction(WebPageP
>                     return;
>                 }
> 
>-                localListener->use(websitePolicies.get(), actionPolicy == _WKNavigationActionPolicyAllowInNewProcess ? ShouldProcessSwapIfPossible::Yes : ShouldProcessSwapIfPossible::No);
>+                localListener->use(websitePolicies.get(), actionPolicy == _WKNavigationActionPolicyAllowInNewProcess ? ProcessSwapRequestedByClient::Yes : ProcessSwapRequestedByClient::No);
>             });
>         
>             break;
>diff --git a/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.cpp b/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.cpp
>index 3f82b09cb98aa57559a161802c14faf70d5e7ac7..40aa1844d9f899a5539dbd90b9e48a69fdb2f568 100644
>--- a/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.cpp
>+++ b/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.cpp
>@@ -55,25 +55,25 @@ void WebFramePolicyListenerProxy::didReceiveSafeBrowsingResults(Vector<SafeBrows
>         m_safeBrowsingResults = WTFMove(safeBrowsingResults);
> }
> 
>-void WebFramePolicyListenerProxy::use(API::WebsitePolicies* policies, ShouldProcessSwapIfPossible swap)
>+void WebFramePolicyListenerProxy::use(API::WebsitePolicies* policies, ProcessSwapRequestedByClient processSwapRequestedByClient)
> {
>     if (m_safeBrowsingResults) {
>         if (m_reply)
>-            m_reply(WebCore::PolicyAction::Use, policies, swap, WTFMove(*m_safeBrowsingResults));
>+            m_reply(WebCore::PolicyAction::Use, policies, processSwapRequestedByClient, WTFMove(*m_safeBrowsingResults));
>     } else if (!m_policyResult)
>-        m_policyResult = {{ policies, swap }};
>+        m_policyResult = {{ policies, processSwapRequestedByClient }};
> }
> 
> void WebFramePolicyListenerProxy::download()
> {
>     if (m_reply)
>-        m_reply(WebCore::PolicyAction::Download, nullptr, ShouldProcessSwapIfPossible::No, { });
>+        m_reply(WebCore::PolicyAction::Download, nullptr, ProcessSwapRequestedByClient::No, { });
> }
> 
> void WebFramePolicyListenerProxy::ignore()
> {
>     if (m_reply)
>-        m_reply(WebCore::PolicyAction::Ignore, nullptr, ShouldProcessSwapIfPossible::No, { });
>+        m_reply(WebCore::PolicyAction::Ignore, nullptr, ProcessSwapRequestedByClient::No, { });
> }
> 
> } // namespace WebKit
>diff --git a/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.h b/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.h
>index 89db2117f77c34ba725845760097ccf706785e6f..f726c67b9077ad064bb6ab453f73a186a395598f 100644
>--- a/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.h
>+++ b/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.h
>@@ -41,20 +41,20 @@ namespace WebKit {
> 
> class SafeBrowsingResult;
> 
>-enum class ShouldProcessSwapIfPossible { No, Yes };
>+enum class ProcessSwapRequestedByClient { No, Yes };
> enum class ShouldExpectSafeBrowsingResult { No, Yes };
> 
> class WebFramePolicyListenerProxy : public API::ObjectImpl<API::Object::Type::FramePolicyListener> {
> public:
> 
>-    using Reply = CompletionHandler<void(WebCore::PolicyAction, API::WebsitePolicies*, ShouldProcessSwapIfPossible, Vector<SafeBrowsingResult>&&)>;
>+    using Reply = CompletionHandler<void(WebCore::PolicyAction, API::WebsitePolicies*, ProcessSwapRequestedByClient, Vector<SafeBrowsingResult>&&)>;
>     static Ref<WebFramePolicyListenerProxy> create(Reply&& reply, ShouldExpectSafeBrowsingResult expect)
>     {
>         return adoptRef(*new WebFramePolicyListenerProxy(WTFMove(reply), expect));
>     }
>     ~WebFramePolicyListenerProxy();
> 
>-    void use(API::WebsitePolicies* = nullptr, ShouldProcessSwapIfPossible = ShouldProcessSwapIfPossible::No);
>+    void use(API::WebsitePolicies* = nullptr, ProcessSwapRequestedByClient = ProcessSwapRequestedByClient::No);
>     void download();
>     void ignore();
>     
>@@ -63,7 +63,7 @@ public:
> private:
>     WebFramePolicyListenerProxy(Reply&&, ShouldExpectSafeBrowsingResult);
> 
>-    std::optional<std::pair<RefPtr<API::WebsitePolicies>, ShouldProcessSwapIfPossible>> m_policyResult;
>+    std::optional<std::pair<RefPtr<API::WebsitePolicies>, ProcessSwapRequestedByClient>> m_policyResult;
>     std::optional<Vector<SafeBrowsingResult>> m_safeBrowsingResults;
>     Reply m_reply;
> };
>diff --git a/Source/WebKit/UIProcess/WebFrameProxy.cpp b/Source/WebKit/UIProcess/WebFrameProxy.cpp
>index b5f520ea871fe5b67970a547db76a2446bae3ce9..026fc7b4bb6fe56f03c5909941f6107785127f5d 100644
>--- a/Source/WebKit/UIProcess/WebFrameProxy.cpp
>+++ b/Source/WebKit/UIProcess/WebFrameProxy.cpp
>@@ -177,12 +177,12 @@ void WebFrameProxy::didChangeTitle(const String& title)
>     m_title = title;
> }
> 
>-WebFramePolicyListenerProxy& WebFrameProxy::setUpPolicyListenerProxy(CompletionHandler<void(WebCore::PolicyAction, API::WebsitePolicies*, ShouldProcessSwapIfPossible, Vector<SafeBrowsingResult>&&)>&& completionHandler, ShouldExpectSafeBrowsingResult expect)
>+WebFramePolicyListenerProxy& WebFrameProxy::setUpPolicyListenerProxy(CompletionHandler<void(WebCore::PolicyAction, API::WebsitePolicies*, ProcessSwapRequestedByClient, Vector<SafeBrowsingResult>&&)>&& completionHandler, ShouldExpectSafeBrowsingResult expect)
> {
>     if (m_activeListener)
>         m_activeListener->ignore();
>-    m_activeListener = WebFramePolicyListenerProxy::create([this, protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)] (WebCore::PolicyAction action, API::WebsitePolicies* policies, ShouldProcessSwapIfPossible swap, Vector<SafeBrowsingResult>&& safeBrowsingResults) mutable {
>-        completionHandler(action, policies, swap, WTFMove(safeBrowsingResults));
>+    m_activeListener = WebFramePolicyListenerProxy::create([this, protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)] (WebCore::PolicyAction action, API::WebsitePolicies* policies, ProcessSwapRequestedByClient processSwapRequestedByClient, Vector<SafeBrowsingResult>&& safeBrowsingResults) mutable {
>+        completionHandler(action, policies, processSwapRequestedByClient, WTFMove(safeBrowsingResults));
>         m_activeListener = nullptr;
>     }, expect);
>     return *m_activeListener;
>diff --git a/Source/WebKit/UIProcess/WebFrameProxy.h b/Source/WebKit/UIProcess/WebFrameProxy.h
>index 522cb58a37651bcbea68d12ef5dd313cc0c9afe4..476a5a47147a65333f1bfaa13bd8d24f42e84a99 100644
>--- a/Source/WebKit/UIProcess/WebFrameProxy.h
>+++ b/Source/WebKit/UIProcess/WebFrameProxy.h
>@@ -54,7 +54,7 @@ class WebFramePolicyListenerProxy;
> class WebPageProxy;
> class WebsiteDataStore;
> enum class ShouldExpectSafeBrowsingResult;
>-enum class ShouldProcessSwapIfPossible;
>+enum class ProcessSwapRequestedByClient;
> struct WebsitePoliciesData;
> 
> typedef GenericCallback<API::Data*> DataCallback;
>@@ -117,7 +117,7 @@ public:
>     void didSameDocumentNavigation(const WebCore::URL&); // eg. anchor navigation, session state change.
>     void didChangeTitle(const String&);
> 
>-    WebFramePolicyListenerProxy& setUpPolicyListenerProxy(CompletionHandler<void(WebCore::PolicyAction, API::WebsitePolicies*, ShouldProcessSwapIfPossible, Vector<SafeBrowsingResult>&&)>&&, ShouldExpectSafeBrowsingResult);
>+    WebFramePolicyListenerProxy& setUpPolicyListenerProxy(CompletionHandler<void(WebCore::PolicyAction, API::WebsitePolicies*, ProcessSwapRequestedByClient, Vector<SafeBrowsingResult>&&)>&&, ShouldExpectSafeBrowsingResult);
> 
> #if ENABLE(CONTENT_FILTERING)
>     void contentFilterDidBlockLoad(WebCore::ContentFilterUnblockHandler contentFilterUnblockHandler) { m_contentFilterUnblockHandler = WTFMove(contentFilterUnblockHandler); }
>diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
>index 6481081126a32fb4243bc5eff75b1da66a7a4122..862e48636c483bf571a2d0d7ffee81450848ddbd 100644
>--- a/Source/WebKit/UIProcess/WebPageProxy.cpp
>+++ b/Source/WebKit/UIProcess/WebPageProxy.cpp
>@@ -4013,7 +4013,7 @@ void WebPageProxy::decidePolicyForNavigationAction(uint64_t frameID, const WebCo
>     UNUSED_PARAM(newNavigationID);
> #endif
> 
>-    auto listener = makeRef(frame->setUpPolicyListenerProxy([this, protectedThis = makeRef(*this), frame = makeRef(*frame), sender = sender.copyRef(), navigation] (WebCore::PolicyAction policyAction, API::WebsitePolicies* policies, ShouldProcessSwapIfPossible swap, Vector<SafeBrowsingResult>&&) mutable {
>+    auto listener = makeRef(frame->setUpPolicyListenerProxy([this, protectedThis = makeRef(*this), frame = makeRef(*frame), sender = sender.copyRef(), navigation] (WebCore::PolicyAction policyAction, API::WebsitePolicies* policies, ProcessSwapRequestedByClient processSwapRequestedByClient, Vector<SafeBrowsingResult>&&) mutable {
>         // FIXME: do something with the SafeBrowsingResults.
> 
>         std::optional<WebsitePoliciesData> data;
>@@ -4024,7 +4024,7 @@ void WebPageProxy::decidePolicyForNavigationAction(uint64_t frameID, const WebCo
>         }
> 
>         if (policyAction == PolicyAction::Use && frame->isMainFrame()) {
>-            auto proposedProcess = process().processPool().processForNavigation(*this, *navigation, swap, policyAction);
>+            auto proposedProcess = process().processPool().processForNavigation(*this, *navigation, processSwapRequestedByClient, policyAction);
>             
>             if (proposedProcess.ptr() != &process()) {
>                 LOG(ProcessSwapping, "(ProcessSwapping) Switching from process %i to new process (%i) for navigation %" PRIu64 " '%s'", processIdentifier(), proposedProcess->processIdentifier(), navigation->navigationID(), navigation->loggingString());
>@@ -4084,9 +4084,9 @@ void WebPageProxy::decidePolicyForNewWindowAction(uint64_t frameID, const Securi
>     MESSAGE_CHECK(frame);
>     MESSAGE_CHECK_URL(request.url());
> 
>-    auto listener = makeRef(frame->setUpPolicyListenerProxy([this, protectedThis = makeRef(*this), listenerID, frameID] (WebCore::PolicyAction policyAction, API::WebsitePolicies*, ShouldProcessSwapIfPossible swap, Vector<SafeBrowsingResult>&& safeBrowsingResults) mutable {
>+    auto listener = makeRef(frame->setUpPolicyListenerProxy([this, protectedThis = makeRef(*this), listenerID, frameID] (WebCore::PolicyAction policyAction, API::WebsitePolicies*, ProcessSwapRequestedByClient processSwapRequestedByClient, Vector<SafeBrowsingResult>&& safeBrowsingResults) mutable {
>         // FIXME: Assert the API::WebsitePolicies* is nullptr here once clients of WKFramePolicyListenerUseWithPolicies go away.
>-        RELEASE_ASSERT(swap == ShouldProcessSwapIfPossible::No);
>+        RELEASE_ASSERT(processSwapRequestedByClient == ProcessSwapRequestedByClient::No);
>         ASSERT_UNUSED(safeBrowsingResults, safeBrowsingResults.isEmpty());
>         receivedPolicyDecision(policyAction, nullptr, std::nullopt, PolicyDecisionSender::create([this, protectedThis = WTFMove(protectedThis), frameID, listenerID] (auto... args) {
>             m_process->send(Messages::WebPage::DidReceivePolicyDecision(frameID, listenerID, args...), m_pageID);
>@@ -4120,9 +4120,9 @@ void WebPageProxy::decidePolicyForResponse(uint64_t frameID, const SecurityOrigi
>     MESSAGE_CHECK_URL(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)] (WebCore::PolicyAction policyAction, API::WebsitePolicies*, ShouldProcessSwapIfPossible swap, Vector<SafeBrowsingResult>&& safeBrowsingResults) mutable {
>+    auto listener = makeRef(frame->setUpPolicyListenerProxy([this, protectedThis = makeRef(*this), frameID, listenerID, navigation = WTFMove(navigation)] (WebCore::PolicyAction policyAction, API::WebsitePolicies*, ProcessSwapRequestedByClient processSwapRequestedByClient, Vector<SafeBrowsingResult>&& safeBrowsingResults) mutable {
>         // FIXME: Assert the API::WebsitePolicies* is nullptr here once clients of WKFramePolicyListenerUseWithPolicies go away.
>-        RELEASE_ASSERT(swap == ShouldProcessSwapIfPossible::No);
>+        RELEASE_ASSERT(processSwapRequestedByClient == ProcessSwapRequestedByClient::No);
>         ASSERT_UNUSED(safeBrowsingResults, safeBrowsingResults.isEmpty());
>         receivedPolicyDecision(policyAction, navigation.get(), std::nullopt, PolicyDecisionSender::create([this, protectedThis = WTFMove(protectedThis), frameID, listenerID] (auto... args) {
>             m_process->send(Messages::WebPage::DidReceivePolicyDecision(frameID, listenerID, args...), m_pageID);
>diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h
>index 7be539858596bf153da70ed08d2e2212ac639879..fb5491421f13b3530745103d35d740fe1f504fb3 100644
>--- a/Source/WebKit/UIProcess/WebPageProxy.h
>+++ b/Source/WebKit/UIProcess/WebPageProxy.h
>@@ -258,7 +258,7 @@ struct PrintInfo;
> struct WebPopupItem;
> struct URLSchemeTaskParameters;
> 
>-enum class ShouldProcessSwapIfPossible;
>+enum class ProcessSwapRequestedByClient;
> enum class UndoOrRedo;
> 
> #if USE(QUICK_LOOK)
>diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp
>index a641578787d04979b49dc50097a5f0b50d9f521d..db93351ce935ece55e1800229007b77b256dc9f7 100644
>--- a/Source/WebKit/UIProcess/WebProcessPool.cpp
>+++ b/Source/WebKit/UIProcess/WebProcessPool.cpp
>@@ -2126,9 +2126,9 @@ void WebProcessPool::removeProcessFromOriginCacheSet(WebProcessProxy& process)
>         m_swappedProcessesPerRegistrableDomain.remove(registrableDomain);
> }
> 
>-Ref<WebProcessProxy> WebProcessPool::processForNavigation(WebPageProxy& page, const API::Navigation& navigation, ShouldProcessSwapIfPossible shouldProcessSwapIfPossible, PolicyAction& action)
>+Ref<WebProcessProxy> WebProcessPool::processForNavigation(WebPageProxy& page, const API::Navigation& navigation, ProcessSwapRequestedByClient processSwapRequestedByClient, PolicyAction& action)
> {
>-    auto process = processForNavigationInternal(page, navigation, shouldProcessSwapIfPossible, action);
>+    auto process = processForNavigationInternal(page, navigation, processSwapRequestedByClient, action);
> 
>     if (m_configuration->alwaysKeepAndReuseSwappedProcesses() && process.ptr() != &page.process()) {
>         static std::once_flag onceFlag;
>@@ -2144,9 +2144,9 @@ Ref<WebProcessProxy> WebProcessPool::processForNavigation(WebPageProxy& page, co
>     return process;
> }
> 
>-Ref<WebProcessProxy> WebProcessPool::processForNavigationInternal(WebPageProxy& page, const API::Navigation& navigation, ShouldProcessSwapIfPossible shouldProcessSwapIfPossible, PolicyAction& action)
>+Ref<WebProcessProxy> WebProcessPool::processForNavigationInternal(WebPageProxy& page, const API::Navigation& navigation, ProcessSwapRequestedByClient processSwapRequestedByClient, PolicyAction& action)
> {
>-    if (!m_configuration->processSwapsOnNavigation() && shouldProcessSwapIfPossible == ShouldProcessSwapIfPossible::No)
>+    if (!m_configuration->processSwapsOnNavigation() && processSwapRequestedByClient == ProcessSwapRequestedByClient::No)
>         return page.process();
> 
>     if (page.inspectorFrontendCount() > 0)
>@@ -2190,7 +2190,7 @@ Ref<WebProcessProxy> WebProcessPool::processForNavigationInternal(WebPageProxy&
>     }
> 
>     auto targetURL = navigation.currentRequest().url();
>-    if (shouldProcessSwapIfPossible == ShouldProcessSwapIfPossible::No) {
>+    if (processSwapRequestedByClient == ProcessSwapRequestedByClient::No) {
>         if (navigation.treatAsSameOriginNavigation())
>             return page.process();
> 
>diff --git a/Source/WebKit/UIProcess/WebProcessPool.h b/Source/WebKit/UIProcess/WebProcessPool.h
>index 112154002a3f69ce677746ffa7b1430aaf3516d9..a12d645f3173d13d80adeb5e733d4cc18955ecac 100644
>--- a/Source/WebKit/UIProcess/WebProcessPool.h
>+++ b/Source/WebKit/UIProcess/WebProcessPool.h
>@@ -110,7 +110,7 @@ int webProcessLatencyQOS();
> int webProcessThroughputQOS();
> #endif
> 
>-enum class ShouldProcessSwapIfPossible;
>+enum class ProcessSwapRequestedByClient;
> 
> class WebProcessPool final : public API::ObjectImpl<API::Object::Type::ProcessPool>, public CanMakeWeakPtr<WebProcessPool>, private IPC::MessageReceiver {
> public:
>@@ -450,7 +450,7 @@ public:
>     BackgroundWebProcessToken backgroundWebProcessToken() const { return BackgroundWebProcessToken(m_backgroundWebProcessCounter.count()); }
> #endif
> 
>-    Ref<WebProcessProxy> processForNavigation(WebPageProxy&, const API::Navigation&, ShouldProcessSwapIfPossible, WebCore::PolicyAction&);
>+    Ref<WebProcessProxy> processForNavigation(WebPageProxy&, const API::Navigation&, ProcessSwapRequestedByClient, WebCore::PolicyAction&);
>     void registerSuspendedPageProxy(SuspendedPageProxy&);
>     void unregisterSuspendedPageProxy(SuspendedPageProxy&);
>     void didReachGoodTimeToPrewarm();
>@@ -470,7 +470,7 @@ private:
>     void platformInitializeWebProcess(WebProcessCreationParameters&);
>     void platformInvalidateContext();
> 
>-    Ref<WebProcessProxy> processForNavigationInternal(WebPageProxy&, const API::Navigation&, ShouldProcessSwapIfPossible, WebCore::PolicyAction&);
>+    Ref<WebProcessProxy> processForNavigationInternal(WebPageProxy&, const API::Navigation&, ProcessSwapRequestedByClient, WebCore::PolicyAction&);
> 
>     RefPtr<WebProcessProxy> tryTakePrewarmedProcess(WebsiteDataStore&);
>

Actions: View | Formatted Diff | Diff

Attachments on bug 189195: 348643