Merge branch 'master' into 34-sync-touch

Author: kdzwinel

lib/device.js

@@ -37,7 +37,10 @@ function createWindow(url, width, height) {
         chrome.windows.update(newWindow.id, {
           width: newWidth,
           height: newHeight + INFOBAR_HEIGHT + FRAME_HEIGHT
-        }, () => {
+        }, (updatedWindow) => {
+          newWindow.width = updatedWindow.width;
+          newWindow.height = updatedWindow.height;
+
           resolve(newWindow);
         });
 
@@ -114,6 +117,8 @@ class Device {
         url: winCtrl._url
       }));
 
+    //requested screen size VS actual window size
+    this._windowScale = newWindow.width / this._width;
     this._window = newWindow;
     this._debugger = tabDebugger;
   }
@@ -168,15 +173,16 @@ class Device {
       button: 'left',
       y: y,
       x: x,
-      timestamp: Date.now()
+      timestamp: Date.now(),
+      clickCount: 1
     };
 
     if(this._touch) {
       command = 'Input.emulateTouchFromMouseEvent';
-      data.timestamp = Date.now();
+      data.x = Math.round(data.x * this._windowScale);
+      data.y = Math.round(data.y * this._windowScale);
     } else {
       command = 'Input.dispatchMouseEvent';
-      data.clickCount = 1;
     }
 
     return (this._debugger)