Changeset 62664 in webkit

Timestamp:

Jul 7, 2010 7:37:21 AM (14 years ago)

Author:

aestes@apple.com

Message:

2010-07-07 Andy Estes <​aestes@apple.com>

Reviewed by Adam Barth.

Test that loading of images in <object> tags can be cancelled by
beforeload event handlers.
​https://bugs.webkit.org/show_bug.cgi?id=41027
<rdar://problem/8120596>

• fast/dom/beforeload/image-object-before-load-expected.txt: Added.
• fast/dom/beforeload/image-object-before-load-innerHTML-expected.txt: Added.
• fast/dom/beforeload/image-object-before-load-innerHTML.html: Added.
• fast/dom/beforeload/image-object-before-load.html: Added.

2010-07-07 Andy Estes <​aestes@apple.com>

Reviewed by Adam Barth.

Allow a beforeload listener to prevent loading of images in <object> tags.
​https://bugs.webkit.org/show_bug.cgi?id=41027
<rdar://problem/8120596>

Tests: fast/dom/beforeload/image-object-before-load-innerHTML.html

fast/dom/beforeload/image-object-before-load.html

• html/HTMLObjectElement.cpp: (WebCore::HTMLObjectElement::attach): Do not call RenderImage::setCachedImage() at the end of attach(). Instead, allow this to happen conditionally after beforeload is dispatched.
• loader/ImageLoader.cpp: (WebCore::ImageLoader::dispatchPendingBeforeLoadEvent): Render fallback content if an object's load was cancelled.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/beforeload/image-object-before-load-expected.txt (added)
• LayoutTests/fast/dom/beforeload/image-object-before-load-innerHTML-expected.txt (added)
• LayoutTests/fast/dom/beforeload/image-object-before-load-innerHTML.html (added)
• LayoutTests/fast/dom/beforeload/image-object-before-load.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/HTMLObjectElement.cpp (modified) (1 diff)
• WebCore/loader/ImageLoader.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-07-07  Andy Estes  <aestes@apple.com>
+
+        Reviewed by Adam Barth.
+
+        Test that loading of images in <object> tags can be cancelled by
+        beforeload event handlers.
+        https://bugs.webkit.org/show_bug.cgi?id=41027
+        <rdar://problem/8120596>
+
+        * fast/dom/beforeload/image-object-before-load-expected.txt: Added.
+        * fast/dom/beforeload/image-object-before-load-innerHTML-expected.txt: Added.
+        * fast/dom/beforeload/image-object-before-load-innerHTML.html: Added.
+        * fast/dom/beforeload/image-object-before-load.html: Added.
+
 2010-07-06  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-07  Andy Estes  <aestes@apple.com>
+
+        Reviewed by Adam Barth.
+
+        Allow a beforeload listener to prevent loading of images in <object> tags.
+        https://bugs.webkit.org/show_bug.cgi?id=41027
+        <rdar://problem/8120596>
+
+        Tests: fast/dom/beforeload/image-object-before-load-innerHTML.html
+               fast/dom/beforeload/image-object-before-load.html
+
+        * html/HTMLObjectElement.cpp:
+        (WebCore::HTMLObjectElement::attach): Do not call
+        RenderImage::setCachedImage() at the end of attach(). Instead, allow
+        this to happen conditionally after beforeload is dispatched.
+        * loader/ImageLoader.cpp:
+        (WebCore::ImageLoader::dispatchPendingBeforeLoadEvent): Render fallback
+        content if an object's load was cancelled.
+
 2010-07-06  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/WebCore/html/HTMLObjectElement.cpp

@@ -155 +155 @@
             m_imageLoader.set(new HTMLImageLoader(this));
         m_imageLoader->updateFromElement();
-        // updateForElement() may have changed us to use fallback content and called detach() and attach().
-        if (m_useFallbackContent)
-            return;
-
-        if (renderer())
-            toRenderImage(renderer())->setCachedImage(m_imageLoader->image());
     }
 }

trunk/WebCore/loader/ImageLoader.cpp

@@ -28 +28 @@
 #include "Document.h"
 #include "Element.h"
+#include "HTMLNames.h"
+#include "HTMLObjectElement.h"
 #include "RenderImage.h"
 
@@ -256 +258 @@
     }
     loadEventSender().cancelEvent(this);
+    
+    if (m_element->hasTagName(HTMLNames::objectTag))
+        static_cast<HTMLObjectElement*>(m_element)->renderFallbackContent();
 }