<!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>[172368] 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/172368">172368</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-08-08 17:23:38 -0700 (Fri, 08 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Load the layout test result image diff HTML from a file, rather than having it inline in webkitpy
https://bugs.webkit.org/show_bug.cgi?id=135780
Reviewed by Dan Bates.
Tools:
Pull the HTML for the image diff file into a separate file, for easier hackability.
* Scripts/webkitpy/layout_tests/controllers/test_result_writer.py:
(TestResultWriter.write_image_diff_files):
LayoutTests:
Add image-diff-template.html and expected result (crazy, but this is what we do
for results.html too).
* fast/harness/image-diff-template-expected.txt: Added.
* fast/harness/image-diff-template.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testscontrollerstest_result_writerpy">trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastharnessimagedifftemplateexpectedtxt">trunk/LayoutTests/fast/harness/image-diff-template-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastharnessimagedifftemplatehtml">trunk/LayoutTests/fast/harness/image-diff-template.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (172367 => 172368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-08-09 00:00:04 UTC (rev 172367)
+++ trunk/LayoutTests/ChangeLog        2014-08-09 00:23:38 UTC (rev 172368)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2014-08-08 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Load the layout test result image diff HTML from a file, rather than having it inline in webkitpy
+ https://bugs.webkit.org/show_bug.cgi?id=135780
+
+ Reviewed by Dan Bates.
+
+ Add image-diff-template.html and expected result (crazy, but this is what we do
+ for results.html too).
+
+ * fast/harness/image-diff-template-expected.txt: Added.
+ * fast/harness/image-diff-template.html: Added.
+
+2014-08-08 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> [WK2] Scrolling does not work inside nested frames
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=135775
</span><span class="cx"> <rdar://problem/17959896>
</span></span></pre></div>
<a id="trunkLayoutTestsfastharnessimagedifftemplateexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/harness/image-diff-template-expected.txt (0 => 172368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/harness/image-diff-template-expected.txt         (rev 0)
+++ trunk/LayoutTests/fast/harness/image-diff-template-expected.txt        2014-08-09 00:23:38 UTC (rev 172368)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+Difference between images: diff
+Loading...
</ins></span></pre></div>
<a id="trunkLayoutTestsfastharnessimagedifftemplatehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/harness/image-diff-template.html (0 => 172368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/harness/image-diff-template.html         (rev 0)
+++ trunk/LayoutTests/fast/harness/image-diff-template.html        2014-08-09 00:23:38 UTC (rev 172368)
</span><span class="lines">@@ -0,0 +1,57 @@
</span><ins>+<!DOCTYPE HTML>
+<html>
+<head>
+<title>%(title)s</title>
+<style>
+ .label {
+ font-weight: bold;
+ }
+</style>
+</head>
+<body>
+Difference between images: <a href="%(diff_filename)s">diff</a><br>
+<div class="imageText"></div>
+<div class="imageContainer" data-prefix="%(prefix)s">Loading...</div>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+(function() {
+ var preloadedImageCount = 0;
+
+ function preloadComplete()
+ {
+ ++preloadedImageCount;
+ if (preloadedImageCount < 2)
+ return;
+ toggleImages();
+ setInterval(toggleImages, 2000)
+ }
+
+ function preloadImage(url)
+ {
+ image = new Image();
+ image.addEventListener('load', preloadComplete);
+ image.src = url;
+ return image;
+ }
+
+ function toggleImages()
+ {
+ if (text.textContent == 'Expected Image') {
+ text.textContent = 'Actual Image';
+ container.replaceChild(actualImage, container.firstChild);
+ } else {
+ text.textContent = 'Expected Image';
+ container.replaceChild(expectedImage, container.firstChild);
+ }
+ }
+
+ var text = document.querySelector('.imageText');
+ var container = document.querySelector('.imageContainer');
+ var actualImage = preloadImage(container.getAttribute('data-prefix') + '-actual.png');
+ var expectedImage = preloadImage(container.getAttribute('data-prefix') + '-expected.png');
+})();
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (172367 => 172368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2014-08-09 00:00:04 UTC (rev 172367)
+++ trunk/Tools/ChangeLog        2014-08-09 00:23:38 UTC (rev 172368)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-08-08 Simon Fraser <simon.fraser@apple.com>
+
+ Load the layout test result image diff HTML from a file, rather than having it inline in webkitpy
+ https://bugs.webkit.org/show_bug.cgi?id=135780
+
+ Reviewed by Dan Bates.
+
+ Pull the HTML for the image diff file into a separate file, for easier hackability.
+
+ * Scripts/webkitpy/layout_tests/controllers/test_result_writer.py:
+ (TestResultWriter.write_image_diff_files):
+
</ins><span class="cx"> 2014-08-08 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Gardening: fix Windows build after r172259.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testscontrollerstest_result_writerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py (172367 => 172368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py        2014-08-09 00:00:04 UTC (rev 172367)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py        2014-08-09 00:23:38 UTC (rev 172368)
</span><span class="lines">@@ -168,60 +168,18 @@
</span><span class="cx"> diff_filename = self.output_filename(self.FILENAME_SUFFIX_IMAGE_DIFF)
</span><span class="cx"> self._write_binary_file(diff_filename, image_diff)
</span><span class="cx">
</span><del>- diffs_html_filename = self.output_filename(self.FILENAME_SUFFIX_IMAGE_DIFFS_HTML)
</del><ins>+ base_dir = self._port.path_from_webkit_base('LayoutTests', 'fast', 'harness')
+ image_diff_file = self._filesystem.read_text_file(self._filesystem.join(base_dir, 'image-diff-template.html'))
+
</ins><span class="cx"> # FIXME: old-run-webkit-tests shows the diff percentage as the text contents of the "diff" link.
</span><span class="cx"> # FIXME: old-run-webkit-tests include a link to the test file.
</span><del>- html = """<!DOCTYPE HTML>
-<html>
-<head>
-<title>%(title)s</title>
-<style>.label{font-weight:bold}</style>
-</head>
-<body>
-Difference between images: <a href="%(diff_filename)s">diff</a><br>
-<div class=imageText></div>
-<div class=imageContainer data-prefix="%(prefix)s">Loading...</div>
-<script>
-(function() {
- var preloadedImageCount = 0;
- function preloadComplete() {
- ++preloadedImageCount;
- if (preloadedImageCount < 2)
- return;
- toggleImages();
- setInterval(toggleImages, 2000)
- }
-
- function preloadImage(url) {
- image = new Image();
- image.addEventListener('load', preloadComplete);
- image.src = url;
- return image;
- }
-
- function toggleImages() {
- if (text.textContent == 'Expected Image') {
- text.textContent = 'Actual Image';
- container.replaceChild(actualImage, container.firstChild);
- } else {
- text.textContent = 'Expected Image';
- container.replaceChild(expectedImage, container.firstChild);
- }
- }
-
- var text = document.querySelector('.imageText');
- var container = document.querySelector('.imageContainer');
- var actualImage = preloadImage(container.getAttribute('data-prefix') + '-actual.png');
- var expectedImage = preloadImage(container.getAttribute('data-prefix') + '-expected.png');
-})();
-</script>
-</body>
-</html>
-""" % {
</del><ins>+ html = image_diff_file % {
</ins><span class="cx"> 'title': self._test_name,
</span><span class="cx"> 'diff_filename': self._output_testname(self.FILENAME_SUFFIX_IMAGE_DIFF),
</span><span class="cx"> 'prefix': self._output_testname(''),
</span><span class="cx"> }
</span><ins>+
+ diffs_html_filename = self.output_filename(self.FILENAME_SUFFIX_IMAGE_DIFFS_HTML)
</ins><span class="cx"> self._filesystem.write_text_file(diffs_html_filename, html)
</span><span class="cx">
</span><span class="cx"> def write_reftest(self, src_filepath):
</span></span></pre>
</div>
</div>
</body>
</html>