<!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>[199805] 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/199805">199805</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-04-20 21:56:57 -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
PerformanceTests:
Reviewed by Stephanie Lewis.
Two new files for the content-animation suite.
After patching for use in the benchmark, these tests are a little different to other benchmarks.
The test content itself does not collect performance data; the tests spit out a boilerplate JSON
result with a placeholder for framerate, which is collected in native code.
When run as a benchmark, test completion involves a couple of bounces between the test and MobileSafari.
Test completion is initiated by a setTimeout() in the test, at which point location.hash is set to "#done".
MobileSafari detects that, and asynchronously dumps performance data. Once this is complete, MobileSafari
changes the URL has to "#submit", which triggers the XHR to the test relay that indicates the test is
complete.
* Animation/css-animation.html: Added.
* Animation/raf-animation.html: Added.
Tools:
rdar://problem/24358135
Reviewed by Stephanie Lewis.
Enhance benchmark_runner so that a benchmark can load a set of tests sequentially,
and collate results across them. Also add the ability for the browser_driver to supply
additional results, allowing for tests that collect results data in native code, rather
than generating it in the web page.
Add a set of "content animation" tests that use this new functionality, which test
CSS animation and requestAnimationFrame performance.
'plan' files have two new optional keys:
'test_files': a list of files to run as a suite
'options': optional parameters. Currently supports one new option,
'animation_command', which affects the way that iOS tests are run,
and is passed to MobileSafari as a parameter on launch.
* Scripts/webkitpy/benchmark_runner/benchmark_runner.py:
(BenchmarkRunner.__init__): If options is not specified in the plan file, set it to an empty dictionary.
(BenchmarkRunner._get_result): Allow the browser_driver to modify the test results.
(BenchmarkRunner):
(BenchmarkRunner._run_one_test): Factored out of _run_benchmark, this contains logic for
running a single test. It starts and stops the http_server_driver.
(BenchmarkRunner._run_benchmark): Run a test in the traditional way if the plan has an 'entry_point'
key, otherwise look for the new 'test_files' and load each in a loop.
(BenchmarkRunner._dump):
* Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py:
(BrowserDriver.launch_url): Pass options.
(BrowserDriver.add_additional_results): Allow a driver to supply additional results.
(BrowserDriver):
* Scripts/webkitpy/benchmark_runner/browser_driver/gtk_minibrowser_driver.py:
(GTKMiniBrowserDriver.launch_url):
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py:
(OSXBrowserDriver.close_browsers):
(OSXBrowserDriver._terminate_processes): Fix spelling mistake.
(OSXBrowserDriver._terminiate_processes): Deleted.
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py:
(OSXChromeDriver.launch_url):
(OSXChromeCanaryDriver.launch_url):
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py:
(OSXFirefoxDriver.launch_url):
(OSXFirefoxNightlyDriver.launch_url):
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
(OSXSafariDriver.launch_url):
* Scripts/webkitpy/benchmark_runner/data/patches/ContentAnimation.patch: Added.
* Scripts/webkitpy/benchmark_runner/data/plans/content-animation.plan: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkPerformanceTestsChangeLog">trunk/PerformanceTests/ChangeLog</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbenchmark_runnerpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverbrowser_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_drivergtk_minibrowser_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/gtk_minibrowser_driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_browser_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_chrome_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_firefox_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_safari_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<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="trunkPerformanceTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/ChangeLog (199804 => 199805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/ChangeLog 2016-04-21 04:42:17 UTC (rev 199804)
+++ trunk/PerformanceTests/ChangeLog 2016-04-21 04:56:57 UTC (rev 199805)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+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
+
+ Reviewed by Stephanie Lewis.
+
+ Two new files for the content-animation suite.
+
+ After patching for use in the benchmark, these tests are a little different to other benchmarks.
+ The test content itself does not collect performance data; the tests spit out a boilerplate JSON
+ result with a placeholder for framerate, which is collected in native code.
+
+ When run as a benchmark, test completion involves a couple of bounces between the test and MobileSafari.
+ Test completion is initiated by a setTimeout() in the test, at which point location.hash is set to "#done".
+ MobileSafari detects that, and asynchronously dumps performance data. Once this is complete, MobileSafari
+ changes the URL has to "#submit", which triggers the XHR to the test relay that indicates the test is
+ complete.
+
+ * Animation/css-animation.html: Added.
+ * Animation/raf-animation.html: Added.
+
</ins><span class="cx"> 2016-04-15 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><span class="cx"> Animometer test could report a NaN
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (199804 => 199805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-04-21 04:42:17 UTC (rev 199804)
+++ trunk/Tools/ChangeLog 2016-04-21 04:56:57 UTC (rev 199805)
</span><span class="lines">@@ -1,3 +1,55 @@
</span><ins>+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
+ rdar://problem/24358135
+
+ Reviewed by Stephanie Lewis.
+
+ Enhance benchmark_runner so that a benchmark can load a set of tests sequentially,
+ and collate results across them. Also add the ability for the browser_driver to supply
+ additional results, allowing for tests that collect results data in native code, rather
+ than generating it in the web page.
+
+ Add a set of "content animation" tests that use this new functionality, which test
+ CSS animation and requestAnimationFrame performance.
+
+ 'plan' files have two new optional keys:
+ 'test_files': a list of files to run as a suite
+ 'options': optional parameters. Currently supports one new option,
+ 'animation_command', which affects the way that iOS tests are run,
+ and is passed to MobileSafari as a parameter on launch.
+
+ * Scripts/webkitpy/benchmark_runner/benchmark_runner.py:
+ (BenchmarkRunner.__init__): If options is not specified in the plan file, set it to an empty dictionary.
+ (BenchmarkRunner._get_result): Allow the browser_driver to modify the test results.
+ (BenchmarkRunner):
+ (BenchmarkRunner._run_one_test): Factored out of _run_benchmark, this contains logic for
+ running a single test. It starts and stops the http_server_driver.
+ (BenchmarkRunner._run_benchmark): Run a test in the traditional way if the plan has an 'entry_point'
+ key, otherwise look for the new 'test_files' and load each in a loop.
+ (BenchmarkRunner._dump):
+ * Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py:
+ (BrowserDriver.launch_url): Pass options.
+ (BrowserDriver.add_additional_results): Allow a driver to supply additional results.
+ (BrowserDriver):
+ * Scripts/webkitpy/benchmark_runner/browser_driver/gtk_minibrowser_driver.py:
+ (GTKMiniBrowserDriver.launch_url):
+ * Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py:
+ (OSXBrowserDriver.close_browsers):
+ (OSXBrowserDriver._terminate_processes): Fix spelling mistake.
+ (OSXBrowserDriver._terminiate_processes): Deleted.
+ * Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py:
+ (OSXChromeDriver.launch_url):
+ (OSXChromeCanaryDriver.launch_url):
+ * Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py:
+ (OSXFirefoxDriver.launch_url):
+ (OSXFirefoxNightlyDriver.launch_url):
+ * Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
+ (OSXSafariDriver.launch_url):
+ * Scripts/webkitpy/benchmark_runner/data/patches/ContentAnimation.patch: Added.
+ * Scripts/webkitpy/benchmark_runner/data/plans/content-animation.plan: Added.
+
</ins><span class="cx"> 2016-04-20 Dustin Falgout <dustin@falgout.us>
</span><span class="cx">
</span><span class="cx"> [GTK] Expose AllowUniversalAccessFromFileURLs preference now that calling localStorage.getItem() results in SecurityError: DOM Exception 18
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbenchmark_runnerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py (199804 => 199805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py 2016-04-21 04:42:17 UTC (rev 199804)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py 2016-04-21 04:56:57 UTC (rev 199805)
</span><span class="lines">@@ -30,6 +30,8 @@
</span><span class="cx"> with open(plan_file, 'r') as fp:
</span><span class="cx"> self._plan_name = os.path.split(os.path.splitext(plan_file)[0])[1]
</span><span class="cx"> self._plan = json.load(fp)
</span><ins>+ if not 'options' in self._plan:
+ self._plan['options'] = {}
</ins><span class="cx"> if local_copy:
</span><span class="cx"> self._plan['local_copy'] = local_copy
</span><span class="cx"> if count_override:
</span><span class="lines">@@ -59,26 +61,53 @@
</span><span class="cx"> return absPath
</span><span class="cx"> return plan_file
</span><span class="cx">
</span><ins>+ def _get_result(self, test_url):
+ result = self._browser_driver.add_additional_results(test_url, self._http_server_driver.fetch_result())
+ assert(not self._http_server_driver.get_return_code())
+ return result
+
+ def _run_one_test(self, web_root, test_file):
+ result = None
+ try:
+ self._http_server_driver.serve(web_root)
+ url = urlparse.urljoin(self._http_server_driver.base_url(), self._plan_name + '/' + test_file)
+ self._browser_driver.launch_url(url, self._plan['options'], self._build_dir)
+ with timeout(self._plan['timeout']):
+ result = self._get_result(url)
+ finally:
+ self._browser_driver.close_browsers()
+ self._http_server_driver.kill_server()
+
+ return result
+
</ins><span class="cx"> def _run_benchmark(self, count, web_root):
</span><span class="cx"> results = []
</span><span class="cx"> for iteration in xrange(1, count + 1):
</span><span class="cx"> _log.info('Start the iteration {current_iteration} of {iterations} for current benchmark'.format(current_iteration=iteration, iterations=count))
</span><span class="cx"> try:
</span><del>- result = None
- self._http_server_driver.serve(web_root)
</del><span class="cx"> self._browser_driver.prepare_env(self._device_id)
</span><del>- url = urlparse.urljoin(self._http_server_driver.base_url(), self._plan_name + '/' + self._plan['entry_point'])
- self._browser_driver.launch_url(url, self._build_dir)
- with timeout(self._plan['timeout']):
- result = self._http_server_driver.fetch_result()
- assert(not self._http_server_driver.get_return_code())
</del><ins>+
+ if 'entry_point' in self._plan:
+ result = self._run_one_test(web_root, self._plan['entry_point'])
</ins><span class="cx"> assert(result)
</span><span class="cx"> results.append(json.loads(result))
</span><ins>+ elif 'test_files' in self._plan:
+ run_result = {}
+ for test in self._plan['test_files']:
+ result = self._run_one_test(web_root, test)
+ assert(result)
+ run_result = self._merge(run_result, json.loads(result))
+
+ results.append(run_result)
+ else:
+ raise Exception('Plan does not contain entry_point or test_files')
+
</ins><span class="cx"> finally:
</span><span class="cx"> self._browser_driver.restore_env()
</span><span class="cx"> self._browser_driver.close_browsers()
</span><del>- self._http_server_driver.kill_server()
</del><ins>+
</ins><span class="cx"> _log.info('End the iteration {current_iteration} of {iterations} for current benchmark'.format(current_iteration=iteration, iterations=count))
</span><ins>+
</ins><span class="cx"> results = self._wrap(results)
</span><span class="cx"> self._dump(results, self._output_file if self._output_file else self._plan['output_file'])
</span><span class="cx"> self.show_results(results, self._scale_unit)
</span><span class="lines">@@ -89,7 +118,7 @@
</span><span class="cx">
</span><span class="cx"> @classmethod
</span><span class="cx"> def _dump(cls, results, output_file):
</span><del>- _log.info('Dumping the results to file')
</del><ins>+ _log.info('Dumping the results to file {output_file}'.format(output_file=output_file))
</ins><span class="cx"> try:
</span><span class="cx"> with open(output_file, 'w') as fp:
</span><span class="cx"> json.dump(results, fp)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverbrowser_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py (199804 => 199805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py 2016-04-21 04:42:17 UTC (rev 199804)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py 2016-04-21 04:56:57 UTC (rev 199805)
</span><span class="lines">@@ -13,10 +13,14 @@
</span><span class="cx"> pass
</span><span class="cx">
</span><span class="cx"> @abstractmethod
</span><del>- def launch_url(self, url, browser_build_path=None):
</del><ins>+ def launch_url(self, url, options, browser_build_path=None):
</ins><span class="cx"> pass
</span><span class="cx">
</span><span class="cx"> @abstractmethod
</span><ins>+ def add_additional_results(self, test_url, results):
+ return results
+
+ @abstractmethod
</ins><span class="cx"> def close_browsers(self):
</span><span class="cx"> pass
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_drivergtk_minibrowser_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/gtk_minibrowser_driver.py (199804 => 199805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/gtk_minibrowser_driver.py 2016-04-21 04:42:17 UTC (rev 199804)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/gtk_minibrowser_driver.py 2016-04-21 04:56:57 UTC (rev 199805)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> self._minibrowser_process = None
</span><span class="cx"> super(GTKMiniBrowserDriver, self).prepare_env(device_id)
</span><span class="cx">
</span><del>- def launch_url(self, url, browser_build_path):
</del><ins>+ def launch_url(self, url, options, browser_build_path):
</ins><span class="cx"> args = ['Tools/Scripts/run-minibrowser', '--gtk']
</span><span class="cx"> args.append("--geometry=%sx%s" % (self._screen_size().width, self._screen_size().height))
</span><span class="cx"> args.append(url)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_browser_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py (199804 => 199805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py 2016-04-21 04:42:17 UTC (rev 199804)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py 2016-04-21 04:56:57 UTC (rev 199805)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> pass
</span><span class="cx">
</span><span class="cx"> def close_browsers(self):
</span><del>- self._terminiate_processes(self.process_name)
</del><ins>+ self._terminate_processes(self.process_name)
</ins><span class="cx">
</span><span class="cx"> @classmethod
</span><span class="cx"> def _launch_process(cls, build_dir, app_name, url, args):
</span><span class="lines">@@ -37,8 +37,8 @@
</span><span class="cx"> cls._launch_process_with_caffinate(args)
</span><span class="cx">
</span><span class="cx"> @classmethod
</span><del>- def _terminiate_processes(cls, process_name):
- _log.info('Closing all terminating all processes with name %s' % process_name)
</del><ins>+ def _terminate_processes(cls, process_name):
+ _log.info('Closing all processes with name %s' % process_name)
</ins><span class="cx"> subprocess.call(['/usr/bin/killall', process_name])
</span><span class="cx">
</span><span class="cx"> @classmethod
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_chrome_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py (199804 => 199805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py 2016-04-21 04:42:17 UTC (rev 199804)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py 2016-04-21 04:56:57 UTC (rev 199805)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> process_name = 'Google Chrome'
</span><span class="cx"> browser_name = 'chrome'
</span><span class="cx">
</span><del>- def launch_url(self, url, browser_build_path):
</del><ins>+ def launch_url(self, url, options, browser_build_path):
</ins><span class="cx"> self._launch_process(build_dir=browser_build_path, app_name='Google Chrome.app', url=url, args=['--args', '--homepage', url, '--window-size={width},{height}'.format(width=int(self._screen_size().width), height=int(self._screen_size().height))])
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -23,5 +23,5 @@
</span><span class="cx"> process_name = 'Google Chrome Canary'
</span><span class="cx"> browser_name = 'chrome-canary'
</span><span class="cx">
</span><del>- def launch_url(self, url, browser_build_path):
</del><ins>+ def launch_url(self, url, options, browser_build_path):
</ins><span class="cx"> self._launch_process(build_dir=browser_build_path, app_name='Google Chrome Canary.app', url=url, args=['--args', '--homepage', url, '--window-size={width},{height}'.format(width=int(self._screen_size().width), height=int(self._screen_size().height))])
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_firefox_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py (199804 => 199805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py 2016-04-21 04:42:17 UTC (rev 199804)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py 2016-04-21 04:56:57 UTC (rev 199805)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> process_name = 'firefox'
</span><span class="cx"> browser_name = 'firefox'
</span><span class="cx">
</span><del>- def launch_url(self, url, browser_build_path):
</del><ins>+ def launch_url(self, url, options, browser_build_path):
</ins><span class="cx"> self._launch_process(build_dir=browser_build_path, app_name='Firefox.app', url=url, args=[url, '--args', '-width', str(int(self._screen_size().width)), '-height', str(int(self._screen_size().height))])
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -23,5 +23,5 @@
</span><span class="cx"> process_name = 'firefox'
</span><span class="cx"> browser_name = 'firefox-nightly'
</span><span class="cx">
</span><del>- def launch_url(self, url, browser_build_path):
</del><ins>+ def launch_url(self, url, options, browser_build_path):
</ins><span class="cx"> self._launch_process(build_dir=browser_build_path, app_name='FirefoxNightly.app', url=url, args=[url, '--args', '-width', str(int(self._screen_size().width)), '-height', str(int(self._screen_size().height))])
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_safari_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py (199804 => 199805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py 2016-04-21 04:42:17 UTC (rev 199804)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py 2016-04-21 04:56:57 UTC (rev 199805)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> self._maximize_window()
</span><span class="cx"> self._safari_preferences = ["-HomePage", "about:blank", "-WarnAboutFraudulentWebsites", "0", "-ExtensionsEnabled", "0", "-ShowStatusBar", "0", "-NewWindowBehavior", "1", "-NewTabBehavior", "1"]
</span><span class="cx">
</span><del>- def launch_url(self, url, browser_build_path):
</del><ins>+ def launch_url(self, url, options, browser_build_path):
</ins><span class="cx"> args = ['/Applications/Safari.app/Contents/MacOS/Safari']
</span><span class="cx"> env = {}
</span><span class="cx"> if browser_build_path:
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerdatapatchesContentAnimationpatch"></a>
<div class="addfile"><h4>Added: trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/ContentAnimation.patch (0 => 199805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/ContentAnimation.patch (rev 0)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/ContentAnimation.patch 2016-04-21 04:56:57 UTC (rev 199805)
</span><span class="lines">@@ -0,0 +1,118 @@
</span><ins>+diff --git a/PerformanceTests/Animation/css-animation.html b/PerformanceTests/Animation/css-animation.html
+index adae19cb018ed1ca93fd6b4cda80002348482fc3..8f1e29933faa13586dbf97b7874024854fbf2147 100644
+--- a/PerformanceTests/Animation/css-animation.html
++++ b/PerformanceTests/Animation/css-animation.html
+@@ -167,9 +167,54 @@
+ function setupAnimation()
+ {
+ makeParticles();
++
++ window.setTimeout(function() {
++ location.hash = 'done';
++ }, 10000)
++ }
++
++ function hashChanged()
++ {
++ if (location.hash === '#submit')
++ submitResults();
++ }
++
++ function submitResults()
++ {
++ var results = {
++ 'content-animation' : {
++ 'metrics' : {
++ 'FrameRate' : ['Arithmetic']
++ },
++ 'tests' : {
++ 'css-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);
+ }
+
+ window.addEventListener('load', setupAnimation, false);
++ window.addEventListener("hashchange", hashChanged, false);
+ </script>
+ </head>
+ <body>
+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
+@@ -195,9 +195,54 @@
+ {
+ makeParticles();
+ animate();
++
++ window.setTimeout(function() {
++ location.hash = 'done';
++ }, 10000)
++ }
++
++ function hashChanged()
++ {
++ if (location.hash === '#submit')
++ submitResults();
+ }
+
++ function submitResults()
++ {
++ var results = {
++ 'content-animation' : {
++ 'metrics' : {
++ 'FrameRate' : ['Arithmetic']
++ },
++ 'tests' : {
++ 'raf-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);
++ }
++
+ window.addEventListener('load', setupAnimation, false);
++ window.addEventListener("hashchange", hashChanged, false);
+ </script>
+ </head>
+ <body>
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerdataplanscontentanimationplan"></a>
<div class="addfile"><h4>Added: trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/content-animation.plan (0 => 199805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/content-animation.plan (rev 0)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/content-animation.plan 2016-04-21 04:56:57 UTC (rev 199805)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+{
+ "timeout": 120,
+ "count": 5,
+ "svn_source": "https://svn.webkit.org/repository/webkit/trunk/PerformanceTests/Animometer/@r<TBD>",
+ "test_files": [
+ "css-animation.html",
+ "raf-animation.html"
+ ],
+ "output_file": "css-animation.result",
+ "options": {
+ "animation_command": "ContentAnimation"
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>