Attachment 341610 Details for Bug 186081 – Patch

[patch] Patch

bug-186081-20180530151931.patch (text/plain), 1.99 KB, created by Brent Fulgham on 2018-05-30 15:19:32 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Brent Fulgham

Created: 2018-05-30 15:19:32 PDT

Size: 1.99 KB

patch

obsolete

>Subversion Revision: 232301
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 23e2308f29a0f4f10919bdcd6e458465e78eb66d..0b9275997e6e83ee89af975192f97d608be36255 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-05-29  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.
>+
>+        Instead of passing m_frame to InspectorInstrumentation::loaderDetachedFromFrame, we sould use
>+        the protectedFrame which is guaranteed to still be valid in the current callstack.
>+
>+        * loader/DocumentLoader.cpp:
>+        (WebCore::DocumentLoader::detachFromFrame):
>+
> 2018-05-30  Jer Noble  <jer.noble@apple.com>
> 
>         Media elements outside fullscreen should not be considered main content.
>diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp
>index 7ed4f64c921181e48af9bd603259eed55d1b883a..7f69f348446cb775b2d0821285edbc696bd3e5e9 100644
>--- a/Source/WebCore/loader/DocumentLoader.cpp
>+++ b/Source/WebCore/loader/DocumentLoader.cpp
>@@ -1185,7 +1185,10 @@ void DocumentLoader::detachFromFrame()
> 
>     cancelPolicyCheckIfNeeded();
> 
>-    InspectorInstrumentation::loaderDetachedFromFrame(*m_frame, *this);
>+    // cancelPolicyCheckIfNeeded can set clear m_frame if the load
>+    // is stopped, so we need to use the protectedFrame here, since we
>+    // still want the inspector to know that the frame was detached.
>+    InspectorInstrumentation::loaderDetachedFromFrame(*protectedFrame, *this);
> 
>     observeFrame(nullptr);
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 186081: 341557 | 341610 | 341686