Title: [94022] branches/safari-534.51-branch/Source/WebCore
Diff
Modified: branches/safari-534.51-branch/Source/WebCore/ChangeLog (94021 => 94022)
--- branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-29 22:41:45 UTC (rev 94021)
+++ branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-29 22:43:38 UTC (rev 94022)
@@ -1,5 +1,22 @@
2011-08-29 Lucas Forschler <[email protected]>
+ Merged 93793
+
+ 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-29 Lucas Forschler <[email protected]>
+
Merged 93717
2011-08-24 Sam Weinig <[email protected]>
Modified: branches/safari-534.51-branch/Source/WebCore/loader/ImageLoader.cpp (94021 => 94022)
--- branches/safari-534.51-branch/Source/WebCore/loader/ImageLoader.cpp 2011-08-29 22:41:45 UTC (rev 94021)
+++ branches/safari-534.51-branch/Source/WebCore/loader/ImageLoader.cpp 2011-08-29 22:43:38 UTC (rev 94022)
@@ -288,7 +288,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
