<!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>[180854] releases/WebKitGTK/webkit-2.8</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/180854">180854</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-01 00:43:46 -0800 (Sun, 01 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/180683">r180683</a> - 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-02-26
Reviewed by Zalan Bujtas.
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.
Test: svg/as-object/svg-in-object-dynamic-attribute-change.html
* dom/Element.h: Delete unimplemented function.
* html/HTMLObjectElement.cpp:
(WebCore::HTMLObjectElement::parseAttribute): Dirty the element by calling
setNeedsStyleRecalc() when one of the plugin controlling attributes gets
changed. We have to clear the m_useFallbackContent because the attribute's
new value might fix the object rendering.
* html/HTMLObjectElement.h: Add a function to clear m_useFallbackContent.
* html/HTMLPlugInImageElement.cpp:
(WebCore::HTMLPlugInImageElement::willRecalcStyle): We might need to
reconstruct the object renderer in the image case. This can happen if the
image was rendering fallback content and the attribute's new value fixes
the object rendering.
LayoutTests:
* 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="#releasesWebKitGTKwebkit28LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoredomElementh">releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/Element.h</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorehtmlHTMLObjectElementcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLObjectElement.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorehtmlHTMLObjectElementh">releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLObjectElement.h</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorehtmlHTMLPlugInImageElementcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLPlugInImageElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestssvgasobjectresourceslime100x100html">releases/WebKitGTK/webkit-2.8/LayoutTests/svg/as-object/resources/lime100x100.html</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestssvgasobjectresourceslime100x100png">releases/WebKitGTK/webkit-2.8/LayoutTests/svg/as-object/resources/lime100x100.png</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestssvgasobjectresourceslime100x100svg">releases/WebKitGTK/webkit-2.8/LayoutTests/svg/as-object/resources/lime100x100.svg</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestssvgasobjectresourcesred100x100svg">releases/WebKitGTK/webkit-2.8/LayoutTests/svg/as-object/resources/red100x100.svg</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestssvgasobjectsvginobjectdynamicattributechangeexpectedhtml">releases/WebKitGTK/webkit-2.8/LayoutTests/svg/as-object/svg-in-object-dynamic-attribute-change-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestssvgasobjectsvginobjectdynamicattributechangehtml">releases/WebKitGTK/webkit-2.8/LayoutTests/svg/as-object/svg-in-object-dynamic-attribute-change.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog (180853 => 180854)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-03-01 08:28:59 UTC (rev 180853)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-03-01 08:43:46 UTC (rev 180854)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-02-26 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><ins>+ 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 Zalan Bujtas.
+
+ * 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.
+
+2015-02-26 Said Abou-Hallawa <sabouhallawa@apple.com>
+
</ins><span class="cx"> Cleanup RenderSVGResourceClipper class.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=142032.
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestssvgasobjectresourceslime100x100html"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/svg/as-object/resources/lime100x100.html (0 => 180854)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/svg/as-object/resources/lime100x100.html (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/svg/as-object/resources/lime100x100.html 2015-03-01 08:43:46 UTC (rev 180854)
</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="releasesWebKitGTKwebkit28LayoutTestssvgasobjectresourceslime100x100png"></a>
<div class="binary"><h4>Added: releases/WebKitGTK/webkit-2.8/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: releases/WebKitGTK/webkit-2.8/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="releasesWebKitGTKwebkit28LayoutTestssvgasobjectresourceslime100x100svg"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/svg/as-object/resources/lime100x100.svg (0 => 180854)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/svg/as-object/resources/lime100x100.svg (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/svg/as-object/resources/lime100x100.svg 2015-03-01 08:43:46 UTC (rev 180854)
</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="releasesWebKitGTKwebkit28LayoutTestssvgasobjectresourcesred100x100svg"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/svg/as-object/resources/red100x100.svg (0 => 180854)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/svg/as-object/resources/red100x100.svg (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/svg/as-object/resources/red100x100.svg 2015-03-01 08:43:46 UTC (rev 180854)
</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="releasesWebKitGTKwebkit28LayoutTestssvgasobjectsvginobjectdynamicattributechangeexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/svg/as-object/svg-in-object-dynamic-attribute-change-expected.html (0 => 180854)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/svg/as-object/svg-in-object-dynamic-attribute-change-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/svg/as-object/svg-in-object-dynamic-attribute-change-expected.html 2015-03-01 08:43:46 UTC (rev 180854)
</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="releasesWebKitGTKwebkit28LayoutTestssvgasobjectsvginobjectdynamicattributechangehtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/svg/as-object/svg-in-object-dynamic-attribute-change.html (0 => 180854)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/svg/as-object/svg-in-object-dynamic-attribute-change.html (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/svg/as-object/svg-in-object-dynamic-attribute-change.html 2015-03-01 08:43:46 UTC (rev 180854)
</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="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (180853 => 180854)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-03-01 08:28:59 UTC (rev 180853)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-03-01 08:43:46 UTC (rev 180854)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2015-02-26 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><ins>+ 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 Zalan Bujtas.
+
+ 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.
+
+ Test: svg/as-object/svg-in-object-dynamic-attribute-change.html
+
+ * dom/Element.h: Delete unimplemented function.
+
+ * html/HTMLObjectElement.cpp:
+ (WebCore::HTMLObjectElement::parseAttribute): Dirty the element by calling
+ setNeedsStyleRecalc() when one of the plugin controlling attributes gets
+ changed. We have to clear the m_useFallbackContent because the attribute's
+ new value might fix the object rendering.
+
+ * html/HTMLObjectElement.h: Add a function to clear m_useFallbackContent.
+
+ * html/HTMLPlugInImageElement.cpp:
+ (WebCore::HTMLPlugInImageElement::willRecalcStyle): We might need to
+ reconstruct the object renderer in the image case. This can happen if the
+ image was rendering fallback content and the attribute's new value fixes
+ the object rendering.
+
+2015-02-26 Said Abou-Hallawa <sabouhallawa@apple.com>
+
</ins><span class="cx"> Cleanup RenderSVGResourceClipper class.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=142032.
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/Element.h (180853 => 180854)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/Element.h 2015-03-01 08:28:59 UTC (rev 180853)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/Element.h 2015-03-01 08:43:46 UTC (rev 180854)
</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="releasesWebKitGTKwebkit28SourceWebCorehtmlHTMLObjectElementcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLObjectElement.cpp (180853 => 180854)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLObjectElement.cpp 2015-03-01 08:28:59 UTC (rev 180853)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLObjectElement.cpp 2015-03-01 08:43:46 UTC (rev 180854)
</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(SyntheticStyleChange);
</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="releasesWebKitGTKwebkit28SourceWebCorehtmlHTMLObjectElementh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLObjectElement.h (180853 => 180854)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLObjectElement.h 2015-03-01 08:28:59 UTC (rev 180853)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLObjectElement.h 2015-03-01 08:43:46 UTC (rev 180854)
</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>
<a id="releasesWebKitGTKwebkit28SourceWebCorehtmlHTMLPlugInImageElementcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLPlugInImageElement.cpp (180853 => 180854)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLPlugInImageElement.cpp 2015-03-01 08:28:59 UTC (rev 180853)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLPlugInImageElement.cpp 2015-03-01 08:43:46 UTC (rev 180854)
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: There shoudn't be need to force render tree reconstruction here.
</span><span class="cx"> // It is only done because loading and load event dispatching is tied to render tree construction.
</span><del>- if (!useFallbackContent() && needsWidgetUpdate() && renderer() && !isImageType() && (displayState() != DisplayingSnapshot))
</del><ins>+ if (!useFallbackContent() && needsWidgetUpdate() && renderer() && (displayState() != DisplayingSnapshot))
</ins><span class="cx"> setNeedsStyleRecalc(ReconstructRenderTree);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>