Changeset 94021 in webkit

Timestamp:

Aug 29, 2011, 3:41:45 PM (15 years ago)

Author:

Lucas Forschler

Message:

Merge r93717.

Location:

branches/safari-534.51-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/ImageLoader.cpp (modified) (1 diff)

branches/safari-534.51-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-29  Lucas Forschler  <lforschler@apple.com>
+
+    Merged 93717
+
+    2011-08-24  Sam Weinig  <sam@webkit.org>
+
+            JSHTMLImageElement (and associated Node) is abandoned when image load is canceled
+            <rdar://problem/9925630>
+            https://bugs.webkit.org/show_bug.cgi?id=66864
+
+            Reviewed by Anders Carlsson.
+
+            In the JSC bindings, we use HTMLImageElement::hasPendingActivity() (which in turn calls
+            HTMLImageLoader::haveFiredLoadEvent()) to reason about the liveness of JSHTMLImageElements.
+            In the case that an image load is canceled, the haveFiredLoadEvent never true, so the
+            JSHTMLImageElement is kept alive forever (and since it references the global object, it
+            keeps the entire graph alive as well).
+
+            * loader/ImageLoader.cpp:
+            (WebCore::ImageLoader::notifyFinished):
+            Set m_firedLoad to true in the case of a canceled load, to reset the state back to
+            its initial values.
+
 2011-08-24  Mark Rowe  <mrowe@apple.com>
 

branches/safari-534.51-branch/Source/WebCore/loader/ImageLoader.cpp

@@ -226 +226 @@
         return;
 
-    if (resource->wasCanceled())
-        return;
+    if (resource->wasCanceled()) {
+        m_firedLoad = true;
+        return;
+    }
 
     loadEventSender().dispatchEventSoon(this);