Attachment 343402 Details for Bug 185124 – Patch

[patch] Patch

bug-185124-20180622173243.patch (text/plain), 2.65 KB, created by Woodrow Wang on 2018-06-22 17:32:44 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Woodrow Wang

Created: 2018-06-22 17:32:44 PDT

Size: 2.65 KB

patch

obsolete

>Subversion Revision: 233096
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 1254ddaec5fbd097498b7c424a1c2c6a92e9f151..a3ea5f3b11a0894a5f23266ea56fe0194d4dc36b 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,24 @@
>+2018-06-22  Woodrow Wang  <woodrow_wang@apple.com>
>+
>+        SubresourceLoader::didFail() should only log message if state is Initialized
>+        https://bugs.webkit.org/show_bug.cgi?id=185124
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Functionality does not change. Moved console logging to be 
>+        after checking state of subresource loader. We only need to 
>+        log if the state is initialized. This is consistent with other
>+        functions in file. We can also remove a null check for the 
>+        frame pointer (m_frame). The superclass ResourceLoader constructor
>+        takes an lvalue reference and initializes m_frame, ensuring
>+        m_frame cannot be null. It is only set to null by 
>+        ResourceLoader::releaseResources(), which is only called after the 
>+        resource finishes loading or fails to load. Thus, in didFail(), 
>+        m_frame must be non-null when we're logging and up until the end of the function.  
>+
>+        * loader/SubresourceLoader.cpp:
>+        (WebCore::SubresourceLoader::didFail):
>+
> 2018-06-22  Timothy Hatcher  <timothy@apple.com>
> 
>         Recalc styles every time defaultAppearance changes.
>diff --git a/Source/WebCore/loader/SubresourceLoader.cpp b/Source/WebCore/loader/SubresourceLoader.cpp
>index a4a15d81fbc520901a75cc2ef103334c4435b2c0..b035d0b08a0630e7d170f973d15fd46a51278100 100644
>--- a/Source/WebCore/loader/SubresourceLoader.cpp
>+++ b/Source/WebCore/loader/SubresourceLoader.cpp
>@@ -648,8 +648,6 @@ void SubresourceLoader::didFinishLoading(const NetworkLoadMetrics& networkLoadMe
> 
> void SubresourceLoader::didFail(const ResourceError& error)
> {
>-    if (m_frame && m_frame->document() && error.isAccessControl())
>-        m_frame->document()->addConsoleMessage(MessageSource::Security, MessageLevel::Error, error.localizedDescription());
> 
> #if USE(QUICK_LOOK)
>     if (auto previewLoader = m_previewLoader.get())
>@@ -660,6 +658,9 @@ void SubresourceLoader::didFail(const ResourceError& error)
>         return;
>     ASSERT(!reachedTerminalState());
>     LOG(ResourceLoading, "Failed to load '%s'.\n", m_resource->url().string().latin1().data());
>+    if (m_frame->document() && error.isAccessControl())
>+        m_frame->document()->addConsoleMessage(MessageSource::Security, MessageLevel::Error, error.localizedDescription());
>+
> 
>     Ref<SubresourceLoader> protectedThis(*this);
>     CachedResourceHandle<CachedResource> protectResource(m_resource);

Actions: View | Formatted Diff | Diff

Attachments on bug 185124: 343369 | 343402 | 343403