Adding support for diagonal scrolling to telemetry.

tools/telemetry/telemetry/page/actions/scroll_unittest.py

 # Copyright 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 
 from telemetry import decorators
 from telemetry.page.actions import scroll
 from telemetry.unittest_util import tab_test_case
 
@@ skipping 23 matching lines @@
     i.RunAction(self._tab)
 
     self.assertTrue(self._tab.EvaluateJavaScript('window.__didBeginMeasuring'))
     self.assertTrue(self._tab.EvaluateJavaScript('window.__didEndMeasuring'))
 
     scroll_position = self._tab.EvaluateJavaScript(
         '(document.documentElement.scrollTop || document.body.scrollTop)')
     self.assertTrue(scroll_position != 0,
                     msg='scroll_position=%d;' % (scroll_position))
 
+  def testDiagonalScrollAction(self):
+    self.Navigate('blank.html')
+
+    # Make page bigger than window so it's scrollable.
+    self._tab.ExecuteJavaScript("""document.body.style.height =
+                              (2 * window.innerHeight + 1) + 'px';""")
+    self._tab.ExecuteJavaScript("""document.body.style.width =
+                              (2 * window.innerWidth + 1) + 'px';""")
+
+    self.assertEquals(
+        self._tab.EvaluateJavaScript("""document.documentElement.scrollTop
+                                   || document.body.scrollTop"""), 0)
+    self.assertEquals(
+        self._tab.EvaluateJavaScript("""document.documentElement.scrollLeft
+                                   || document.body.scrollLeft"""), 0)
+
+    i = scroll.ScrollAction(direction='downright')
+    i.WillRunAction(self._tab)
+
+    self._tab.ExecuteJavaScript("""
+        window.__scrollAction.beginMeasuringHook = function() {
+            window.__didBeginMeasuring = true;
+        };
+        window.__scrollAction.endMeasuringHook = function() {
+            window.__didEndMeasuring = true;
+        };""")
+    i.RunAction(self._tab)
+
+    self.assertTrue(self._tab.EvaluateJavaScript('window.__didBeginMeasuring'))
+    self.assertTrue(self._tab.EvaluateJavaScript('window.__didEndMeasuring'))

[nednguyen, 2015/03/06 19:07:51]

Why do we need this?

+
+    viewport_top = self._tab.EvaluateJavaScript(
+        '(document.documentElement.scrollTop || document.body.scrollTop)')
+    self.assertTrue(viewport_top != 0, msg='viewport_top=%d;' % viewport_top)
+
+    viewport_left = self._tab.EvaluateJavaScript(
+        '(document.documentElement.scrollLeft || document.body.scrollLeft)')
+    self.assertTrue(viewport_left != 0, msg='viewport_left=%d;' % viewport_left)
+
   def testBoundingClientRect(self):
     self.Navigate('blank.html')
 
     with open(os.path.join(os.path.dirname(__file__),
                            'gesture_common.js')) as f:
       js = f.read()
       self._tab.ExecuteJavaScript(js)
 
     # Verify that the rect returned by getBoundingVisibleRect() in scroll.js is
     # completely contained within the viewport. Scroll events dispatched by the
@@ skipping 26 matching lines @@
     viewport_width = int(self._tab.EvaluateJavaScript('window.innerWidth'))
 
     self.assertTrue(rect_top >= 0,
         msg='%s >= %s' % (rect_top, 0))
     self.assertTrue(rect_left >= 0,
         msg='%s >= %s' % (rect_left, 0))
     self.assertTrue(rect_bottom <= viewport_height,
         msg='%s + %s <= %s' % (rect_top, rect_height, viewport_height))
     self.assertTrue(rect_right <= viewport_width,
         msg='%s + %s <= %s' % (rect_left, rect_width, viewport_width))