<!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>[199806] trunk/PerformanceTests</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/199806">199806</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-04-20 22:01:42 -0700 (Wed, 20 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add content animation tests to benchmark_runner, and allow the runner to collect device data as part of the results
https://bugs.webkit.org/show_bug.cgi?id=156827
Add two files missing from the previous commit.
* Animation/css-animation.html: Added.
* Animation/raf-animation.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkPerformanceTestsChangeLog">trunk/PerformanceTests/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkPerformanceTestsAnimationcssanimationhtml">trunk/PerformanceTests/Animation/css-animation.html</a></li>
<li><a href="#trunkPerformanceTestsAnimationrafanimationhtml">trunk/PerformanceTests/Animation/raf-animation.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkPerformanceTestsAnimationcssanimationhtml"></a>
<div class="addfile"><h4>Added: trunk/PerformanceTests/Animation/css-animation.html (0 => 199806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animation/css-animation.html (rev 0)
+++ trunk/PerformanceTests/Animation/css-animation.html 2016-04-21 05:01:42 UTC (rev 199806)
</span><span class="lines">@@ -0,0 +1,181 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <meta name="viewport" content="initial-scale=1.0">
+ <style>
+ body {
+ margin: 0;
+ }
+ #stage {
+ position: relative;
+ width: 320px;
+ height: 320px;
+ border: 1px solid black;
+ overflow: hidden;
+ }
+
+ .particle {
+ position: absolute;
+ height: 20px;
+ width: 20px;
+ background-color: blue;
+ border-radius: 50%;
+ animation: horizontal infinite 2s alternate ease-in-out, vertical infinite 2s alternate ease-in-out;
+ }
+
+ @keyframes horizontal {
+ from {
+ left: 0;
+ }
+ 50% {
+ left: 300px;
+ }
+ to {
+ left: 0;
+ }
+ }
+
+ @keyframes vertical {
+ from {
+ top: 0;
+ }
+ 50% {
+ top: 300px;
+ }
+ to {
+ top: 0;
+ }
+ }
+ </style>
+ <script>
+
+ var animationDuration = 2;
+
+ function randomInt(min, max)
+ {
+ return Math.round(this.random(min, max));
+ }
+
+ function random(min, max)
+ {
+ return (Math.random() * (max - min)) + min;
+ }
+
+ function randomColor()
+ {
+ var min = 32;
+ var max = 256 - 32;
+ return "#"
+ + this.randomInt(min, max).toString(16)
+ + this.randomInt(min, max).toString(16)
+ + this.randomInt(min, max).toString(16);
+ }
+
+ function Point(x, y)
+ {
+ this.x = x;
+ this.y = y;
+ }
+
+ Point.pointOnCircle = function(angle, radius)
+ {
+ return new Point(radius * Math.cos(angle), radius * Math.sin(angle));
+ }
+
+ Point.prototype =
+ {
+ add: function(other)
+ {
+ if(isNaN(other.x))
+ return new Point(this.x + other, this.y + other);
+ return new Point(this.x + other.x, this.y + other.y);
+ },
+
+ subtract: function(other)
+ {
+ if(isNaN(other.x))
+ return new Point(this.x - other, this.y - other);
+ return new Point(this.x - other.x, this.y - other.y);
+ },
+
+ move: function(angle, velocity, timeDelta)
+ {
+ return this.add(Point.pointOnCircle(angle, velocity * (timeDelta / 1000)));
+ },
+
+ multiply: function(other)
+ {
+ if(isNaN(other.x))
+ return new Point(this.x * other, this.y * other);
+ return new Point(this.x * other.x, this.y * other.y);
+ },
+
+ length: function() {
+ return Math.sqrt( this.x * this.x + this.y * this.y );
+ },
+
+ normalize: function() {
+ var l = Math.sqrt( this.x * this.x + this.y * this.y );
+ this.x /= l;
+ this.y /= l;
+ return this;
+ }
+ }
+
+ function Particle(maxPosition)
+ {
+ this.element = document.createElement('div');
+ this.element.className = 'particle';
+ this.element.style.backgroundColor = randomColor();
+ var slop = 0.2;
+ this.element.style.animationDuration = random(animationDuration - slop, animationDuration + slop) + 's, ' + random(animationDuration - slop, animationDuration + slop) + 's';
+ this.element.style.animationDelay = '-' + random(0, animationDuration) + 's';
+ this.maxPosition = maxPosition;
+ this.reset();
+ this.move();
+ }
+
+ Particle.prototype =
+ {
+ reset: function()
+ {
+ this.size = new Point(20, 20);
+ this.maxLocation = this.maxPosition.subtract(this.size);
+ this.position = new Point(0, 0);
+ },
+
+ move: function()
+ {
+ this.element.style.transform = "translate(" + this.position.x + "px," + this.position.y + "px) ";
+ }
+ }
+
+ var numParticles = 20;
+ var particles = [];
+
+ function makeParticles()
+ {
+ var stage = document.getElementById('stage');
+ var maxPosition = new Point(320, 320);
+ for (var i = 0; i < numParticles; ++i) {
+ particles.push(new Particle(maxPosition));
+ stage.appendChild(particles[i].element);
+ }
+ }
+
+ function setupAnimation()
+ {
+ makeParticles();
+ }
+
+ window.addEventListener('load', setupAnimation, false);
+ </script>
+</head>
+<body>
+
+<div id="stage">
+</div>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkPerformanceTestsAnimationrafanimationhtml"></a>
<div class="addfile"><h4>Added: trunk/PerformanceTests/Animation/raf-animation.html (0 => 199806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animation/raf-animation.html (rev 0)
+++ trunk/PerformanceTests/Animation/raf-animation.html 2016-04-21 05:01:42 UTC (rev 199806)
</span><span class="lines">@@ -0,0 +1,209 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <meta name="viewport" content="initial-scale=1.0">
+ <style>
+ body {
+ margin: 0;
+ }
+ #stage {
+ position: relative;
+ width: 320px;
+ height: 320px;
+ border: 1px solid black;
+ }
+
+ .particle {
+ position: absolute;
+ height: 20px;
+ width: 20px;
+ background-color: blue;
+ border-radius: 50%;
+ }
+ </style>
+ <script>
+
+ function randomInt(min, max)
+ {
+ return Math.round(this.random(min, max));
+ }
+
+ function random(min, max)
+ {
+ return (Math.random() * (max - min)) + min;
+ }
+
+ function randomColor()
+ {
+ var min = 32;
+ var max = 256 - 32;
+ return "#"
+ + this.randomInt(min, max).toString(16)
+ + this.randomInt(min, max).toString(16)
+ + this.randomInt(min, max).toString(16);
+ }
+
+ function Point(x, y)
+ {
+ this.x = x;
+ this.y = y;
+ }
+
+ Point.pointOnCircle = function(angle, radius)
+ {
+ return new Point(radius * Math.cos(angle), radius * Math.sin(angle));
+ }
+
+ Point.prototype =
+ {
+ add: function(other)
+ {
+ if(isNaN(other.x))
+ return new Point(this.x + other, this.y + other);
+ return new Point(this.x + other.x, this.y + other.y);
+ },
+
+ subtract: function(other)
+ {
+ if(isNaN(other.x))
+ return new Point(this.x - other, this.y - other);
+ return new Point(this.x - other.x, this.y - other.y);
+ },
+
+ move: function(angle, velocity, timeDelta)
+ {
+ return this.add(Point.pointOnCircle(angle, velocity * (timeDelta / 1000)));
+ },
+
+ multiply: function(other)
+ {
+ if(isNaN(other.x))
+ return new Point(this.x * other, this.y * other);
+ return new Point(this.x * other.x, this.y * other.y);
+ },
+
+ length: function() {
+ return Math.sqrt( this.x * this.x + this.y * this.y );
+ },
+
+ normalize: function() {
+ var l = Math.sqrt( this.x * this.x + this.y * this.y );
+ this.x /= l;
+ this.y /= l;
+ return this;
+ }
+ }
+
+ function Particle(maxPosition)
+ {
+ this.element = document.createElement('div');
+ this.element.className = 'particle';
+ this.element.style.backgroundColor = randomColor();
+ this.maxPosition = maxPosition;
+ this.reset();
+ this.move();
+ }
+
+ Particle.prototype =
+ {
+ reset: function()
+ {
+ this.size = new Point(20, 20);
+ this.maxLocation = this.maxPosition.subtract(this.size);
+ this.position = new Point(this.maxPosition.x / 2, this.maxPosition.y / 4);
+
+ var angle = Math.random() * Math.PI * 2;
+ this._velocity = new Point(Math.sin(angle), Math.cos(angle)).multiply(random(.8, 1.2));
+ },
+
+ animate: function(timeDelta)
+ {
+ this.position = this.position.add(this._velocity.multiply(timeDelta));
+ this._velocity.y += 0.03;
+
+ // If particle is going to move off right side
+ if (this.position.x > this.maxLocation.x) {
+ if (this._velocity.x > 0)
+ this._velocity.x *= -1;
+ this.position.x = this.maxLocation.x;
+ } else if (this.position.x < 0) {
+ // If particle is going to move off left side
+ if (this._velocity.x < 0)
+ this._velocity.x *= -1;
+ this.position.x = 0;
+ }
+
+ // If particle is going to move off bottom side
+ if (this.position.y > this.maxLocation.y) {
+ // Adjust direction but maintain magnitude
+ var magnitude = this._velocity.length();
+ this._velocity.x *= 1.5 + .005 * this.size.x;
+ this._velocity = this._velocity.normalize().multiply(magnitude);
+ if (Math.abs(this._velocity.y) < 0.7)
+ this.reset();
+ else {
+ if (this._velocity.y > 0)
+ this._velocity.y *= -0.999;
+ this.position.y = this.maxLocation.y;
+ }
+ } else if (this.position.y < 0) {
+ // If particle is going to move off top side
+ var magnitude = this._velocity.length();
+ this._velocity.x *= 1.5 + .005 * this.size.x;
+ this._velocity = this._velocity.normalize().multiply(magnitude);
+ if (this._velocity.y < 0)
+ this._velocity.y *= -0.998;
+ this.position.y = 0;
+ }
+
+ this.move();
+ },
+
+ move: function()
+ {
+ this.element.style.transform = "translate(" + this.position.x + "px," + this.position.y + "px) ";
+ }
+ }
+
+ var numParticles = 20;
+ var particles = [];
+
+ function makeParticles()
+ {
+ var stage = document.getElementById('stage');
+ var maxPosition = new Point(320, 320);
+ for (var i = 0; i < numParticles; ++i) {
+ particles.push(new Particle(maxPosition));
+ stage.appendChild(particles[i].element);
+ }
+ }
+
+ function moveParticles()
+ {
+ for (var particle of particles)
+ particle.animate(1);
+ }
+
+ function animate()
+ {
+ moveParticles();
+ window.requestAnimationFrame(animate);
+ }
+
+ function setupAnimation()
+ {
+ makeParticles();
+ animate();
+ }
+
+ window.addEventListener('load', setupAnimation, false);
+ </script>
+</head>
+<body>
+
+<div id="stage">
+</div>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkPerformanceTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/ChangeLog (199805 => 199806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/ChangeLog 2016-04-21 04:56:57 UTC (rev 199805)
+++ trunk/PerformanceTests/ChangeLog 2016-04-21 05:01:42 UTC (rev 199806)
</span><span class="lines">@@ -3,6 +3,16 @@
</span><span class="cx"> Add content animation tests to benchmark_runner, and allow the runner to collect device data as part of the results
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=156827
</span><span class="cx">
</span><ins>+ Add two files missing from the previous commit.
+
+ * Animation/css-animation.html: Added.
+ * Animation/raf-animation.html: Added.
+
+2016-04-20 Simon Fraser <simon.fraser@apple.com>
+
+ Add content animation tests to benchmark_runner, and allow the runner to collect device data as part of the results
+ https://bugs.webkit.org/show_bug.cgi?id=156827
+
</ins><span class="cx"> Reviewed by Stephanie Lewis.
</span><span class="cx">
</span><span class="cx"> Two new files for the content-animation suite.
</span></span></pre>
</div>
</div>
</body>
</html>