Changeset 218502 in webkit

Timestamp:

Jun 19, 2017 1:12:41 PM (7 years ago)

Author:

beidson@apple.com

Message:

Cleanup IconLoader stuff when a DocumentLoader detaches from its frame.
<rdar://problem/31418761> and ​https://bugs.webkit.org/show_bug.cgi?id=173473

Reviewed by Alex Christensen.

No new tests (No known change in behavior)

I discovered the need to make these changes here due to a transient bug
introduced in r218015 but already explicitly fixed in r218409.

This change adds an assert to guard against a detached DocumentLoader having active IconLoaders.

It also clears out all pending IconLoader and icon load decisions when stopLoading() is called,
as even attempting to start an icon load after detachment is a waste of cycles.

• loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::stopLoading): Also explicitly clear all IconLoaders and icons pending

load decision.

(WebCore::DocumentLoader::finishedLoadingIcon): Assert that this DocumentLoader is not detached.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/DocumentLoader.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-06-19  Brady Eidson  <beidson@apple.com>
+
+        Cleanup IconLoader stuff when a DocumentLoader detaches from its frame.
+        <rdar://problem/31418761> and https://bugs.webkit.org/show_bug.cgi?id=173473
+
+        Reviewed by Alex Christensen.
+
+        No new tests (No known change in behavior)
+
+        I discovered the need to make these changes here due to a transient bug
+        introduced in r218015 but already explicitly fixed in r218409.
+        
+        This change adds an assert to guard against a detached DocumentLoader having active IconLoaders.
+
+        It also clears out all pending IconLoader and icon load decisions when stopLoading() is called, 
+        as even attempting to start an icon load after detachment is a waste of cycles.
+        
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::stopLoading): Also explicitly clear all IconLoaders and icons pending
+          load decision.
+        (WebCore::DocumentLoader::finishedLoadingIcon): Assert that this DocumentLoader is not detached.
+
 2017-06-19  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -283 +283 @@
     }
 
+    m_iconsPendingLoadDecision.clear();
+    m_iconLoaders.clear();
+
     // Always cancel multipart loaders
     cancelAll(m_multipartSubresourceLoaders);
@@ -1690 +1693 @@
 void DocumentLoader::finishedLoadingIcon(IconLoader& loader, SharedBuffer* buffer)
 {
+    // If the DocumentLoader has detached from its frame, all icon loads should have already been cancelled.
+    ASSERT(m_frame);
+
     auto loadIdentifier = m_iconLoaders.take(&loader);
     ASSERT(loadIdentifier);