Attachment 341686 Details for Bug 186081 – Patch

[patch] Patch

bug-186081-20180531125535.patch (text/plain), 1.92 KB, created by Brent Fulgham on 2018-05-31 12:55:35 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Brent Fulgham

Created: 2018-05-31 12:55:35 PDT

Size: 1.92 KB

patch

obsolete

>Subversion Revision: 232365
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index aa1e2dc390c1191d7ef55a2b2dacc18fc4f83f57..bb1625f2976760bb5a6d74884ee857bbac99ec3e 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,20 @@
>+2018-05-31  Brent Fulgham  <bfulgham@apple.com>
>+
>+        REGRESSION(r216119): DocumentLoader::detachFromFrame still encounters nullptr frame
>+        https://bugs.webkit.org/show_bug.cgi?id=186081
>+        <rdar://problem/34918109>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The nullptr check that was removed in r216119 was still needed because when the DocumentLoader
>+        is in 'm_waitingForNavigationPolicy' or in 'm_waitingForContentPolicy', a call to the policy checker
>+        to stopCheck we will clear the frame as part of the cleanup phase.
>+
>+        If m_frame is nullptr after cancelPolicyCheckIfNeeded, our work is already done so just return.
>+
>+        * loader/DocumentLoader.cpp:
>+        (WebCore::DocumentLoader::detachFromFrame):
>+
> 2018-05-31  David Kilzer  <ddkilzer@apple.com>
> 
>         Implement checked cast for DDResultRef once DDResultGetCFTypeID() is available
>diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp
>index a6e4a01dbc4c3d9564afd20ab882ef5d275cd43d..0c10b9b55e7cea7a36e39c928ba50883c0b85124 100644
>--- a/Source/WebCore/loader/DocumentLoader.cpp
>+++ b/Source/WebCore/loader/DocumentLoader.cpp
>@@ -1185,6 +1185,13 @@ void DocumentLoader::detachFromFrame()
> 
>     cancelPolicyCheckIfNeeded();
> 
>+    // cancelPolicyCheckIfNeeded can clear m_frame if the policy check
>+    // is stopped, resulting in a recursive call into this detachFromFrame.
>+    // If m_frame is nullptr after cancelPolicyCheckIfNeeded, our work is
>+    // already done so just return.
>+    if (!m_frame)
>+        return;
>+
>     InspectorInstrumentation::loaderDetachedFromFrame(*m_frame, *this);
> 
>     observeFrame(nullptr);

Actions: View | Formatted Diff | Diff

Attachments on bug 186081: 341557 | 341610 | 341686