Title: [93793] trunk/Source/WebCore
Revision
93793
Author
[email protected]
Date
2011-08-25 09:50:35 -0700 (Thu, 25 Aug 2011)

Log Message

JSHTMLImageElement (and associated Node) is abandoned when image load is canceled via beforeload
<rdar://problem/9925630>
https://bugs.webkit.org/show_bug.cgi?id=66906

Reviewed by Darin Adler.

* loader/ImageLoader.cpp:
(WebCore::ImageLoader::dispatchPendingBeforeLoadEvent):
Very similar fix to the one in r93717 except this patches the case where the image load was
canceled via beforeload.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (93792 => 93793)


--- trunk/Source/WebCore/ChangeLog	2011-08-25 16:42:15 UTC (rev 93792)
+++ trunk/Source/WebCore/ChangeLog	2011-08-25 16:50:35 UTC (rev 93793)
@@ -1,3 +1,16 @@
+2011-08-25  Sam Weinig  <[email protected]>
+
+        JSHTMLImageElement (and associated Node) is abandoned when image load is canceled via beforeload
+        <rdar://problem/9925630>
+        https://bugs.webkit.org/show_bug.cgi?id=66906
+
+        Reviewed by Darin Adler.
+
+        * loader/ImageLoader.cpp:
+        (WebCore::ImageLoader::dispatchPendingBeforeLoadEvent):
+        Very similar fix to the one in r93717 except this patches the case where the image load was
+        canceled via beforeload.
+
 2011-08-25  John Bates  <[email protected]>
 
         [chromium] Leaking SkBitmaps for background images

Modified: trunk/Source/WebCore/loader/ImageLoader.cpp (93792 => 93793)


--- trunk/Source/WebCore/loader/ImageLoader.cpp	2011-08-25 16:42:15 UTC (rev 93792)
+++ trunk/Source/WebCore/loader/ImageLoader.cpp	2011-08-25 16:50:35 UTC (rev 93793)
@@ -297,7 +297,9 @@
         m_image->removeClient(this);
         m_image = 0;
     }
+
     loadEventSender().cancelEvent(this);
+    m_firedLoad = true;
     
     if (m_element->hasTagName(HTMLNames::objectTag))
         static_cast<HTMLObjectElement*>(m_element)->renderFallbackContent();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to