<!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>[179528] branches/safari-600.5-branch</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/179528">179528</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-02-02 16:58:11 -0800 (Mon, 02 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/178846">r178846</a>. rdar://problem/19670542</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6005branchChangeLog">branches/safari-600.5-branch/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6005branchManualTestsblurfiltertiminghtml">branches/safari-600.5-branch/ManualTests/blur-filter-timing.html</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#branchessafari6005branchPerformanceTestsInteractiveblurfiltertiminghtml">branches/safari-600.5-branch/PerformanceTests/Interactive/blur-filter-timing.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6005branchChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/ChangeLog (179527 => 179528)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/ChangeLog 2015-02-03 00:58:07 UTC (rev 179527)
+++ branches/safari-600.5-branch/ChangeLog 2015-02-03 00:58:11 UTC (rev 179528)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-01-21 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r177088.
+
+ 2014-12-10 Dean Jackson <dino@apple.com>
+
+ Blur filter performance test doesn't provide results
+ https://bugs.webkit.org/show_bug.cgi?id=139462
+
+ Reviewed by Sam Weinig.
+
+ This can't currently work under our performance test
+ infrastructure. Move it to a manual test to avoid
+ putting FAILures into the results.
+
+ * ManualTests/blur-filter-timing.html: Renamed from PerformanceTests/Interactive/blur-filter-timing.html.
+
</ins><span class="cx"> 2014-07-15 Ryuan Choi <ryuan.choi@samsung.com>
</span><span class="cx">
</span><span class="cx"> [CMAKE] ENABLE_ENCRYPTED_MEDIA_V2 should depend on ENABLE_VIDEO
</span></span></pre></div>
<a id="branchessafari6005branchManualTestsblurfiltertiminghtmlfromrev179527branchessafari6005branchPerformanceTestsInteractiveblurfiltertiminghtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.5-branch/ManualTests/blur-filter-timing.html (from rev 179527, branches/safari-600.5-branch/PerformanceTests/Interactive/blur-filter-timing.html) (0 => 179528)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/ManualTests/blur-filter-timing.html (rev 0)
+++ branches/safari-600.5-branch/ManualTests/blur-filter-timing.html 2015-02-03 00:58:11 UTC (rev 179528)
</span><span class="lines">@@ -0,0 +1,93 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <title>Timing test for blur filter</title>
+ <style>
+ img {
+ width: 600px;
+ height: 600px;
+ }
+ </style>
+ <script>
+
+ var WIDTH = 600;
+ var HEIGHT = 600;
+ var NUM_ITERATIONS = 10;
+ var MAX_RADIUS = 20;
+ var currentIteration = 0;
+ var currentRadius = 0;
+ var testIsRunning = false;
+ var image = null;
+ var startTime = null;
+
+ function init() {
+ document.querySelector("button").addEventListener("click", run, false);
+ image = document.querySelector("img");
+
+ // Fill the image with generated content. We can't use a canvas directly,
+ // since that gets composited.
+ var canvas = document.createElement("canvas");
+ canvas.width = WIDTH * window.devicePixelRatio;
+ canvas.height = HEIGHT * window.devicePixelRatio;
+
+ // Fill the canvas with some generated content.
+ var ctx = canvas.getContext("2d");
+ ctx.scale(window.devicePixelRatio, window.devicePixelRatio);
+
+ for (var i = 0; i < WIDTH; i += 20) {
+ for (var j = 0; j < HEIGHT; j += 20) {
+ ctx.fillStyle = "rgb(" + Math.round(i / WIDTH * 255) + ", " + Math.round(j / HEIGHT * 255) + ", " + (i % 40 ? 64 : 192) + ")";
+ ctx.fillRect(i, j, 20, 20);
+ }
+ }
+
+ image.src = canvas.toDataURL();
+ }
+
+ function run() {
+ if (testIsRunning)
+ return;
+
+ testIsRunning = true;
+ currentIteration = 0;
+ currentRadius = 0;
+ startTime = Date.now();
+
+ step();
+ }
+
+ function step() {
+ var usedRadius = (currentIteration % 2) ? (MAX_RADIUS - currentRadius) : currentRadius;
+ image.style.webkitFilter = "blur(" + usedRadius + "px)";
+ currentRadius++;
+ if (currentRadius > MAX_RADIUS) {
+ currentIteration++;
+ currentRadius = 0;
+ }
+
+ if (currentIteration < NUM_ITERATIONS)
+ setTimeout(step, 0);
+ else
+ end();
+ }
+
+ function end() {
+ testIsRunning = false;
+ var elapsedTime = (Date.now() - startTime) / 1000;
+ var result = document.createElement("p");
+ result.textContent = (NUM_ITERATIONS * MAX_RADIUS) + " blurs done in " + elapsedTime + " seconds";
+ document.body.appendChild(result);
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }
+
+ window.addEventListener("load", init, false);
+ </script>
+</head>
+<body>
+<img>
+<p>
+ <button>Start</button>
+</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6005branchPerformanceTestsInteractiveblurfiltertiminghtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-600.5-branch/PerformanceTests/Interactive/blur-filter-timing.html (179527 => 179528)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/PerformanceTests/Interactive/blur-filter-timing.html 2015-02-03 00:58:07 UTC (rev 179527)
+++ branches/safari-600.5-branch/PerformanceTests/Interactive/blur-filter-timing.html 2015-02-03 00:58:11 UTC (rev 179528)
</span><span class="lines">@@ -1,93 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
- <title>Timing test for blur filter</title>
- <style>
- img {
- width: 600px;
- height: 600px;
- }
- </style>
- <script>
-
- var WIDTH = 600;
- var HEIGHT = 600;
- var NUM_ITERATIONS = 10;
- var MAX_RADIUS = 20;
- var currentIteration = 0;
- var currentRadius = 0;
- var testIsRunning = false;
- var image = null;
- var startTime = null;
-
- function init() {
- document.querySelector("button").addEventListener("click", run, false);
- image = document.querySelector("img");
-
- // Fill the image with generated content. We can't use a canvas directly,
- // since that gets composited.
- var canvas = document.createElement("canvas");
- canvas.width = WIDTH * window.devicePixelRatio;
- canvas.height = HEIGHT * window.devicePixelRatio;
-
- // Fill the canvas with some generated content.
- var ctx = canvas.getContext("2d");
- ctx.scale(window.devicePixelRatio, window.devicePixelRatio);
-
- for (var i = 0; i < WIDTH; i += 20) {
- for (var j = 0; j < HEIGHT; j += 20) {
- ctx.fillStyle = "rgb(" + Math.round(i / WIDTH * 255) + ", " + Math.round(j / HEIGHT * 255) + ", " + (i % 40 ? 64 : 192) + ")";
- ctx.fillRect(i, j, 20, 20);
- }
- }
-
- image.src = canvas.toDataURL();
- }
-
- function run() {
- if (testIsRunning)
- return;
-
- testIsRunning = true;
- currentIteration = 0;
- currentRadius = 0;
- startTime = Date.now();
-
- step();
- }
-
- function step() {
- var usedRadius = (currentIteration % 2) ? (MAX_RADIUS - currentRadius) : currentRadius;
- image.style.webkitFilter = "blur(" + usedRadius + "px)";
- currentRadius++;
- if (currentRadius > MAX_RADIUS) {
- currentIteration++;
- currentRadius = 0;
- }
-
- if (currentIteration < NUM_ITERATIONS)
- setTimeout(step, 0);
- else
- end();
- }
-
- function end() {
- testIsRunning = false;
- var elapsedTime = (Date.now() - startTime) / 1000;
- var result = document.createElement("p");
- result.textContent = (NUM_ITERATIONS * MAX_RADIUS) + " blurs done in " + elapsedTime + " seconds";
- document.body.appendChild(result);
- if (window.testRunner)
- testRunner.notifyDone();
- }
-
- window.addEventListener("load", init, false);
- </script>
-</head>
-<body>
-<img>
-<p>
- <button>Start</button>
-</p>
-</body>
-</html>
</del></span></pre>
</div>
</div>
</body>
</html>