Fix coordinate calculations under pinch-zoom

telemetry/telemetry/internal/actions/action_runner.py

 # Copyright 2014 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 logging
 import time
 import urlparse
 
 from telemetry.core import exceptions
 from telemetry.internal.actions.drag import DragAction
@@ skipping 344 matching lines @@
     of the final span and the initial span of the gesture.
 
     Args:
       left_anchor_ratio: The horizontal pinch anchor coordinate of the
           gesture, as a ratio of the visible bounding rectangle for
           document.body.
       top_anchor_ratio: The vertical pinch anchor coordinate of the
           gesture, as a ratio of the visible bounding rectangle for
           document.body.
       scale_factor: The ratio of the final span to the initial span.
-          The default scale factor is
-          3.0 / (window.outerWidth/window.innerWidth).
+          The default scale factor is 3.0 / (current scale factor).
       speed_in_pixels_per_second: The speed of the gesture (in pixels/s).
     """
     self._RunAction(PinchAction(
         left_anchor_ratio=left_anchor_ratio, top_anchor_ratio=top_anchor_ratio,
         scale_factor=scale_factor,
         speed_in_pixels_per_second=speed_in_pixels_per_second))
 
-  def PinchElement(self, selector=None, text=None, element_function=None,

[ericrk, 2017/09/15 16:41:04]

Thanks for cleaning this up!

-                   left_anchor_ratio=0.5, top_anchor_ratio=0.5,
-                   scale_factor=None, speed_in_pixels_per_second=800):
-    """Perform the pinch gesture on an element.
-
-    It computes the pinch gesture automatically based on the anchor
-    coordinate and the scale factor. The scale factor is the ratio of
-    of the final span and the initial span of the gesture.
-
-    Args:
-      selector: A CSS selector describing the element.
-      text: The element must contains this exact text.
-      element_function: A JavaScript function (as string) that is used
-          to retrieve the element. For example:
-          'function() { return foo.element; }'.
-      left_anchor_ratio: The horizontal pinch anchor coordinate of the
-          gesture, as a ratio of the visible bounding rectangle for
-          the element.
-      top_anchor_ratio: The vertical pinch anchor coordinate of the
-          gesture, as a ratio of the visible bounding rectangle for
-          the element.
-      scale_factor: The ratio of the final span to the initial span.
-          The default scale factor is
-          3.0 / (window.outerWidth/window.innerWidth).
-      speed_in_pixels_per_second: The speed of the gesture (in pixels/s).
-    """
-    self._RunAction(PinchAction(
-        selector=selector, text=text, element_function=element_function,
-        left_anchor_ratio=left_anchor_ratio, top_anchor_ratio=top_anchor_ratio,
-        scale_factor=scale_factor,
-        speed_in_pixels_per_second=speed_in_pixels_per_second))
-
   def ScrollPage(self, left_start_ratio=0.5, top_start_ratio=0.5,
                  direction='down', distance=None, distance_expr=None,
                  speed_in_pixels_per_second=800, use_touch=False,
                  synthetic_gesture_source=GESTURE_SOURCE_DEFAULT):
     """Perform scroll gesture on the page.
 
     You may specify distance or distance_expr, but not both. If
     neither is specified, the default scroll distance is variable
     depending on direction (see scroll.js for full implementation).
 
@@ skipping 450 matching lines @@
         marker=timeline_interaction_record.GetJavaScriptMarker(
             self._label, self._flags))
 
   def End(self):
     assert self._started
     self._started = False
     self._action_runner.ExecuteJavaScript(
         'console.timeEnd({{ marker }});',
         marker=timeline_interaction_record.GetJavaScriptMarker(
             self._label, self._flags))