<!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>[199328] 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/199328">199328</a></dd>
<dt>Author</dt> <dd>jonlee@apple.com</dd>
<dt>Date</dt> <dd>2016-04-11 19:12:23 -0700 (Mon, 11 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update Animometer to accommodate different screens
https://bugs.webkit.org/show_bug.cgi?id=156449
Reviewed by Darin Adler.
Provisionally reviewed by Said Abou-Hallawa.
* Animometer/index.html: Wrap button in a container to add padding at the bottom.
* Animometer/resources/debug-runner/animometer.css:
(@media screen and (min-device-width: 1800px)): Deleted.
(@media screen and (min-width: 1800px)): Cannot use min-device-width since it may match incorrectly.
(screen and (max-device-height: 414px) and (orientation: landscape)): Some devices swap device width
and height with orientation change.
* Animometer/resources/runner/animometer.css: Similar.
(screen and (min-device-width: 1024px) and (orientation: landscape)):
(screen and (max-device-height: 414px) and (orientation: landscape)):
(.frame-container): On smaller iPhones, adding 1px prevents the navigation bars from appearing.
(@media screen and (min-device-width: 768px) and (max-device-width: 1024px)): Deleted.
(@media (min-device-height: 768px) and (max-device-height: 1024px)): Target iPad Airs and similar.
(@media screen and (min-device-width: 1024px) and (max-device-width: 1366px)): Deleted.
(@media screen and (max-device-width: 1024px) and (min-device-height: 1366px)): Target iPad Pro.
(#results footer): Add padding below the button for testing again.
* Animometer/tests/master/multiply.html: Remove the center text.
* Animometer/tests/master/resources/text.js: Update the test so that in every frame the text moves.
* Animometer/tests/master/text.html: Update the text sizing depending on the size of the device.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkPerformanceTestsAnimometerindexhtml">trunk/PerformanceTests/Animometer/index.html</a></li>
<li><a href="#trunkPerformanceTestsAnimometerresourcesdebugrunneranimometercss">trunk/PerformanceTests/Animometer/resources/debug-runner/animometer.css</a></li>
<li><a href="#trunkPerformanceTestsAnimometerresourcesrunneranimometercss">trunk/PerformanceTests/Animometer/resources/runner/animometer.css</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsmastermultiplyhtml">trunk/PerformanceTests/Animometer/tests/master/multiply.html</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsmasterresourcestextjs">trunk/PerformanceTests/Animometer/tests/master/resources/text.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsmastertexthtml">trunk/PerformanceTests/Animometer/tests/master/text.html</a></li>
<li><a href="#trunkPerformanceTestsChangeLog">trunk/PerformanceTests/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkPerformanceTestsAnimometerindexhtml"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/index.html (199327 => 199328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/index.html 2016-04-12 01:32:15 UTC (rev 199327)
+++ trunk/PerformanceTests/Animometer/index.html 2016-04-12 02:12:23 UTC (rev 199328)
</span><span class="lines">@@ -35,7 +35,9 @@
</span><span class="cx"> <table id="results-score"></table>
</span><span class="cx"> <table id="results-header"></table>
</span><span class="cx"> </div>
</span><del>- <button onclick="benchmarkController.startBenchmark()">Test Again</button>
</del><ins>+ <footer>
+ <button onclick="benchmarkController.startBenchmark()">Test Again</button>
+ </footer>
</ins><span class="cx"> </section>
</span><span class="cx"> <hr>
</span><span class="cx"> </main>
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometerresourcesdebugrunneranimometercss"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/resources/debug-runner/animometer.css (199327 => 199328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/resources/debug-runner/animometer.css 2016-04-12 01:32:15 UTC (rev 199327)
+++ trunk/PerformanceTests/Animometer/resources/debug-runner/animometer.css 2016-04-12 02:12:23 UTC (rev 199328)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> background-color: rgba(255, 255, 255, .2);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@media screen and (min-device-width: 1800px) {
</del><ins>+@media screen and (min-width: 1800px) {
</ins><span class="cx"> section {
</span><span class="cx"> width: 1600px;
</span><span class="cx"> height: 800px;
</span><span class="lines">@@ -107,7 +107,8 @@
</span><span class="cx"> margin-left: 2em;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@media screen and (max-device-width: 414px) {
</del><ins>+@media screen and (max-device-width: 414px),
+ screen and (max-device-height: 414px) and (orientation: landscape) {
</ins><span class="cx"> .tree {
</span><span class="cx"> padding-left: 1em;
</span><span class="cx"> }
</span><span class="lines">@@ -236,7 +237,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@media screen and (max-device-width: 414px) {
</del><ins>+@media screen and (max-device-width: 414px),
+ screen and (max-device-height: 414px) and (orientation: landscape) {
</ins><span class="cx"> #intro {
</span><span class="cx"> min-height: 100%;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometerresourcesrunneranimometercss"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/resources/runner/animometer.css (199327 => 199328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/resources/runner/animometer.css 2016-04-12 01:32:15 UTC (rev 199327)
+++ trunk/PerformanceTests/Animometer/resources/runner/animometer.css 2016-04-12 02:12:23 UTC (rev 199328)
</span><span class="lines">@@ -54,7 +54,6 @@
</span><span class="cx"> flex: 0 0 auto;
</span><span class="cx"> display: block;
</span><span class="cx"> font-size: 1.5em;
</span><del>- margin-bottom: 10vh;
</del><span class="cx"> border: 2px solid rgb(96, 96, 96);
</span><span class="cx"> color: rgb(96, 96, 96);
</span><span class="cx"> background: transparent;
</span><span class="lines">@@ -77,7 +76,8 @@
</span><span class="cx"> color: rgba(96, 96, 96, .5);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@media screen and (min-device-width: 768px) {
</del><ins>+@media screen and (min-device-height: 1024px),
+ screen and (min-device-width: 1024px) and (orientation: landscape) {
</ins><span class="cx"> section {
</span><span class="cx"> padding: 0 20px;
</span><span class="cx"> }
</span><span class="lines">@@ -90,7 +90,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@media screen and (max-device-width: 414px) {
</del><ins>+@media screen and (max-device-width: 414px),
+ screen and (max-device-height: 414px) and (orientation: landscape) {
</ins><span class="cx"> h1 {
</span><span class="cx"> font-size: 2.5em;
</span><span class="cx"> }
</span><span class="lines">@@ -136,14 +137,16 @@
</span><span class="cx"> margin: 0 auto;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@media screen and (min-device-width: 768px) {
</del><ins>+@media screen and (min-device-height: 1024px),
+ screen and (min-device-width: 1024px) and (orientation: landscape) {
</ins><span class="cx"> #intro p {
</span><span class="cx"> max-width: 800px;
</span><span class="cx"> margin: 0;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@media screen and (max-device-width: 414px) {
</del><ins>+@media screen and (max-device-width: 414px),
+ screen and (max-device-height: 414px) and (orientation: landscape) {
</ins><span class="cx"> #intro.selected {
</span><span class="cx"> display: flex;
</span><span class="cx"> align-items: center;
</span><span class="lines">@@ -173,14 +176,15 @@
</span><span class="cx"> margin: 0 auto;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@media screen and (max-device-width: 414px) {
</del><ins>+@media screen and (max-device-width: 414px),
+ screen and (max-device-height: 414px) and (orientation: landscape) {
</ins><span class="cx"> #test-container {
</span><span class="cx"> padding: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .frame-container {
</span><span class="cx"> width: 100%;
</span><del>- height: 100%;
</del><ins>+ height: calc(100% + 1px);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .frame-container > iframe {
</span><span class="lines">@@ -189,14 +193,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@media screen and (min-device-width: 768px) and (max-device-width: 1024px) {
</del><ins>+@media (min-device-height: 768px) and (max-device-height: 1024px) {
</ins><span class="cx"> .frame-container > iframe {
</span><span class="cx"> width: 900px;
</span><span class="cx"> height: 600px;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@media screen and (min-device-width: 1024px) and (max-device-width: 1366px) {
</del><ins>+@media screen and (max-device-width: 1024px) and (min-device-height: 1366px) {
</ins><span class="cx"> .frame-container > iframe {
</span><span class="cx"> width: 1200px;
</span><span class="cx"> height: 800px;
</span><span class="lines">@@ -258,8 +262,12 @@
</span><span class="cx"> #results-score td, #results-score th {
</span><span class="cx"> text-align: right;
</span><span class="cx"> }
</span><ins>+#results footer {
+ padding-bottom: 10vh;
+}
</ins><span class="cx">
</span><del>-@media screen and (max-device-width: 414px) {
</del><ins>+@media screen and (max-device-width: 414px),
+ screen and (max-device-height: 414px) and (orientation: landscape) {
</ins><span class="cx"> #results.selected {
</span><span class="cx"> padding: 0 20px;
</span><span class="cx"> display: flex;
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsmastermultiplyhtml"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/master/multiply.html (199327 => 199328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/master/multiply.html 2016-04-12 01:32:15 UTC (rev 199327)
+++ trunk/PerformanceTests/Animometer/tests/master/multiply.html 2016-04-12 02:12:23 UTC (rev 199328)
</span><span class="lines">@@ -38,17 +38,10 @@
</span><span class="cx"> border-bottom-right-radius: 100%;
</span><span class="cx"> border-top-left-radius: 100%;
</span><span class="cx"> }
</span><del>-
- #center-text {
- color: #FFF;
- font-size: 2em;
- font-weight: 200;
- }
</del><span class="cx"> </style>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <div id="stage">
</span><del>- <span id="center-text">multiply</span>
</del><span class="cx"> </div>
</span><span class="cx"> <script src="../../resources/strings.js"></script>
</span><span class="cx"> <script src="../../resources/extensions.js"></script>
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsmasterresourcestextjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/master/resources/text.js (199327 => 199328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/master/resources/text.js 2016-04-12 01:32:15 UTC (rev 199327)
+++ trunk/PerformanceTests/Animometer/tests/master/resources/text.js 2016-04-12 02:12:23 UTC (rev 199328)
</span><span class="lines">@@ -71,13 +71,14 @@
</span><span class="cx"> animate: function(timeDelta) {
</span><span class="cx"> var angle = Stage.dateCounterValue(this.millisecondsPerRotation);
</span><span class="cx">
</span><del>- var x = 0;
- var y = 0;
</del><span class="cx"> var progress = 0;
</span><span class="cx"> var stepX = Math.sin(angle) * this.particleDistanceX;
</span><span class="cx"> var stepY = Math.cos(angle) * this.particleDistanceY;
</span><ins>+ var x = -stepX * 3;
+ var y = -stepY * 3;
</ins><span class="cx"> var gradient = this.gradients[Math.floor(angle/(Math.PI * 2)) % this.gradients.length];
</span><span class="cx"> var offset = Stage.dateCounterValue(200);
</span><ins>+ this._template.style.transform = "translate(" + Math.floor(x) + "px," + Math.floor(y) + "px)";
</ins><span class="cx"> for (var i = 0; i < this._offsetIndex; ++i) {
</span><span class="cx"> var element = this.testElements[i];
</span><span class="cx">
</span><span class="lines">@@ -91,7 +92,7 @@
</span><span class="cx">
</span><span class="cx"> x += stepX;
</span><span class="cx"> y += stepY;
</span><del>- element.style.transform = "translateX(" + Math.floor(x) + "px) translateY(" + Math.floor(y) + "px)";
</del><ins>+ element.style.transform = "translate(" + Math.floor(x) + "px," + Math.floor(y) + "px)";
</ins><span class="cx">
</span><span class="cx"> progress += this._stepProgress;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsmastertexthtml"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/master/text.html (199327 => 199328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/master/text.html 2016-04-12 01:32:15 UTC (rev 199327)
+++ trunk/PerformanceTests/Animometer/tests/master/text.html 2016-04-12 02:12:23 UTC (rev 199328)
</span><span class="lines">@@ -10,16 +10,29 @@
</span><span class="cx"> font-size: 48px;
</span><span class="cx"> background-color: #313534;/* #d1948c;*/
</span><span class="cx"> }
</span><del>- @media screen and (max-device-width: 414px) {
</del><ins>+ @media (min-device-height: 768px) and (max-device-height: 1024px) {
</ins><span class="cx"> #stage {
</span><ins>+ font-size: 40px;
+ }
+ }
+ @media screen and (max-device-width: 414px),
+ screen and (max-device-height: 414px) and (orientation: landscape) {
+ #stage {
</ins><span class="cx"> font-size: 36px;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- @media screen and (max-device-width: 320px) {
</del><ins>+ @media screen and (max-device-width: 375px),
+ screen and (max-device-height: 375px) and (orientation: landscape) {
</ins><span class="cx"> #stage {
</span><del>- font-size: 24px;
</del><ins>+ font-size: 30px;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ @media screen and (max-device-width: 320px),
+ screen and (max-device-height: 320px) and (orientation: landscape) {
+ #stage {
+ font-size: 28px;
+ }
+ }
</ins><span class="cx">
</span><span class="cx"> #stage div {
</span><span class="cx"> width: 80%;
</span></span></pre></div>
<a id="trunkPerformanceTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/ChangeLog (199327 => 199328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/ChangeLog 2016-04-12 01:32:15 UTC (rev 199327)
+++ trunk/PerformanceTests/ChangeLog 2016-04-12 02:12:23 UTC (rev 199328)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-04-09 Jon Lee <jonlee@apple.com>
+
+ Update Animometer to accommodate different screens
+ https://bugs.webkit.org/show_bug.cgi?id=156449
+
+ Reviewed by Darin Adler.
+ Provisionally reviewed by Said Abou-Hallawa.
+
+ * Animometer/index.html: Wrap button in a container to add padding at the bottom.
+ * Animometer/resources/debug-runner/animometer.css:
+ (@media screen and (min-device-width: 1800px)): Deleted.
+ (@media screen and (min-width: 1800px)): Cannot use min-device-width since it may match incorrectly.
+ (screen and (max-device-height: 414px) and (orientation: landscape)): Some devices swap device width
+ and height with orientation change.
+ * Animometer/resources/runner/animometer.css: Similar.
+ (screen and (min-device-width: 1024px) and (orientation: landscape)):
+ (screen and (max-device-height: 414px) and (orientation: landscape)):
+ (.frame-container): On smaller iPhones, adding 1px prevents the navigation bars from appearing.
+ (@media screen and (min-device-width: 768px) and (max-device-width: 1024px)): Deleted.
+ (@media (min-device-height: 768px) and (max-device-height: 1024px)): Target iPad Airs and similar.
+ (@media screen and (min-device-width: 1024px) and (max-device-width: 1366px)): Deleted.
+ (@media screen and (max-device-width: 1024px) and (min-device-height: 1366px)): Target iPad Pro.
+ (#results footer): Add padding below the button for testing again.
+ * Animometer/tests/master/multiply.html: Remove the center text.
+ * Animometer/tests/master/resources/text.js: Update the test so that in every frame the text moves.
+ * Animometer/tests/master/text.html: Update the text sizing depending on the size of the device.
+
</ins><span class="cx"> 2016-04-08 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><span class="cx"> Have Animometer benchmark always start with complexity of 1
</span></span></pre>
</div>
</div>
</body>
</html>