<!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>[284938] 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/284938">284938</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2021-10-27 12:45:14 -0700 (Wed, 27 Oct 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Preserve image diff precision until display time
https://bugs.webkit.org/show_bug.cgi?id=232365

Reviewed by Martin Robinson.

Tools:

Keep the precise image diff percentage value, saving it in full_results.json, and
only round it at presentation time in results.html.

* Scripts/webkitpy/port/image_diff.py:
(ImageDiffer._read):
* Scripts/webkitpy/port/port_testcase.py:
(PortTestCase.test_diff_image_failed_with_rounded_diff):

LayoutTests:

* fast/harness/full_results.json:
* fast/harness/results-expected.txt:
* fast/harness/results.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastharnessfull_resultsjson">trunk/LayoutTests/fast/harness/full_results.json</a></li>
<li><a href="#trunkLayoutTestsfastharnessresultsexpectedtxt">trunk/LayoutTests/fast/harness/results-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastharnessresultshtml">trunk/LayoutTests/fast/harness/results.html</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyportimage_diffpy">trunk/Tools/Scripts/webkitpy/port/image_diff.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportport_testcasepy">trunk/Tools/Scripts/webkitpy/port/port_testcase.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (284937 => 284938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-10-27 19:41:12 UTC (rev 284937)
+++ trunk/LayoutTests/ChangeLog 2021-10-27 19:45:14 UTC (rev 284938)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2021-10-27  Simon Fraser  <simon.fraser@apple.com>
+
+        Preserve image diff precision until display time
+        https://bugs.webkit.org/show_bug.cgi?id=232365
+
+        Reviewed by Martin Robinson.
+
+        * fast/harness/full_results.json:
+        * fast/harness/results-expected.txt:
+        * fast/harness/results.html:
+
</ins><span class="cx"> 2021-10-27  Arcady Goldmints-Orlov  <agoldmints@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GLIB] Remove tests that now pass from test expectations. Unreviewed test gardening.
</span></span></pre></div>
<a id="trunkLayoutTestsfastharnessfull_resultsjson"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/harness/full_results.json (284937 => 284938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/harness/full_results.json 2021-10-27 19:41:12 UTC (rev 284937)
+++ trunk/LayoutTests/fast/harness/full_results.json    2021-10-27 19:45:14 UTC (rev 284938)
</span><span class="lines">@@ -16,11 +16,23 @@
</span><span class="cx">                         "report": "REGRESSION",
</span><span class="cx">                         "expected": "PASS",
</span><span class="cx">                         "actual": "IMAGE LEAK",
</span><del>-                        "image_diff_percent": 0.26,
</del><ins>+                        "image_diff_percent": 0.261234,
</ins><span class="cx">                         "leaks": [{
</span><span class="cx">                             "document": "http://localhost:8800/WebKit/cache-storage/image-fail-with-leak.html",
</span><span class="cx">                         }]
</span><span class="cx">                     },
</span><ins>+                    "image-fail.html": {
+                        "report": "REGRESSION",
+                        "expected": "PASS",
+                        "actual": "IMAGE",
+                        "image_diff_percent": 86.262301
+                    },
+                    "tiny-image-fail.html": {
+                        "report": "REGRESSION",
+                        "expected": "PASS",
+                        "actual": "IMAGE",
+                        "image_diff_percent": 0.002
+                    },
</ins><span class="cx">                     "leaky-worker.html": {
</span><span class="cx">                         "report": "REGRESSION",
</span><span class="cx">                         "expected": "PASS",
</span></span></pre></div>
<a id="trunkLayoutTestsfastharnessresultsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/harness/results-expected.txt (284937 => 284938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/harness/results-expected.txt      2021-10-27 19:41:12 UTC (rev 284937)
+++ trunk/LayoutTests/fast/harness/results-expected.txt 2021-10-27 19:45:14 UTC (rev 284938)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> 
</span><span class="cx"> +DumpRenderTree-54888    crash log
</span><span class="cx"> +DumpRenderTree-56804    crash log
</span><del>-Tests that failed text/pixel/audio diff (5): flag all
</del><ins>+Tests that failed text/pixel/audio diff (7): flag all
</ins><span class="cx"> 
</span><span class="cx">  test    results image results   actual failure  expected failure        history
</span><span class="cx"> +css1/font_properties/font_family.html   expected actual diff pretty diff        images  text missing            history
</span><span class="lines">@@ -17,7 +17,9 @@
</span><span class="cx"> +http/tests/storageAccess/request-storage-access-top-frame.html  expected actual diff pretty diff                text    pass timeout    history
</span><span class="cx"> +http/wpt/cache-storage/cache-put-keys.https.any.worker.html     expected actual diff pretty diff                text    pass    history
</span><span class="cx"> +http/wpt/cache-storage/image-fail-with-leak.html                images diff (0.26%)     image leak      pass    history
</span><ins>++http/wpt/cache-storage/image-fail.html                images diff (86.26%)    image   pass    history
</ins><span class="cx"> +http/wpt/cache-storage/leaky-worker.html                 leak    pass    history
</span><ins>++http/wpt/cache-storage/tiny-image-fail.html           images diff (0.01%)     image   pass    history
</ins><span class="cx"> Tests that had no expected results (probably new) (1): flag all
</span><span class="cx"> 
</span><span class="cx"> test     results image results   actual failure  expected failure        history
</span></span></pre></div>
<a id="trunkLayoutTestsfastharnessresultshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/harness/results.html (284937 => 284938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/harness/results.html      2021-10-27 19:41:12 UTC (rev 284937)
+++ trunk/LayoutTests/fast/harness/results.html 2021-10-27 19:45:14 UTC (rev 284938)
</span><span class="lines">@@ -1415,7 +1415,7 @@
</span><span class="cx">                     result += TestResultsController.resultLink(testPrefix, '-actual.png', 'actual');
</span><span class="cx">                 }
</span><span class="cx"> 
</span><del>-                let diff = testResult.info.image_diff_percent;
</del><ins>+                let diff = Math.max(testResult.info.image_diff_percent, 0.01).toFixed(2);
</ins><span class="cx">                 result += TestResultsController.resultLink(testPrefix, '-diff.png', 'diff (' + diff + '%)');
</span><span class="cx">             }
</span><span class="cx">         }
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (284937 => 284938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-10-27 19:41:12 UTC (rev 284937)
+++ trunk/Tools/ChangeLog       2021-10-27 19:45:14 UTC (rev 284938)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2021-10-27  Simon Fraser  <simon.fraser@apple.com>
+
+        Preserve image diff precision until display time
+        https://bugs.webkit.org/show_bug.cgi?id=232365
+
+        Reviewed by Martin Robinson.
+
+        Keep the precise image diff percentage value, saving it in full_results.json, and
+        only round it at presentation time in results.html.
+
+        * Scripts/webkitpy/port/image_diff.py:
+        (ImageDiffer._read):
+        * Scripts/webkitpy/port/port_testcase.py:
+        (PortTestCase.test_diff_image_failed_with_rounded_diff):
+
</ins><span class="cx"> 2021-10-27  Dmitry Bezhetskov  <dbezhetskov@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [WASM-Function-References] Add call_ref spec tests
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportimage_diffpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/image_diff.py (284937 => 284938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/image_diff.py  2021-10-27 19:41:12 UTC (rev 284937)
+++ trunk/Tools/Scripts/webkitpy/port/image_diff.py     2021-10-27 19:45:14 UTC (rev 284938)
</span><span class="lines">@@ -152,11 +152,6 @@
</span><span class="cx">         total_pixels = int(string_utils.decode(m.group(2), target_type=str))
</span><span class="cx"> 
</span><span class="cx">         passed = diff_percent <= self._tolerance
</span><del>-        if not passed:
-            # FIXME: This prettification should happen at display time.
-            diff_percent = round(diff_percent * 100) / 100
-            diff_percent = max(diff_percent, 0.01)
-
</del><span class="cx">         return ImageDiffResult(passed=passed, diff_image=output_image, difference=diff_percent, tolerance=self._tolerance, fuzzy_data={'max_difference': max_difference, 'total_pixels': total_pixels}, error_string=err_str or None)
</span><span class="cx"> 
</span><span class="cx">     def stop(self):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportport_testcasepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/port_testcase.py (284937 => 284938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/port_testcase.py       2021-10-27 19:41:12 UTC (rev 284937)
+++ trunk/Tools/Scripts/webkitpy/port/port_testcase.py  2021-10-27 19:45:14 UTC (rev 284938)
</span><span class="lines">@@ -351,7 +351,7 @@
</span><span class="cx">         port = self.make_port()
</span><span class="cx">         port._server_process_constructor = lambda port, nm, cmd, env, crash_message=None: MockServerProcess(lines=['Content-Length: 4\n', 'test', 'diff: 0.101234%\n', 'maxDifference=8; totalPixels=20\n', '#EOF\n'])
</span><span class="cx">         image_differ = ImageDiffer(port)
</span><del>-        self.assertEqual(image_differ.diff_image(b'foo', b'bar', tolerance=0.1), ImageDiffResult(passed=False, diff_image=b'test', difference=0.1, tolerance=0.1, fuzzy_data={'max_difference': 8, 'total_pixels': 20}))
</del><ins>+        self.assertEqual(image_differ.diff_image(b'foo', b'bar', tolerance=0.1), ImageDiffResult(passed=False, diff_image=b'test', difference=0.101234, tolerance=0.1, fuzzy_data={'max_difference': 8, 'total_pixels': 20}))
</ins><span class="cx"> 
</span><span class="cx">     def test_diff_image_failed(self):
</span><span class="cx">         port = self.make_port()
</span></span></pre>
</div>
</div>

</body>
</html>