Attachment 345866 Details for Bug 188074 – Patch

[patch] Patch

bug-188074-20180726140404.patch (text/plain), 3.73 KB, created by Alex Christensen on 2018-07-26 14:04:04 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2018-07-26 14:04:04 PDT

Size: 3.73 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 234270)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,22 @@
>+2018-07-26  Alex Christensen  <achristensen@webkit.org>
>+
>+        Fix assertions introduced in r234210
>+        https://bugs.webkit.org/show_bug.cgi?id=188074
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        There is a client that uses WKFramePolicyListenerUseWithPolicies to send website policies as
>+        a response to the WKPageNavigationClient's decidePolicyForNavigationResponse.  That is wasting
>+        effort to generate policies that don't change anything. Once that client adopts WKWebView
>+        they won't be able to do this any more, so temporarily remove the assertion.
>+        Also, make the assertion about process swapping a release assert to prevent that client
>+        from adopting WKFramePolicyListenerUseInNewProcessWithPolicies for navigation responses.
>+        It should only be used for navigation actions.
>+
>+        * UIProcess/WebPageProxy.cpp:
>+        (WebKit::WebPageProxy::decidePolicyForNewWindowAction):
>+        (WebKit::WebPageProxy::decidePolicyForResponse):
>+
> 2018-07-26  Chris Dumez  <cdumez@apple.com>
> 
>         ERROR: Unhandled web process message 'WebPage:SetUseDarkAppearance' when browsing in dark mode
>Index: Source/WebKit/UIProcess/WebPageProxy.cpp
>===================================================================
>--- Source/WebKit/UIProcess/WebPageProxy.cpp	(revision 234210)
>+++ Source/WebKit/UIProcess/WebPageProxy.cpp	(working copy)
>@@ -4082,9 +4082,9 @@ void WebPageProxy::decidePolicyForNewWin
>     MESSAGE_CHECK(frame);
>     MESSAGE_CHECK_URL(request.url());
> 
>-    auto listener = makeRef(frame->setUpPolicyListenerProxy([this, protectedThis = makeRef(*this), listenerID, frame = makeRef(*frame)] (WebCore::PolicyAction policyAction, API::WebsitePolicies* policies, ShouldProcessSwapIfPossible swap) {
>-        ASSERT_UNUSED(policies, !policies);
>-        ASSERT_UNUSED(swap, swap == ShouldProcessSwapIfPossible::No);
>+    auto listener = makeRef(frame->setUpPolicyListenerProxy([this, protectedThis = makeRef(*this), listenerID, frame = makeRef(*frame)] (WebCore::PolicyAction policyAction, API::WebsitePolicies*, ShouldProcessSwapIfPossible swap) {
>+        // FIXME: Assert the API::WebsitePolicies* is nullptr here once clients of WKFramePolicyListenerUseWithPolicies go away.
>+        RELEASE_ASSERT(swap == ShouldProcessSwapIfPossible::No);
>         receivedPolicyDecision(policyAction, frame.get(), listenerID, nullptr, std::nullopt);
>     }));
> 
>@@ -4115,9 +4115,9 @@ void WebPageProxy::decidePolicyForRespon
>     MESSAGE_CHECK_URL(response.url());
> 
>     RefPtr<API::Navigation> navigation = navigationID ? &m_navigationState->navigation(navigationID) : nullptr;
>-    auto listener = makeRef(frame->setUpPolicyListenerProxy([this, protectedThis = makeRef(*this), frame = makeRef(*frame), listenerID, navigation = WTFMove(navigation)] (WebCore::PolicyAction policyAction, API::WebsitePolicies* policies, ShouldProcessSwapIfPossible swap) {
>-        ASSERT_UNUSED(policies, !policies);
>-        ASSERT_UNUSED(swap, swap == ShouldProcessSwapIfPossible::No);
>+    auto listener = makeRef(frame->setUpPolicyListenerProxy([this, protectedThis = makeRef(*this), frame = makeRef(*frame), listenerID, navigation = WTFMove(navigation)] (WebCore::PolicyAction policyAction, API::WebsitePolicies*, ShouldProcessSwapIfPossible swap) {
>+        // FIXME: Assert the API::WebsitePolicies* is nullptr here once clients of WKFramePolicyListenerUseWithPolicies go away.
>+        RELEASE_ASSERT(swap == ShouldProcessSwapIfPossible::No);
>         receivedPolicyDecision(policyAction, frame.get(), listenerID, navigation.get(), std::nullopt);
>     }));
>

Flags:

cdumez: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 188074: 345863 | 345866