<!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>[181168] trunk</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/181168">181168</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-06 10:44:33 -0800 (Fri, 06 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Setting any of the <object> element plugin controlling attributes does not have any affect.
https://bugs.webkit.org/show_bug.cgi?id=141936.
Patch by Said Abou-Hallawa <sabouhallawa@apple.com> on 2015-03-06
Reviewed by Simon Fraser.
Source/WebCore:
When setting any of the <object> element plugin controlling attributes
dynamically we need to mark the the element to be dirty by calling
setNeedsStyleRecalc(), so it has to recreate its renderer when needed.
Tests: fast/css/image-object-hover-inherit.html
svg/as-object/svg-in-object-dynamic-attribute-change.html
* dom/Element.h: Delete unimplemented function.
* html/HTMLObjectElement.cpp:
(WebCore::HTMLObjectElement::parseAttribute): Mark the element dirty by
calling setNeedsStyleRecalc() when one of the plugin controlling attributes
gets changed. We have to clear m_useFallbackContent because the attribute's
new value might fix the object rendering.
* html/HTMLObjectElement.h: Add a function to clear m_useFallbackContent.
LayoutTests:
* fast/css/image-object-hover-inherit-expected.html: Added.
* fast/css/image-object-hover-inherit.html: Added.
A guarding test to catch the case of reconstructing the image <object>
renderer while performing a synchronous resolveTree() followed by page
rendering or dump render tree.
* svg/as-object/resources/lime100x100.html: Added.
* svg/as-object/resources/lime100x100.png: Added.
* svg/as-object/resources/lime100x100.svg: Added.
* svg/as-object/resources/red100x100.svg: Added.
* svg/as-object/svg-in-object-dynamic-attribute-change-expected.html: Added.
* svg/as-object/svg-in-object-dynamic-attribute-change.html: Added.
Ensure that changing the 'type' and the 'data' attributes of the <object>
element will have the expected outcome. Also make sure that the <object>
element renderer falls back correctly when setting any of the attributes
to some unexpected value.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomElementh">trunk/Source/WebCore/dom/Element.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLObjectElementcpp">trunk/Source/WebCore/html/HTMLObjectElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLObjectElementh">trunk/Source/WebCore/html/HTMLObjectElement.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssimageobjecthoverinheritexpectedhtml">trunk/LayoutTests/fast/css/image-object-hover-inherit-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcssimageobjecthoverinherithtml">trunk/LayoutTests/fast/css/image-object-hover-inherit.html</a></li>
<li><a href="#trunkLayoutTestssvgasobjectresourceslime100x100html">trunk/LayoutTests/svg/as-object/resources/lime100x100.html</a></li>
<li><a href="#trunkLayoutTestssvgasobjectresourceslime100x100png">trunk/LayoutTests/svg/as-object/resources/lime100x100.png</a></li>
<li><a href="#trunkLayoutTestssvgasobjectresourceslime100x100svg">trunk/LayoutTests/svg/as-object/resources/lime100x100.svg</a></li>
<li><a href="#trunkLayoutTestssvgasobjectresourcesred100x100svg">trunk/LayoutTests/svg/as-object/resources/red100x100.svg</a></li>
<li><a href="#trunkLayoutTestssvgasobjectsvginobjectdynamicattributechangeexpectedhtml">trunk/LayoutTests/svg/as-object/svg-in-object-dynamic-attribute-change-expected.html</a></li>
<li><a href="#trunkLayoutTestssvgasobjectsvginobjectdynamicattributechangehtml">trunk/LayoutTests/svg/as-object/svg-in-object-dynamic-attribute-change.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (181167 => 181168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-03-06 18:21:36 UTC (rev 181167)
+++ trunk/LayoutTests/ChangeLog 2015-03-06 18:44:33 UTC (rev 181168)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-03-06 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ Setting any of the <object> element plugin controlling attributes does not have any affect.
+ https://bugs.webkit.org/show_bug.cgi?id=141936.
+
+ Reviewed by Simon Fraser.
+
+ * fast/css/image-object-hover-inherit-expected.html: Added.
+ * fast/css/image-object-hover-inherit.html: Added.
+ A guarding test to catch the case of reconstructing the image <object>
+ renderer while performing a synchronous resolveTree() followed by page
+ rendering or dump render tree.
+
+ * svg/as-object/resources/lime100x100.html: Added.
+ * svg/as-object/resources/lime100x100.png: Added.
+ * svg/as-object/resources/lime100x100.svg: Added.
+ * svg/as-object/resources/red100x100.svg: Added.
+ * svg/as-object/svg-in-object-dynamic-attribute-change-expected.html: Added.
+ * svg/as-object/svg-in-object-dynamic-attribute-change.html: Added.
+ Ensure that changing the 'type' and the 'data' attributes of the <object>
+ element will have the expected outcome. Also make sure that the <object>
+ element renderer falls back correctly when setting any of the attributes
+ to some unexpected value.
+
</ins><span class="cx"> 2015-03-06 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Test horiz-origin-x and horiz-origin-y in SVG fonts
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssimageobjecthoverinheritexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/image-object-hover-inherit-expected.html (0 => 181168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/image-object-hover-inherit-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/image-object-hover-inherit-expected.html 2015-03-06 18:44:33 UTC (rev 181168)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<!DOCTYPE HTML>
+<html>
+<head>
+ <style>
+ div {
+ width: 100px;
+ height: 100px;
+ background-color:lime;
+ }
+ </style>
+</head>
+<body>
+ <div></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssimageobjecthoverinherithtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/image-object-hover-inherit.html (0 => 181168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/image-object-hover-inherit.html (rev 0)
+++ trunk/LayoutTests/fast/css/image-object-hover-inherit.html 2015-03-06 18:44:33 UTC (rev 181168)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+<!DOCTYPE HTML>
+<html>
+<head>
+ <style>
+ div {
+ width: 100px;
+ height: 100px;
+ background-color:red;
+ }
+ div:hover {
+ border-bottom-color: inherit;
+ }
+ </style>
+</head>
+<body>
+ <div>
+ <object id="image" data="data:image/png;base64,
+ iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAAAXNSR0IArs4c6QAAAARnQU1BAACx
+ jwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAABh0RVh0
+ U29mdHdhcmUAUGFpbnQuTkVUIHYzLjA4ZXKc4QAAAeNJREFUeF7t0sERgDAQw0DSf9FAqvA+lBRw
+ Gsnnef/fgwzcIH3HQDEwAxiOs9QVSUEwAxjOapfO3YJgBjAcZ6krkoJgBjCc1S6duwXBDGA4zlJX
+ JAXBDGA4q106dwuCGcBwnKWuSAqCGcBwVrt07hYEM4DhOEtdkRQEM4DhrHbp3C0IZgDDcZa6IikI
+ ZgDDWe3SuVsQzACG4yx1RVIQzACGs9qlc7cgmAEMx1nqiqQgmAEMZ7VL525BMAMYjrPUFUlBMAMY
+ zmqXzt2CYAYwHGepK5KCYAYwnNUunbsFwQxgOM5SVyQFwQxgOKtdOncLghnAcJylrkgKghnAcFa7
+ dO4WBDOA4ThLXZEUBDOA4ax26dwtCGYAw3GWuiIpCGYAw1nt0rlbEMwAhuMsdUVSEMwAhrPapXO3
+ IJgBDMdZ6oqkIJgBDGe1S+duQTADGI6z1BVJQTADGM5ql87dgmAGMBxnqSuSgmAGMJzVLp27BcEM
+ YDjOUlckBcEMYDirXTp3C4IZwHCcpa5ICoIZwHBWu3TuFgQzgOE4S12RFAQzgOGsduncLQhmAMNx
+ lroiKQhmAMNZ7dK5WxDMAIbjLHVFUhDMAIaz2qVztyCYAQzHWeqKpCCYAQxntUvnbkEwAxiOs9QR
+ yQemSBErQhZ+LAAAAABJRU5ErkJggg==">
+ </object>
+ </div>
+ <script>
+ window.onload = function() {
+ if (window.eventSender) {
+ image = document.getElementById('image');
+ window.eventSender.mouseMoveTo(image.offsetLeft + 10, image.offsetTop + 10);
+ }
+ }
+ </script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestssvgasobjectresourceslime100x100html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/as-object/resources/lime100x100.html (0 => 181168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/as-object/resources/lime100x100.html (rev 0)
+++ trunk/LayoutTests/svg/as-object/resources/lime100x100.html 2015-03-06 18:44:33 UTC (rev 181168)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <style>
+ html, body {
+ margin: 0 0 0 0;
+ overflow:hidden;
+ }
+ </style>
+</head>
+<body>
+ <img src="lime100x100.svg">
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestssvgasobjectresourceslime100x100png"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/svg/as-object/resources/lime100x100.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/svg/as-object/resources/lime100x100.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestssvgasobjectresourceslime100x100svg"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/as-object/resources/lime100x100.svg (0 => 181168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/as-object/resources/lime100x100.svg (rev 0)
+++ trunk/LayoutTests/svg/as-object/resources/lime100x100.svg 2015-03-06 18:44:33 UTC (rev 181168)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+<svg xmlns='http://www.w3.org/2000/svg' width='100' height='100'>
+ <rect width='100%' height='100%' fill='lime'/>
+</svg>
</ins></span></pre></div>
<a id="trunkLayoutTestssvgasobjectresourcesred100x100svg"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/as-object/resources/red100x100.svg (0 => 181168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/as-object/resources/red100x100.svg (rev 0)
+++ trunk/LayoutTests/svg/as-object/resources/red100x100.svg 2015-03-06 18:44:33 UTC (rev 181168)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+<svg xmlns='http://www.w3.org/2000/svg' width='100' height='100'>
+ <rect width='100%' height='100%' fill='red'/>
+</svg>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestssvgasobjectsvginobjectdynamicattributechangeexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/as-object/svg-in-object-dynamic-attribute-change-expected.html (0 => 181168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/as-object/svg-in-object-dynamic-attribute-change-expected.html (rev 0)
+++ trunk/LayoutTests/svg/as-object/svg-in-object-dynamic-attribute-change-expected.html 2015-03-06 18:44:33 UTC (rev 181168)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <style>
+ div {
+ width: 100px;
+ height: 100px;
+ background-color: lime;
+ display: inline-block;
+ }
+ </style>
+</head>
+<body>
+ <div></div>
+ <div></div>
+ <div></div>
+ <div></div>
+ <div></div>
+ <div></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestssvgasobjectsvginobjectdynamicattributechangehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/as-object/svg-in-object-dynamic-attribute-change.html (0 => 181168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/as-object/svg-in-object-dynamic-attribute-change.html (rev 0)
+++ trunk/LayoutTests/svg/as-object/svg-in-object-dynamic-attribute-change.html 2015-03-06 18:44:33 UTC (rev 181168)
</span><span class="lines">@@ -0,0 +1,70 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+ <object id="object1" data="resources/lime100x100.svg">
+ <img src="resources/red100x100.svg">
+ </object>
+ <object id="object2" type="image/svg+xml" data="resources/red100x100.svg">
+ <img src="resources/red100x100.svg">
+ </object>
+ <object width="100px" height="100px" id="object3">
+ <img src="resources/red100x100.svg">
+ </object>
+ <object id="object4" type="dummy">
+ <img src="resources/red100x100.svg">
+ </object>
+ <object id="object5" type="dummy">
+ <img src="resources/red100x100.svg">
+ </object>
+ <object id="object6" type="image/svg+xml" data="resources/red100x100.svg">
+ <img src="resources/lime100x100.svg">
+ </object>
+ <script>
+ function onObjectLoad() {
+ if (!window.testRunner)
+ return;
+
+ if (typeof onObjectLoad.counter == 'undefined')
+ onObjectLoad.counter = 0;
+
+ if (++onObjectLoad.counter == 4)
+ testRunner.notifyDone();
+ }
+
+ window.addEventListener("load", function() {
+ if (window.testRunner)
+ testRunner.waitUntilDone();
+
+ // change the 'type' attribute
+ var object1 = document.getElementById("object1");
+ object1.setAttribute("type", "image/svg+xml");
+
+ // change the 'data' attribute
+ var object2 = document.getElementById("object2");
+ object2.onload = onObjectLoad;
+ object2.setAttribute("data", "resources/lime100x100.svg");
+
+ // change the 'data' attribute
+ var object3 = document.getElementById("object3");
+ object3.onload = onObjectLoad;
+ object3.setAttribute("data", "resources/lime100x100.html");
+
+ // change the 'type' then the 'data' attributes of an image object
+ var object4 = document.getElementById("object4");
+ object4.onload = onObjectLoad;
+ object4.setAttribute("type", "image/png");
+ object4.setAttribute("data", "resources/lime100x100.png");
+
+ // change the 'data' then the 'type' attributes of an image object
+ var object5 = document.getElementById("object5");
+ object5.onload = onObjectLoad;
+ object5.setAttribute("data", "resources/lime100x100.png");
+ object5.setAttribute("type", "image/png");
+
+ // object rederer fallback
+ var object6 = document.getElementById("object6");
+ object6.setAttribute("type", "dummy");
+ });
+ </script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181167 => 181168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-06 18:21:36 UTC (rev 181167)
+++ trunk/Source/WebCore/ChangeLog 2015-03-06 18:44:33 UTC (rev 181168)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-03-06 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ Setting any of the <object> element plugin controlling attributes does not have any affect.
+ https://bugs.webkit.org/show_bug.cgi?id=141936.
+
+ Reviewed by Simon Fraser.
+
+ When setting any of the <object> element plugin controlling attributes
+ dynamically we need to mark the the element to be dirty by calling
+ setNeedsStyleRecalc(), so it has to recreate its renderer when needed.
+
+ Tests: fast/css/image-object-hover-inherit.html
+ svg/as-object/svg-in-object-dynamic-attribute-change.html
+
+ * dom/Element.h: Delete unimplemented function.
+
+ * html/HTMLObjectElement.cpp:
+ (WebCore::HTMLObjectElement::parseAttribute): Mark the element dirty by
+ calling setNeedsStyleRecalc() when one of the plugin controlling attributes
+ gets changed. We have to clear m_useFallbackContent because the attribute's
+ new value might fix the object rendering.
+
+ * html/HTMLObjectElement.h: Add a function to clear m_useFallbackContent.
+
</ins><span class="cx"> 2015-03-06 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Test horiz-origin-x and horiz-origin-y in SVG fonts
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (181167 => 181168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h 2015-03-06 18:21:36 UTC (rev 181167)
+++ trunk/Source/WebCore/dom/Element.h 2015-03-06 18:44:33 UTC (rev 181168)
</span><span class="lines">@@ -310,8 +310,6 @@
</span><span class="cx">
</span><span class="cx"> virtual void copyNonAttributePropertiesFromElement(const Element&) { }
</span><span class="cx">
</span><del>- void lazyReattach();
-
</del><span class="cx"> virtual RenderPtr<RenderElement> createElementRenderer(Ref<RenderStyle>&&);
</span><span class="cx"> virtual bool rendererIsNeeded(const RenderStyle&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLObjectElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLObjectElement.cpp (181167 => 181168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLObjectElement.cpp 2015-03-06 18:21:36 UTC (rev 181167)
+++ trunk/Source/WebCore/html/HTMLObjectElement.cpp 2015-03-06 18:44:33 UTC (rev 181168)
</span><span class="lines">@@ -107,28 +107,37 @@
</span><span class="cx">
</span><span class="cx"> void HTMLObjectElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
</span><span class="cx"> {
</span><ins>+ bool invalidateRenderer = false;
+
</ins><span class="cx"> if (name == formAttr)
</span><span class="cx"> formAttributeChanged();
</span><span class="cx"> else if (name == typeAttr) {
</span><span class="cx"> m_serviceType = value.string().left(value.find(';')).lower();
</span><ins>+ invalidateRenderer = !fastHasAttribute(classidAttr);
</ins><span class="cx"> setNeedsWidgetUpdate(true);
</span><span class="cx"> } else if (name == dataAttr) {
</span><span class="cx"> m_url = stripLeadingAndTrailingHTMLSpaces(value);
</span><del>- setNeedsWidgetUpdate(true);
</del><span class="cx"> document().updateStyleIfNeeded();
</span><del>- if (renderer()) {
- if (isImageType()) {
- if (!m_imageLoader)
- m_imageLoader = std::make_unique<HTMLImageLoader>(*this);
- m_imageLoader->updateFromElementIgnoringPreviousError();
- }
</del><ins>+ if (isImageType() && renderer()) {
+ if (!m_imageLoader)
+ m_imageLoader = std::make_unique<HTMLImageLoader>(*this);
+ m_imageLoader->updateFromElementIgnoringPreviousError();
</ins><span class="cx"> }
</span><del>- } else if (name == classidAttr)
</del><ins>+ invalidateRenderer = !fastHasAttribute(classidAttr);
</ins><span class="cx"> setNeedsWidgetUpdate(true);
</span><del>- else if (name == onbeforeloadAttr)
</del><ins>+ } else if (name == classidAttr) {
+ invalidateRenderer = true;
+ setNeedsWidgetUpdate(true);
+ } else if (name == onbeforeloadAttr)
</ins><span class="cx"> setAttributeEventListener(eventNames().beforeloadEvent, name, value);
</span><span class="cx"> else
</span><span class="cx"> HTMLPlugInImageElement::parseAttribute(name, value);
</span><ins>+
+ if (!invalidateRenderer || !inDocument() || !renderer())
+ return;
+
+ clearUseFallbackContent();
+ setNeedsStyleRecalc(ReconstructRenderTree);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void mapDataParamToSrc(Vector<String>* paramNames, Vector<String>* paramValues)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLObjectElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLObjectElement.h (181167 => 181168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLObjectElement.h 2015-03-06 18:21:36 UTC (rev 181167)
+++ trunk/Source/WebCore/html/HTMLObjectElement.h 2015-03-06 18:44:33 UTC (rev 181168)
</span><span class="lines">@@ -85,6 +85,7 @@
</span><span class="cx">
</span><span class="cx"> bool shouldAllowQuickTimeClassIdQuirk();
</span><span class="cx"> bool hasValidClassId();
</span><ins>+ void clearUseFallbackContent() { m_useFallbackContent = false; }
</ins><span class="cx">
</span><span class="cx"> virtual void refFormAssociatedElement() override { ref(); }
</span><span class="cx"> virtual void derefFormAssociatedElement() override { deref(); }
</span></span></pre>
</div>
</div>
</body>
</html>