Changeset 125727 in webkit

Timestamp:

Aug 15, 2012, 5:43:01 PM (14 years ago)

Author:

hayato@chromium.org

Message:

A 'load' event should be fired on the shadow host directly, not on an inner image element of shadow dom subtree.
​https://bugs.webkit.org/show_bug.cgi?id=93920

Reviewed by Dimitri Glazkov.

Source/WebCore:

A 'load' event is a must-stoppable event at shadow boundary. So we
should fire a 'load' event on a shadow host directly, not on an
inner image element.

Test: fast/dom/shadow/shadowdom-for-image-event.html

• html/HTMLImageLoader.cpp:

(WebCore::HTMLImageLoader::dispatchLoadEvent):

• loader/ImageLoaderClient.h:

(WebCore::ImageLoaderClient::eventTarget):

LayoutTests:

• fast/dom/shadow/shadowdom-for-image-event-expected.txt: Added.
• fast/dom/shadow/shadowdom-for-image-event.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/shadow/shadowdom-for-image-event-expected.txt (added)
• LayoutTests/fast/dom/shadow/shadowdom-for-image-event.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLImageLoader.cpp (modified) (1 diff)
• Source/WebCore/loader/ImageLoaderClient.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-08-15  Hayato Ito  <hayato@chromium.org>
+
+        A 'load' event should be fired on the shadow host directly, not on an inner image element of shadow dom subtree.
+        https://bugs.webkit.org/show_bug.cgi?id=93920
+
+        Reviewed by Dimitri Glazkov.
+
+        * fast/dom/shadow/shadowdom-for-image-event-expected.txt: Added.
+        * fast/dom/shadow/shadowdom-for-image-event.html: Added.
+
 2012-08-15  Lauro Neto  <lauro.neto@openbossa.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-15  Hayato Ito  <hayato@chromium.org>
+
+        A 'load' event should be fired on the shadow host directly, not on an inner image element of shadow dom subtree.
+        https://bugs.webkit.org/show_bug.cgi?id=93920
+
+        Reviewed by Dimitri Glazkov.
+
+        A 'load' event is a must-stoppable event at shadow boundary. So we
+        should fire a 'load' event on a shadow host directly, not on an
+        inner image element.
+
+        Test: fast/dom/shadow/shadowdom-for-image-event.html
+
+        * html/HTMLImageLoader.cpp:
+        (WebCore::HTMLImageLoader::dispatchLoadEvent):
+        * loader/ImageLoaderClient.h:
+        (WebCore::ImageLoaderClient::eventTarget):
+
 2012-08-15  Otto Derek Cheung  <otcheung@rim.com>
 

trunk/Source/WebCore/html/HTMLImageLoader.cpp

@@ -57 +57 @@
     if (!errorOccurred && image()->response().httpStatusCode() >= 400)
         errorOccurred = client()->sourceElement()->hasTagName(HTMLNames::objectTag); // An <object> considers a 404 to be an error and should fire onerror.
-    client()->imageElement()->dispatchEvent(Event::create(errorOccurred ? eventNames().errorEvent : eventNames().loadEvent, false, false));
+    client()->eventTarget()->dispatchEvent(Event::create(errorOccurred ? eventNames().errorEvent : eventNames().loadEvent, false, false));
 }
 

trunk/Source/WebCore/loader/ImageLoaderClient.h

@@ -43 +43 @@
     virtual Element* sourceElement() = 0;
     virtual Element* imageElement() = 0;
+    Element* eventTarget() { return sourceElement(); }
 
     virtual void refSourceElement() = 0;