Changeset 94022 in webkit

Timestamp:

Aug 29, 2011, 3:43:38 PM (15 years ago)

Author:

Lucas Forschler

Message:

Merge r93793.

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 93793
+
+    2011-08-25  Sam Weinig  <sam@webkit.org>
+
+            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  <lforschler@apple.com>
 

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

@@ -289 +289 @@
         m_image = 0;
     }
+
     loadEventSender().cancelEvent(this);
+    m_firedLoad = true;
     
     if (m_element->hasTagName(HTMLNames::objectTag))