<!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>[186493] 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/186493">186493</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-07-08 01:42:26 -0700 (Wed, 08 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/186461">r186461</a> - REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/183706">r183706</a>): HTMLImageElement sometimes fails to register as document named item.
<https://webkit.org/b/146679>
<rdar://problem/21613839>
Reviewed by Antti Koivisto.
Source/WebCore:
After <a href="http://trac.webkit.org/projects/webkit/changeset/183706">r183706</a>, Element::hasName() no longer returns outdated information when called
inside a parseAttribute() override. HTMLImageElement was relying on this to check
if it *used* to have a name attribute before the currently parsing one was set.
Since parseAttribute() only shows subclasses the new attribute value, I'm adding a
flag to HTMLImageElement that remembers whether we had a name attribute or not.
Test: fast/dom/HTMLImageElement/remove-img-with-name-from-document-crash.html
* html/HTMLImageElement.cpp:
(WebCore::HTMLImageElement::parseAttribute):
* html/HTMLImageElement.h:
LayoutTests:
Add a test that would assert when removing a named HTMLImageElement from the DOM
after having failed to register it as a document named item.
* fast/dom/HTMLImageElement/remove-img-with-name-from-document-crash-expected.txt: Added.
* fast/dom/HTMLImageElement/remove-img-with-name-from-document-crash.html: Added.</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="#releasesWebKitGTKwebkit28SourceWebCorehtmlHTMLImageElementcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLImageElement.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorehtmlHTMLImageElementh">releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLImageElement.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsfastdomHTMLImageElementremoveimgwithnamefromdocumentcrashexpectedtxt">releases/WebKitGTK/webkit-2.8/LayoutTests/fast/dom/HTMLImageElement/remove-img-with-name-from-document-crash-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsfastdomHTMLImageElementremoveimgwithnamefromdocumentcrashhtml">releases/WebKitGTK/webkit-2.8/LayoutTests/fast/dom/HTMLImageElement/remove-img-with-name-from-document-crash.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 (186492 => 186493)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-07-08 06:27:07 UTC (rev 186492)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-07-08 08:42:26 UTC (rev 186493)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-07-07 Andreas Kling <akling@apple.com>
+
+ REGRESSION(r183706): HTMLImageElement sometimes fails to register as document named item.
+ <https://webkit.org/b/146679>
+ <rdar://problem/21613839>
+
+ Reviewed by Antti Koivisto.
+
+ Add a test that would assert when removing a named HTMLImageElement from the DOM
+ after having failed to register it as a document named item.
+
+ * fast/dom/HTMLImageElement/remove-img-with-name-from-document-crash-expected.txt: Added.
+ * fast/dom/HTMLImageElement/remove-img-with-name-from-document-crash.html: Added.
+
</ins><span class="cx"> 2015-07-06 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash when setting text direction via MakeTextWritingDirection* editing commands.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestsfastdomHTMLImageElementremoveimgwithnamefromdocumentcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/fast/dom/HTMLImageElement/remove-img-with-name-from-document-crash-expected.txt (0 => 186493)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/fast/dom/HTMLImageElement/remove-img-with-name-from-document-crash-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/fast/dom/HTMLImageElement/remove-img-with-name-from-document-crash-expected.txt 2015-07-08 08:42:26 UTC (rev 186493)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+This test verifies that removing a named HTMLImageElement from the document unregisters its mapping cleanly. It passes if it doesn't assert.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Looking up image element through document named item collection...
+PASS document.nameAttributeValue is imageElement
+Removing it from the document...
+PASS imageElement.parentNode is null
+Checking that named item mapping is gone...
+PASS document.nameAttributeValue is undefined
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestsfastdomHTMLImageElementremoveimgwithnamefromdocumentcrashhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/fast/dom/HTMLImageElement/remove-img-with-name-from-document-crash.html (0 => 186493)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/fast/dom/HTMLImageElement/remove-img-with-name-from-document-crash.html (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/fast/dom/HTMLImageElement/remove-img-with-name-from-document-crash.html 2015-07-08 08:42:26 UTC (rev 186493)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<script src="../../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<img id="foo">
+<script>
+
+description("This test verifies that removing a named HTMLImageElement from the document unregisters its mapping cleanly. It passes if it doesn't assert.");
+
+var imageElement = document.getElementById("foo");
+imageElement.setAttribute("name", "nameAttributeValue");
+
+debug("Looking up image element through document named item collection...");
+shouldBe("document.nameAttributeValue", "imageElement");
+
+debug("Removing it from the document...");
+imageElement.parentNode.removeChild(imageElement);
+shouldBe("imageElement.parentNode", "null");
+
+debug("Checking that named item mapping is gone...");
+shouldBe("document.nameAttributeValue", "undefined");
+
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (186492 => 186493)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-07-08 06:27:07 UTC (rev 186492)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-07-08 08:42:26 UTC (rev 186493)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-07-07 Andreas Kling <akling@apple.com>
+
+ REGRESSION(r183706): HTMLImageElement sometimes fails to register as document named item.
+ <https://webkit.org/b/146679>
+ <rdar://problem/21613839>
+
+ Reviewed by Antti Koivisto.
+
+ After r183706, Element::hasName() no longer returns outdated information when called
+ inside a parseAttribute() override. HTMLImageElement was relying on this to check
+ if it *used* to have a name attribute before the currently parsing one was set.
+
+ Since parseAttribute() only shows subclasses the new attribute value, I'm adding a
+ flag to HTMLImageElement that remembers whether we had a name attribute or not.
+
+ Test: fast/dom/HTMLImageElement/remove-img-with-name-from-document-crash.html
+
+ * html/HTMLImageElement.cpp:
+ (WebCore::HTMLImageElement::parseAttribute):
+ * html/HTMLImageElement.h:
+
</ins><span class="cx"> 2015-05-28 Carlos Alberto Lopez Perez <clopez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CMake] Improve detection and usage of GL/GLES/EGL libraries.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorehtmlHTMLImageElementcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLImageElement.cpp (186492 => 186493)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLImageElement.cpp 2015-07-08 06:27:07 UTC (rev 186492)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLImageElement.cpp 2015-07-08 08:42:26 UTC (rev 186493)
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> if (name == nameAttr) {
</span><span class="cx"> bool willHaveName = !value.isNull();
</span><del>- if (hasName() != willHaveName && inDocument() && is<HTMLDocument>(document())) {
</del><ins>+ if (m_hadNameBeforeAttributeChanged != willHaveName && inDocument() && is<HTMLDocument>(document())) {
</ins><span class="cx"> HTMLDocument& document = downcast<HTMLDocument>(this->document());
</span><span class="cx"> const AtomicString& id = getIdAttribute();
</span><span class="cx"> if (!id.isEmpty() && id != getNameAttribute()) {
</span><span class="lines">@@ -187,6 +187,7 @@
</span><span class="cx"> document.removeDocumentNamedItem(*id.impl(), *this);
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ m_hadNameBeforeAttributeChanged = willHaveName;
</ins><span class="cx"> }
</span><span class="cx"> HTMLElement::parseAttribute(name, value);
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorehtmlHTMLImageElementh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLImageElement.h (186492 => 186493)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLImageElement.h 2015-07-08 06:27:07 UTC (rev 186492)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLImageElement.h 2015-07-08 08:42:26 UTC (rev 186493)
</span><span class="lines">@@ -133,6 +133,7 @@
</span><span class="cx"> AtomicString m_lowercasedUsemap;
</span><span class="cx"> float m_imageDevicePixelRatio;
</span><span class="cx"> bool m_experimentalImageMenuEnabled;
</span><ins>+ bool m_hadNameBeforeAttributeChanged { false }; // FIXME: We only need this because parseAttribute() can't see the old value.
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> void updateImageControls();
</span></span></pre>
</div>
</div>
</body>
</html>