Title: [185524] trunk/Tools
Revision
185524
Author
[email protected]
Date
2015-06-12 16:40:08 -0700 (Fri, 12 Jun 2015)

Log Message

Move cursor to (10, 0) instead of (0, 0) and polish the mouse move code
https://bugs.webkit.org/show_bug.cgi?id=145945

Patch by Dewei Zhu <[email protected]> on 2015-06-12
Reviewed by Stephanie Lewis.

* Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py:
(OSXBrowserDriver.prepareEnv):
(OSXBrowserDriver.moveCursor): Deleted.
(OSXBrowserDriver): Deleted.
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
(OSXSafariDriver.prepareEnv):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (185523 => 185524)


--- trunk/Tools/ChangeLog	2015-06-12 22:49:21 UTC (rev 185523)
+++ trunk/Tools/ChangeLog	2015-06-12 23:40:08 UTC (rev 185524)
@@ -1,3 +1,17 @@
+2015-06-12  Dewei Zhu  <[email protected]>
+
+        Move cursor to (10, 0) instead of (0, 0) and polish the mouse move code
+        https://bugs.webkit.org/show_bug.cgi?id=145945
+
+        Reviewed by Stephanie Lewis.
+
+        * Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py:
+        (OSXBrowserDriver.prepareEnv):
+        (OSXBrowserDriver.moveCursor): Deleted.
+        (OSXBrowserDriver): Deleted.
+        * Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
+        (OSXSafariDriver.prepareEnv):
+
 2015-06-12  Brent Fulgham  <[email protected]>
 
         Revise update-webkit-dependency to use LWP::UserAgent instead of LWP::Simple for better handling of https

Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py (185523 => 185524)


--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py	2015-06-12 22:49:21 UTC (rev 185523)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py	2015-06-12 23:40:08 UTC (rev 185524)
@@ -5,11 +5,7 @@
 
 from AppKit import NSRunningApplication
 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
+from Quartz import CGWarpMouseCursorPosition
 from browser_driver import BrowserDriver
 
 
@@ -21,7 +17,7 @@
 
     def prepareEnv(self):
         self.closeBrowsers()
-        self.moveCursor(0, 0)
+        CGWarpMouseCursorPosition((10, 0))
 
     def closeBrowsers(self):
         self.terminateProcesses(self.bundleIdentifier)
@@ -52,10 +48,5 @@
         return process
 
     @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

Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py (185523 => 185524)


--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py	2015-06-12 22:49:21 UTC (rev 185523)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py	2015-06-12 23:40:08 UTC (rev 185524)
@@ -17,8 +17,8 @@
     bundleIdentifier = 'com.apple.Safari'
 
     def prepareEnv(self):
-        super(OSXSafariDriver, self).closeBrowsers()
         self.safariProcess = None
+        super(OSXSafariDriver, self).prepareEnv()
         forceRemove(os.path.join(os.path.expanduser('~'), 'Library/Saved Application State/com.apple.Safari.savedState'))
         forceRemove(os.path.join(os.path.expanduser('~'), 'Library/Safari/LastSession.plist'))
         self.maximizeWindow()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to