<!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>[210721] branches/safari-603-branch</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/210721">210721</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-12 23:05:07 -0800 (Thu, 12 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/210536">r210536</a>. rdar://problem/29939970</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCorehtmlImageDocumentcpp">branches/safari-603-branch/Source/WebCore/html/ImageDocument.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsfastimagesimageDocumenttitleexpectedtxt">branches/safari-603-branch/LayoutTests/fast/images/imageDocument-title-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsfastimagesimageDocumenttitlehtml">branches/safari-603-branch/LayoutTests/fast/images/imageDocument-title.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/ChangeLog (210720 => 210721)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-13 07:05:03 UTC (rev 210720)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-13 07:05:07 UTC (rev 210721)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2017-01-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210536. rdar://problem/29939970
+
+ 2017-01-09 Chris Dumez <cdumez@apple.com>
+
+ REGRESSION(r189555): ImageDocument title no longer includes the size of the image
+ https://bugs.webkit.org/show_bug.cgi?id=166876
+ <rdar://problem/29939970>
+
+ Reviewed by Tim Horton.
+
+ Add layout test coverage.
+
+ * fast/images/imageDocument-title-expected.txt: Added.
+ * fast/images/imageDocument-title.html: Added.
+
+2017-01-12 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210399. rdar://problem/29019333
</span><span class="cx">
</span><span class="cx"> 2017-01-05 Myles C. Maxfield <mmaxfield@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastimagesimageDocumenttitleexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/images/imageDocument-title-expected.txt (0 => 210721)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/images/imageDocument-title-expected.txt (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/images/imageDocument-title-expected.txt 2017-01-13 07:05:07 UTC (rev 210721)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+Tests that the title of an ImageDocument is properly set.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS f.contentDocument.title is "green-24x24.jpg 24×24 pixels"
+PASS f.contentDocument.head.getElementsByTagName('title')[0].textContent is "green-24x24.jpg 24×24 pixels"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastimagesimageDocumenttitlehtml"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/images/imageDocument-title.html (0 => 210721)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/images/imageDocument-title.html (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/images/imageDocument-title.html 2017-01-13 07:05:07 UTC (rev 210721)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+</head>
+<body>
+<script src="../../resources/js-test-pre.js"></script>
+<script>
+description("Tests that the title of an ImageDocument is properly set.");
+jsTestIsAsync = true;
+
+var f = document.createElement("iframe");
+f.onload = function() {
+ shouldBeEqualToString("f.contentDocument.title", "green-24x24.jpg 24×24 pixels");
+ shouldBeEqualToString("f.contentDocument.head.getElementsByTagName('title')[0].textContent", "green-24x24.jpg 24×24 pixels");
+ finishJSTest();
+}
+
+f.src = "resources/green-24x24.jpg";
+document.body.appendChild(f);
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (210720 => 210721)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-13 07:05:03 UTC (rev 210720)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-13 07:05:07 UTC (rev 210721)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2017-01-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210536. rdar://problem/29939970
+
+ 2017-01-09 Chris Dumez <cdumez@apple.com>
+
+ REGRESSION(r189555): ImageDocument title no longer includes the size of the image
+ https://bugs.webkit.org/show_bug.cgi?id=166876
+ <rdar://problem/29939970>
+
+ Reviewed by Tim Horton.
+
+ ImageDocument title no longer included the size of the image after r189555.
+ This is because Document::setTitle() is a no-op if the document does not
+ have a <head> element. To address the issue, we now include a <head>
+ element in ImageDocuments so that their title element properly gets added
+ to it.
+
+ Test: fast/images/imageDocument-title.html
+
+ * html/ImageDocument.cpp:
+ (WebCore::ImageDocument::createDocumentStructure):
+
+2017-01-12 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210689. rdar://problem/29985957
</span><span class="cx">
</span><span class="cx"> 2017-01-12 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorehtmlImageDocumentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/html/ImageDocument.cpp (210720 => 210721)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/html/ImageDocument.cpp 2017-01-13 07:05:03 UTC (rev 210720)
+++ branches/safari-603-branch/Source/WebCore/html/ImageDocument.cpp 2017-01-13 07:05:07 UTC (rev 210721)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><span class="cx"> #include "FrameView.h"
</span><span class="cx"> #include "HTMLBodyElement.h"
</span><ins>+#include "HTMLHeadElement.h"
</ins><span class="cx"> #include "HTMLHtmlElement.h"
</span><span class="cx"> #include "HTMLImageElement.h"
</span><span class="cx"> #include "HTMLNames.h"
</span><span class="lines">@@ -215,6 +216,9 @@
</span><span class="cx">
</span><span class="cx"> frame()->injectUserScripts(InjectAtDocumentStart);
</span><span class="cx">
</span><ins>+ auto head = HTMLHeadElement::create(*this);
+ rootElement->appendChild(head);
+
</ins><span class="cx"> auto body = HTMLBodyElement::create(*this);
</span><span class="cx"> body->setAttribute(styleAttr, "margin: 0px");
</span><span class="cx"> if (MIMETypeRegistry::isPDFMIMEType(document().loader()->responseMIMEType()))
</span></span></pre>
</div>
</div>
</body>
</html>