<!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>[185483] 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/185483">185483</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-11 19:16:28 -0700 (Thu, 11 Jun 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Move cursor to corner and fix safari window size before running benchmark
https://bugs.webkit.org/show_bug.cgi?id=145858

Patch by Dewei Zhu &lt;dewei_zhu@apple.com&gt; on 2015-06-11
Reviewed by Ryosuke Niwa

* Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py:
(OSXBrowserDriver.prepareEnv):
(OSXBrowserDriver):
(OSXBrowserDriver.moveCursor):
(OSXBrowserDriver.getScreenSize):
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py:
(OSXChromeDriver.launchUrl):
(OSXChromeCanaryDriver.launchUrl):
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py:
(OSXFirefoxDriver.launchUrl):
(OSXFirefoxNightlyDriver.launchUrl):
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
(OSXSafariDriver.prepareEnv):
(OSXSafariDriver):
(OSXSafariDriver.maximizeWindow):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</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>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (185482 => 185483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2015-06-12 01:46:42 UTC (rev 185482)
+++ trunk/Tools/ChangeLog        2015-06-12 02:16:28 UTC (rev 185483)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-06-11  Dewei Zhu  &lt;dewei_zhu@apple.com&gt;
+
+        Move cursor to corner and fix safari window size before running benchmark
+        https://bugs.webkit.org/show_bug.cgi?id=145858
+
+        Reviewed by Ryosuke Niwa
+
+        * Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py:
+        (OSXBrowserDriver.prepareEnv):
+        (OSXBrowserDriver):
+        (OSXBrowserDriver.moveCursor):
+        (OSXBrowserDriver.getScreenSize):
+        * Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py:
+        (OSXChromeDriver.launchUrl):
+        (OSXChromeCanaryDriver.launchUrl):
+        * Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py:
+        (OSXFirefoxDriver.launchUrl):
+        (OSXFirefoxNightlyDriver.launchUrl):
+        * Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
+        (OSXSafariDriver.prepareEnv):
+        (OSXSafariDriver):
+        (OSXSafariDriver.maximizeWindow):
+
</ins><span class="cx"> 2015-06-11  Daniel Bates  &lt;dabates@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [iOS] Cannot run run-webkit-tests with public SDK; LayoutTestRelay fails to build
</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 (185482 => 185483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py        2015-06-12 01:46:42 UTC (rev 185482)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py        2015-06-12 02:16:28 UTC (rev 185483)
</span><span class="lines">@@ -4,6 +4,12 @@
</span><span class="cx"> import subprocess
</span><span class="cx"> 
</span><span class="cx"> from AppKit import NSRunningApplication
</span><ins>+from AppKit import NSScreen
+from Quartz.CoreGraphics import CGEventCreateMouseEvent
+from Quartz.CoreGraphics import CGEventPost
+from Quartz.CoreGraphics import kCGEventMouseMoved
+from Quartz.CoreGraphics import kCGHIDEventTap
+from Quartz.CoreGraphics import kCGMouseButtonLeft
</ins><span class="cx"> from browser_driver import BrowserDriver
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -15,6 +21,7 @@
</span><span class="cx"> 
</span><span class="cx">     def prepareEnv(self):
</span><span class="cx">         self.closeBrowsers()
</span><ins>+        self.moveCursor(0, 0)
</ins><span class="cx"> 
</span><span class="cx">     def closeBrowsers(self):
</span><span class="cx">         self.terminateProcesses(self.bundleIdentifier)
</span><span class="lines">@@ -43,3 +50,12 @@
</span><span class="cx">         process = subprocess.Popen(args, env=env)
</span><span class="cx">         subprocess.Popen([&quot;/usr/bin/caffeinate&quot;, &quot;-disw&quot;, str(process.pid)])
</span><span class="cx">         return process
</span><ins>+
+    @classmethod
+    def moveCursor(cls, x, y):
+        moveEvent = CGEventCreateMouseEvent(None, kCGEventMouseMoved, (x, y), kCGMouseButtonLeft)
+        CGEventPost(kCGHIDEventTap, moveEvent)
+
+    @classmethod
+    def screenSize(cls):
+        return NSScreen.mainScreen().frame().size
</ins></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 (185482 => 185483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py        2015-06-12 01:46:42 UTC (rev 185482)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py        2015-06-12 02:16:28 UTC (rev 185483)
</span><span class="lines">@@ -15,11 +15,11 @@
</span><span class="cx">     bundleIdentifier = 'com.google.Chrome'
</span><span class="cx"> 
</span><span class="cx">     def launchUrl(self, url, browserBuildPath):
</span><del>-        self.launchProcess(buildDir=browserBuildPath, appName='Google Chrome.app', url=url, args=['--args', '--homepage', url])
</del><ins>+        self.launchProcess(buildDir=browserBuildPath, appName='Google Chrome.app', url=url, args=['--args', '--homepage', url, '--window-size={width},{height}'.format(width=int(self.screenSize().width), height=int(self.screenSize().height))])
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class OSXChromeCanaryDriver(OSXBrowserDriver):
</span><span class="cx">     bundleIdentifier = 'com.google.Chrome.canary'
</span><span class="cx"> 
</span><span class="cx">     def launchUrl(self, url, browserBuildPath):
</span><del>-        self.launchProcess(buildDir=browserBuildPath, appName='Google Chrome Canary.app', url=url, args=['--args', '--homepage', url])
</del><ins>+        self.launchProcess(buildDir=browserBuildPath, appName='Google Chrome Canary.app', url=url, args=['--args', '--homepage', url, '--window-size={width},{height}'.format(width=int(self.screenSize().width), height=int(self.screenSize().height))])
</ins></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 (185482 => 185483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py        2015-06-12 01:46:42 UTC (rev 185482)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py        2015-06-12 02:16:28 UTC (rev 185483)
</span><span class="lines">@@ -15,11 +15,11 @@
</span><span class="cx">     bundleIdentifier = 'org.mozilla.firefox'
</span><span class="cx"> 
</span><span class="cx">     def launchUrl(self, url, browserBuildPath):
</span><del>-        self.launchProcess(buildDir=browserBuildPath, appName='Firefox.app', url=url, args=[url])
</del><ins>+        self.launchProcess(buildDir=browserBuildPath, appName='Firefox.app', url=url, args=[url, '--args', '-width', str(int(self.screenSize().width)), '-height', str(int(self.screenSize().height))])
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class OSXFirefoxNightlyDriver(OSXBrowserDriver):
</span><span class="cx">     bundleIdentifier = 'org.mozilla.nightly'
</span><span class="cx"> 
</span><span class="cx">     def launchUrl(self, url, browserBuildPath):
</span><del>-        self.launchProcess(buildDir=browserBuildPath, appName='FirefoxNightly.app', url=url, args=[url])
</del><ins>+        self.launchProcess(buildDir=browserBuildPath, appName='FirefoxNightly.app', url=url, args=[url, '--args', '-width', str(int(self.screenSize().width)), '-height', str(int(self.screenSize().height))])
</ins></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 (185482 => 185483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py        2015-06-12 01:46:42 UTC (rev 185482)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py        2015-06-12 02:16:28 UTC (rev 185483)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx"> 
</span><span class="cx"> import logging
</span><span class="cx"> import os
</span><ins>+import re
</ins><span class="cx"> import subprocess
</span><span class="cx"> import time
</span><span class="cx"> 
</span><span class="lines">@@ -16,10 +17,11 @@
</span><span class="cx">     bundleIdentifier = 'com.apple.Safari'
</span><span class="cx"> 
</span><span class="cx">     def prepareEnv(self):
</span><ins>+        super(OSXSafariDriver, self).closeBrowsers()
</ins><span class="cx">         self.safariProcess = None
</span><del>-        self.closeBrowsers()
</del><span class="cx">         forceRemove(os.path.join(os.path.expanduser('~'), 'Library/Saved Application State/com.apple.Safari.savedState'))
</span><span class="cx">         forceRemove(os.path.join(os.path.expanduser('~'), 'Library/Safari/LastSession.plist'))
</span><ins>+        self.maximizeWindow()
</ins><span class="cx">         self.safariPreferences = [&quot;-HomePage&quot;, &quot;about:blank&quot;, &quot;-WarnAboutFraudulentWebsites&quot;, &quot;0&quot;, &quot;-ExtensionsEnabled&quot;, &quot;0&quot;, &quot;-ShowStatusBar&quot;, &quot;0&quot;, &quot;-NewWindowBehavior&quot;, &quot;1&quot;, &quot;-NewTabBehavior&quot;, &quot;1&quot;]
</span><span class="cx"> 
</span><span class="cx">     def launchUrl(self, url, browserBuildPath):
</span><span class="lines">@@ -46,3 +48,10 @@
</span><span class="cx">         super(OSXSafariDriver, self).closeBrowsers()
</span><span class="cx">         if self.safariProcess and self.safariProcess.returncode:
</span><span class="cx">             sys.exit('Browser crashed with exitcode %d' % self._process.returncode)
</span><ins>+
+    @classmethod
+    def maximizeWindow(cls):
+        try:
+            subprocess.check_call(['/usr/bin/defaults', 'write', 'com.apple.Safari', 'NSWindow Frame BrowserWindowFrame', ' '.join(['0', '0', str(cls.screenSize().width), str(cls.screenSize().height)] * 2)])
+        except Exception as error:
+            _log.error('Reset safari window size failed - Error: {}'.format(error))
</ins></span></pre>
</div>
</div>

</body>
</html>