<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[160920] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/160920">160920</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2013-12-20 12:49:23 -0800 (Fri, 20 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInImageElementcpp">trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInImageElementh">trunk/Source/WebCore/html/HTMLPlugInImageElement.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160919 => 160920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-20 20:19:59 UTC (rev 160919)
+++ trunk/Source/WebCore/ChangeLog 2013-12-20 20:49:23 UTC (rev 160920)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2013-12-20 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><ins>+ 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>
+
</ins><span class="cx"> Crashes in AccessibilityRenderObject::computeAccessibilityIsIgnored()
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126073
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp (160919 => 160920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2013-12-20 20:19:59 UTC (rev 160919)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2013-12-20 20:49:23 UTC (rev 160920)
</span><span class="lines">@@ -252,9 +252,9 @@
</span><span class="cx"> }
</span><span class="cx"> if (!renderer() || useFallbackContent())
</span><span class="cx"> return;
</span><del>- if (!m_imageLoader)
- m_imageLoader = adoptPtr(new HTMLImageLoader(this));
- m_imageLoader->updateFromElement();
</del><ins>+
+ // Image load might complete synchronously and cause us to re-enter attach.
+ queuePostAttachCallback(&HTMLPlugInImageElement::startLoadingImageCallback, this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLPlugInImageElement::willDetachRenderers()
</span><span class="lines">@@ -334,11 +334,23 @@
</span><span class="cx"> return m_customStyleForPageCache;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLPlugInImageElement::updateWidgetCallback(Node* n, unsigned)
</del><ins>+void HTMLPlugInImageElement::updateWidgetCallback(Node* node, unsigned)
</ins><span class="cx"> {
</span><del>- toHTMLPlugInImageElement(n)->updateWidgetIfNecessary();
</del><ins>+ toHTMLPlugInImageElement(node)->updateWidgetIfNecessary();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void HTMLPlugInImageElement::startLoadingImage()
+{
+ if (!m_imageLoader)
+ m_imageLoader = adoptPtr(new HTMLImageLoader(this));
+ m_imageLoader->updateFromElement();
+}
+
+void HTMLPlugInImageElement::startLoadingImageCallback(Node* node, unsigned)
+{
+ toHTMLPlugInImageElement(node)->startLoadingImage();
+}
+
</ins><span class="cx"> void HTMLPlugInImageElement::updateSnapshot(PassRefPtr<Image> image)
</span><span class="cx"> {
</span><span class="cx"> if (displayState() > DisplayingSnapshot)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInImageElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.h (160919 => 160920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInImageElement.h 2013-12-20 20:19:59 UTC (rev 160919)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.h 2013-12-20 20:49:23 UTC (rev 160920)
</span><span class="lines">@@ -113,7 +113,9 @@
</span><span class="cx"> String m_url;
</span><span class="cx"> URL m_loadedUrl;
</span><span class="cx">
</span><del>- static void updateWidgetCallback(Node*, unsigned = 0);
</del><ins>+ static void updateWidgetCallback(Node*, unsigned);
+ static void startLoadingImageCallback(Node*, unsigned);
+
</ins><span class="cx"> virtual void didAttachRenderers() OVERRIDE;
</span><span class="cx"> virtual void willDetachRenderers() OVERRIDE;
</span><span class="cx">
</span><span class="lines">@@ -139,6 +141,7 @@
</span><span class="cx"> virtual void finishParsingChildren() OVERRIDE;
</span><span class="cx">
</span><span class="cx"> void updateWidgetIfNecessary();
</span><ins>+ void startLoadingImage();
</ins><span class="cx">
</span><span class="cx"> virtual void updateSnapshot(PassRefPtr<Image>) OVERRIDE;
</span><span class="cx"> virtual void dispatchPendingMouseClick() OVERRIDE;
</span></span></pre>
</div>
</div>
</body>
</html>