<!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>[200053] trunk/Tools</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/200053">200053</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-04-25 15:40:24 -0700 (Mon, 25 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix issues with content-animation performance tests
https://bugs.webkit.org/show_bug.cgi?id=157001
Reviewed by Sam Weinig.
Add patch content for svg-animation.html, and fix the paths in the patch so
it applies correctly.
Add the patch file to the .plan file.
* Scripts/webkitpy/benchmark_runner/data/patches/ContentAnimation.patch:
* Scripts/webkitpy/benchmark_runner/data/plans/content-animation.plan:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerdatapatchesContentAnimationpatch">trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/ContentAnimation.patch</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerdataplanscontentanimationplan">trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/content-animation.plan</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (200052 => 200053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2016-04-25 21:58:11 UTC (rev 200052)
+++ trunk/Tools/ChangeLog        2016-04-25 22:40:24 UTC (rev 200053)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-04-25 Simon Fraser <simon.fraser@apple.com>
+
+ Fix issues with content-animation performance tests
+ https://bugs.webkit.org/show_bug.cgi?id=157001
+
+ Reviewed by Sam Weinig.
+
+ Add patch content for svg-animation.html, and fix the paths in the patch so
+ it applies correctly.
+
+ Add the patch file to the .plan file.
+
+ * Scripts/webkitpy/benchmark_runner/data/patches/ContentAnimation.patch:
+ * Scripts/webkitpy/benchmark_runner/data/plans/content-animation.plan:
+
</ins><span class="cx"> 2016-04-25 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Tweaking IndexedDB watchlist and adding myself to it.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerdatapatchesContentAnimationpatch"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/ContentAnimation.patch (200052 => 200053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/ContentAnimation.patch        2016-04-25 21:58:11 UTC (rev 200052)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/ContentAnimation.patch        2016-04-25 22:40:24 UTC (rev 200053)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-diff --git a/PerformanceTests/Animation/css-animation.html b/PerformanceTests/Animation/css-animation.html
</del><ins>+diff --git a/css-animation.html b/css-animation.html
</ins><span class="cx"> index adae19cb018ed1ca93fd6b4cda80002348482fc3..8f1e29933faa13586dbf97b7874024854fbf2147 100644
</span><del>---- a/PerformanceTests/Animation/css-animation.html
-+++ b/PerformanceTests/Animation/css-animation.html
</del><ins>+--- a/css-animation.html
++++ b/css-animation.html
</ins><span class="cx"> @@ -167,9 +167,54 @@
</span><span class="cx"> function setupAnimation()
</span><span class="cx"> {
</span><span class="lines">@@ -57,10 +57,10 @@
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>-diff --git a/PerformanceTests/Animation/raf-animation.html b/PerformanceTests/Animation/raf-animation.html
-index cb11bc1e7412050c132564e1f2dea9f8729871a6..dbf18e72de9880c28d9fbf9fa156b4949bb6a6cf 100644
---- a/PerformanceTests/Animation/raf-animation.html
-+++ b/PerformanceTests/Animation/raf-animation.html
</del><ins>+diff --git a/raf-animation.html b/raf-animation.html
+index 09e72f222fcafdfa054a2d5a37b1dcc9eca096ca..dbf18e72de9880c28d9fbf9fa156b4949bb6a6cf 100644
+--- a/raf-animation.html
++++ b/raf-animation.html
</ins><span class="cx"> @@ -195,9 +195,54 @@
</span><span class="cx"> {
</span><span class="cx"> makeParticles();
</span><span class="lines">@@ -75,8 +75,8 @@
</span><span class="cx"> + {
</span><span class="cx"> + if (location.hash === '#submit')
</span><span class="cx"> + submitResults();
</span><del>- }
-
</del><ins>++ }
++
</ins><span class="cx"> + function submitResults()
</span><span class="cx"> + {
</span><span class="cx"> + var results = {
</span><span class="lines">@@ -109,8 +109,67 @@
</span><span class="cx"> + }
</span><span class="cx"> + }
</span><span class="cx"> + xhr.send(resultsString);
</span><ins>+ }
+
+ window.addEventListener('load', setupAnimation, false);
++ window.addEventListener("hashchange", hashChanged, false);
+ </script>
+ </head>
+ <body>
+diff --git a/svg-animation.html b/svg-animation.html
+index c286d50cc7e0e6d64e1b6fbd2beb3642fe90e958..fb21d522ca200021d452595cbfed3db252c80929 100644
+--- a/svg-animation.html
++++ b/svg-animation.html
+@@ -150,9 +150,54 @@
+ function setupAnimation()
+ {
+ makeParticles();
++
++ window.setTimeout(function() {
++ location.hash = 'done';
++ }, 10000)
</ins><span class="cx"> + }
</span><del>-+
</del><ins>++
++ function hashChanged()
++ {
++ if (location.hash === '#submit')
++ submitResults();
++ }
++
++ function submitResults()
++ {
++ var results = {
++ 'content-animation' : {
++ 'metrics' : {
++ 'FrameRate' : ['Arithmetic']
++ },
++ 'tests' : {
++ 'svg-animation' : {
++ 'metrics' : {
++ 'FrameRate' : {
++ 'current' : ['<native_framerate>'] // <native_framerate> is replaced by a framerate computed in native code
++ }
++ }
++ }
++ }
++ }
++ };
++ var resultsString = JSON.stringify(results);
++ var xhr = new XMLHttpRequest();
++ xhr.open("POST", "/report");
++ xhr.setRequestHeader("Content-type", "application/json");
++ xhr.setRequestHeader("Content-length", resultsString.length);
++ xhr.setRequestHeader("Connection", "close");
++ xhr.onreadystatechange = function() {
++ if (xhr.readyState == XMLHttpRequest.DONE && xhr.status == 200) {
++ closeRequest = new XMLHttpRequest();
++ closeRequest.open("GET", "/shutdown");
++ closeRequest.send()
++ }
++ }
++ xhr.send(resultsString);
+ }
+
</ins><span class="cx"> window.addEventListener('load', setupAnimation, false);
</span><span class="cx"> + window.addEventListener("hashchange", hashChanged, false);
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerdataplanscontentanimationplan"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/content-animation.plan (200052 => 200053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/content-animation.plan        2016-04-25 21:58:11 UTC (rev 200052)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/content-animation.plan        2016-04-25 22:40:24 UTC (rev 200053)
</span><span class="lines">@@ -1,10 +1,12 @@
</span><span class="cx"> {
</span><span class="cx"> "timeout": 120,
</span><span class="cx"> "count": 5,
</span><del>- "svn_source": "https://svn.webkit.org/repository/webkit/trunk/PerformanceTests/Animation/@r199806",
</del><ins>+ "svn_source": "https://svn.webkit.org/repository/webkit/trunk/PerformanceTests/Animation/@r200049",
+ "benchmark_patch": "data/patches/ContentAnimation.patch",
</ins><span class="cx"> "test_files": [
</span><del>-         "css-animation.html",
-         "raf-animation.html"
</del><ins>+ "css-animation.html",
+ "svg-animation.html",
+ "raf-animation.html"
</ins><span class="cx"> ],
</span><span class="cx"> "output_file": "css-animation.result",
</span><span class="cx"> "options": {
</span></span></pre>
</div>
</div>
</body>
</html>