Attachment 372647 Details for Bug 199118 – Patch

[patch] Patch

bug-199118-20190621141242.patch (text/plain), 2.09 KB, created by youenn fablet on 2019-06-21 14:12:43 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2019-06-21 14:12:43 PDT

Size: 2.09 KB

patch

obsolete

>Subversion Revision: 246680
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 83a6a9542c40cb72aba998323989cdc3285d7e04..21aa1112e6df34cf799ca08762ec6bc682c7211f 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-06-21  Youenn Fablet  <youenn@apple.com>
>+
>+        ResourceLoadNotifier should check whether its frame document loader is null
>+        https://bugs.webkit.org/show_bug.cgi?id=199118
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * loader/ResourceLoadNotifier.cpp:
>+        (WebCore::ResourceLoadNotifier::dispatchWillSendRequest):
>+
> 2019-06-21  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][IFC] Adjust baseline top when the baseline moves.
>diff --git a/Source/WebCore/loader/ResourceLoadNotifier.cpp b/Source/WebCore/loader/ResourceLoadNotifier.cpp
>index 8b4ded9b2b7d626c1d7c6e325638176fca6b55e8..63a4e9158237f4d693dcf590ed17126fd9bd3725 100644
>--- a/Source/WebCore/loader/ResourceLoadNotifier.cpp
>+++ b/Source/WebCore/loader/ResourceLoadNotifier.cpp
>@@ -122,14 +122,17 @@ void ResourceLoadNotifier::dispatchWillSendRequest(DocumentLoader* loader, unsig
> #endif
> 
>     String oldRequestURL = request.url().string();
>-    m_frame.loader().documentLoader()->didTellClientAboutLoad(request.url());
>+
>+    ASSERT(m_frame.loader().documentLoader());
>+    if (m_frame.loader().documentLoader())
>+        m_frame.loader().documentLoader()->didTellClientAboutLoad(request.url());
> 
>     // Notifying the FrameLoaderClient may cause the frame to be destroyed.
>     Ref<Frame> protect(m_frame);
>     m_frame.loader().client().dispatchWillSendRequest(loader, identifier, request, redirectResponse);
> 
>     // If the URL changed, then we want to put that new URL in the "did tell client" set too.
>-    if (!request.isNull() && oldRequestURL != request.url().string())
>+    if (!request.isNull() && oldRequestURL != request.url().string() && m_frame.loader().documentLoader())
>         m_frame.loader().documentLoader()->didTellClientAboutLoad(request.url());
> 
>     InspectorInstrumentation::willSendRequest(&m_frame, identifier, loader, request, redirectResponse);

Actions: View | Formatted Diff | Diff

Attachments on bug 199118: 372647