Make Mac pinch thresholding apply only to zoom (Chromium side)

content/browser/renderer_host/render_widget_host_view_mac.h

Index: content/browser/renderer_host/render_widget_host_view_mac.h
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h
index 499026922fd9ddae695df9f03cab815bf508fba2..e6c24dfa513dbc3f11179ab1da453cca3c1e5b3d 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.h
+++ b/content/browser/renderer_host/render_widget_host_view_mac.h
@@ -159,12 +159,13 @@ class Layer;
   scoped_ptr<blink::WebGestureEvent> gestureBeginEvent_;
 
   // To avoid accidental pinches, require that a certain zoom threshold be
-  // reached before forwarding it to the browser. Use |unusedPinchAmount_| to
+  // reached before forwarding it to the browser. Use |pinchUnusedAmount_| to
   // hold this value. If the user reaches this value, don't re-require the
   // threshold be reached until a certain time has passed since the last
-  // zoom. Store the time of the last zoom in |lastUsedPinchEventTimestamp_|.
-  float unusedPinchAmount_;
-  NSTimeInterval lastUsedPinchEventTimestamp_;
+  // zoom. Store the time of the last zoom in |pinchLastGestureTimestamp_|.
+  bool pinchHasReachedZoomThreshold_;
+  float pinchUnusedAmount_;
+  NSTimeInterval pinchLastGestureTimestamp_;
 
   // This is set if a GesturePinchBegin event has been sent in the lifetime of
   // |gestureBeginEvent_|. If set, a GesturePinchEnd will be sent when the