Changeset 139343 in webkit

Timestamp:

Jan 10, 2013 11:22:11 AM (11 years ago)

Author:

Nate Chapin

Message:

REGRESSION(r138222): WebDocumentLoaderMac-related leaks seen on Leaks bot
​https://bugs.webkit.org/show_bug.cgi?id=106137

Reviewed by Brady Eidson.

Tested manually by comparing before and after leaks output for WK1-mac.

• loader/MainResourceLoader.cpp:

(WebCore::MainResourceLoader::receivedError): Call dispatchDidFailLoading() if

a SubstituteData load fails or is cancelled. Without this call, load counts
are not balanced on WebDocumentLoaderMac and it is retained forever.

(WebCore::MainResourceLoader::didFinishLoading):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-10  Nate Chapin  <japhet@chromium.org>
+
+        REGRESSION(r138222): WebDocumentLoaderMac-related leaks seen on Leaks bot
+        https://bugs.webkit.org/show_bug.cgi?id=106137
+
+        Reviewed by Brady Eidson.
+
+        Tested manually by comparing before and after leaks output for WK1-mac.
+
+        * loader/MainResourceLoader.cpp:
+        (WebCore::MainResourceLoader::receivedError): Call dispatchDidFailLoading() if
+            a SubstituteData load fails or is cancelled. Without this call, load counts
+            are not balanced on WebDocumentLoaderMac and it is retained forever.
+        (WebCore::MainResourceLoader::didFinishLoading):
+
 2013-01-10  Robert Kroeger  <rjkroege@chromium.org>
 

trunk/Source/WebCore/loader/MainResourceLoader.cpp

@@ -100 +100 @@
     RefPtr<Frame> protectFrame(m_documentLoader->frame());
 
+    if (m_substituteDataLoadIdentifier) {
+        ASSERT(!loader());
+        frameLoader()->client()->dispatchDidFailLoading(documentLoader(), m_substituteDataLoadIdentifier, error);
+    }
+
     // It is important that we call DocumentLoader::mainReceivedError before calling 
     // ResourceLoadNotifier::didFailToLoad because mainReceivedError clears out the relevant
@@ -536 +541 @@
     RefPtr<DocumentLoader> dl = documentLoader();
 
-    if (!loader())
+    if (!loader()) {
         frameLoader()->notifier()->dispatchDidFinishLoading(documentLoader(), identifier(), finishTime);
+        m_substituteDataLoadIdentifier = 0;
+    }
 
 #if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080