Changeset 160920 in webkit

Timestamp:

Dec 20, 2013, 12:49:23 PM (11 years ago)

Author:

Antti Koivisto

Message:

http/tests/misc/object-image-error.html asserts
​https://bugs.webkit.org/show_bug.cgi?id=126074

Reviewed by Andreas Kling.

• html/HTMLPlugInImageElement.cpp:

(WebCore::HTMLPlugInImageElement::didAttachRenderers):
(WebCore::HTMLPlugInImageElement::updateWidgetCallback):
(WebCore::HTMLPlugInImageElement::startLoadingImage):
(WebCore::HTMLPlugInImageElement::startLoadingImageCallback):

• html/HTMLPlugInImageElement.h:

Start image load from post-attach so we don't re-enter attach when image load fails synchronously.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLPlugInImageElement.cpp (modified) (2 diffs)
• html/HTMLPlugInImageElement.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-12-20  Antti Koivisto  <antti@apple.com>
+
+        http/tests/misc/object-image-error.html asserts
+        https://bugs.webkit.org/show_bug.cgi?id=126074
+
+        Reviewed by Andreas Kling.
+
+        * html/HTMLPlugInImageElement.cpp:
+        (WebCore::HTMLPlugInImageElement::didAttachRenderers):
+        (WebCore::HTMLPlugInImageElement::updateWidgetCallback):
+        (WebCore::HTMLPlugInImageElement::startLoadingImage):
+        (WebCore::HTMLPlugInImageElement::startLoadingImageCallback):
+        * html/HTMLPlugInImageElement.h:
+        
+            Start image load from post-attach so we don't re-enter attach when image load fails synchronously.
+
 2013-12-20  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp

@@ -253 +253 @@
     if (!renderer() || useFallbackContent())
         return;
-    if (!m_imageLoader)
-        m_imageLoader = adoptPtr(new HTMLImageLoader(this));
-    m_imageLoader->updateFromElement();
+
+    // Image load might complete synchronously and cause us to re-enter attach.
+    queuePostAttachCallback(&HTMLPlugInImageElement::startLoadingImageCallback, this);
 }
 
@@ -335 +335 @@
 }
 
-void HTMLPlugInImageElement::updateWidgetCallback(Node* n, unsigned)
-{
-    toHTMLPlugInImageElement(n)->updateWidgetIfNecessary();
+void HTMLPlugInImageElement::updateWidgetCallback(Node* node, unsigned)
+{
+    toHTMLPlugInImageElement(node)->updateWidgetIfNecessary();
+}
+
+void HTMLPlugInImageElement::startLoadingImage()
+{
+    if (!m_imageLoader)
+        m_imageLoader = adoptPtr(new HTMLImageLoader(this));
+    m_imageLoader->updateFromElement();
+}
+
+void HTMLPlugInImageElement::startLoadingImageCallback(Node* node, unsigned)
+{
+    toHTMLPlugInImageElement(node)->startLoadingImage();
 }
 

trunk/Source/WebCore/html/HTMLPlugInImageElement.h

@@ -114 +114 @@
     URL m_loadedUrl;
 
-    static void updateWidgetCallback(Node*, unsigned = 0);
+    static void updateWidgetCallback(Node*, unsigned);
+    static void startLoadingImageCallback(Node*, unsigned);
+
     virtual void didAttachRenderers() OVERRIDE;
     virtual void willDetachRenderers() OVERRIDE;
@@ -140 +142 @@
 
     void updateWidgetIfNecessary();
+    void startLoadingImage();
 
     virtual void updateSnapshot(PassRefPtr<Image>) OVERRIDE;