Title: [117185] trunk/Source/WebCore
- Revision
- 117185
- Author
- [email protected]
- Date
- 2012-05-15 16:48:58 -0700 (Tue, 15 May 2012)
Log Message
ImageDocuments erroneously trigger beforeload events for the main resource
https://bugs.webkit.org/show_bug.cgi?id=86543
<rdar://problem/11309013>
Reviewed by Brady Eidson.
No new tests; testing framework doesn't allow for testing ImageDocuments with injected _javascript_.
* loader/ImageLoader.cpp:
(WebCore::ImageLoader::updateFromElement):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (117184 => 117185)
--- trunk/Source/WebCore/ChangeLog 2012-05-15 23:41:54 UTC (rev 117184)
+++ trunk/Source/WebCore/ChangeLog 2012-05-15 23:48:58 UTC (rev 117185)
@@ -1,3 +1,16 @@
+2012-05-15 Jeffrey Pfau <[email protected]>
+
+ ImageDocuments erroneously trigger beforeload events for the main resource
+ https://bugs.webkit.org/show_bug.cgi?id=86543
+ <rdar://problem/11309013>
+
+ Reviewed by Brady Eidson.
+
+ No new tests; testing framework doesn't allow for testing ImageDocuments with injected _javascript_.
+
+ * loader/ImageLoader.cpp:
+ (WebCore::ImageLoader::updateFromElement):
+
2012-05-15 Dirk Pranke <[email protected]>
[chromium] ScrollElasticityController.mm doesn't compile with the 10.6 SDK on mac
Modified: trunk/Source/WebCore/loader/ImageLoader.cpp (117184 => 117185)
--- trunk/Source/WebCore/loader/ImageLoader.cpp 2012-05-15 23:41:54 UTC (rev 117184)
+++ trunk/Source/WebCore/loader/ImageLoader.cpp 2012-05-15 23:48:58 UTC (rev 117185)
@@ -199,7 +199,7 @@
m_imageComplete = !newImage;
if (newImage) {
- if (!m_element->document()->hasListenerType(Document::BEFORELOAD_LISTENER))
+ if (!m_element->document()->hasListenerType(Document::BEFORELOAD_LISTENER) || m_element->document()->isImageDocument())
dispatchPendingBeforeLoadEvent();
else
beforeLoadEventSender().dispatchEventSoon(this);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
