Changeset 138724 in webkit

Timestamp:

Jan 3, 2013 11:52:26 AM (11 years ago)

Author:

adamk@chromium.org

Message:

Clear failed image loads when an <img> is adopted into a different document
​https://bugs.webkit.org/show_bug.cgi?id=104409

Reviewed by Nate Chapin.

Source/WebCore:

This avoids an assertion failure setImageWithoutConsideringPendingLoadEvent().

Test: loader/image-loader-adoptNode-assert.html

• loader/ImageLoader.cpp:

(WebCore::ImageLoader::updateFromElement): Use new helper.
(WebCore::ImageLoader::updateFromElementIgnoringPreviousError): ditto
(WebCore::ImageLoader::elementDidMoveToNewDocument): ditto
(WebCore::ImageLoader::clearFailedLoadURL): Added a helper method to self-document the code.
(WebCore):

• loader/ImageLoader.h:

(ImageLoader):

LayoutTests:

• loader/image-loader-adoptNode-assert-expected.txt: Added.
• loader/image-loader-adoptNode-assert.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/loader/image-loader-adoptNode-assert-expected.txt (added)
• LayoutTests/loader/image-loader-adoptNode-assert.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/ImageLoader.cpp (modified) (3 diffs)
• Source/WebCore/loader/ImageLoader.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-03  Adam Klein  <adamk@chromium.org>
+
+        Clear failed image loads when an <img> is adopted into a different document
+        https://bugs.webkit.org/show_bug.cgi?id=104409
+
+        Reviewed by Nate Chapin.
+
+        * loader/image-loader-adoptNode-assert-expected.txt: Added.
+        * loader/image-loader-adoptNode-assert.html: Added.
+
 2013-01-03  Vincent Scheib  <scheib@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-03  Adam Klein  <adamk@chromium.org>
+
+        Clear failed image loads when an <img> is adopted into a different document
+        https://bugs.webkit.org/show_bug.cgi?id=104409
+
+        Reviewed by Nate Chapin.
+
+        This avoids an assertion failure setImageWithoutConsideringPendingLoadEvent().
+
+        Test: loader/image-loader-adoptNode-assert.html
+
+        * loader/ImageLoader.cpp:
+        (WebCore::ImageLoader::updateFromElement): Use new helper.
+        (WebCore::ImageLoader::updateFromElementIgnoringPreviousError): ditto
+        (WebCore::ImageLoader::elementDidMoveToNewDocument): ditto
+        (WebCore::ImageLoader::clearFailedLoadURL): Added a helper method to self-document the code.
+        (WebCore):
+        * loader/ImageLoader.h:
+        (ImageLoader):
+
 2013-01-03  Vincent Scheib  <scheib@chromium.org>
 

trunk/Source/WebCore/loader/ImageLoader.cpp

@@ -215 +215 @@
             errorEventSender().dispatchEventSoon(this);
         } else
-            m_failedLoadURL = AtomicString();
+            clearFailedLoadURL();
     } else if (!attr.isNull()) {
         // Fire an error event if the url is empty.
@@ -264 +264 @@
 void ImageLoader::updateFromElementIgnoringPreviousError()
 {
-    // Clear previous error.
-    m_failedLoadURL = AtomicString();
+    clearFailedLoadURL();
     updateFromElement();
 }
@@ -453 +452 @@
 void ImageLoader::elementDidMoveToNewDocument()
 {
+    clearFailedLoadURL();
     setImage(0);
 }
 
-}
+inline void ImageLoader::clearFailedLoadURL()
+{
+    m_failedLoadURL = AtomicString();
+}
+
+}

trunk/Source/WebCore/loader/ImageLoader.h

@@ -93 +93 @@
 
     void setImageWithoutConsideringPendingLoadEvent(CachedImage*);
+    void clearFailedLoadURL();
 
     ImageLoaderClient* m_client;