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

content/browser/renderer_host/render_widget_host_view_mac.h

 // Copyright (c) 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
 
 #import <Cocoa/Cocoa.h>
 #include <IOSurface/IOSurfaceAPI.h>
 #include <list>
@@ skipping 141 matching lines @@
   id endWheelMonitor_;
 
   // When a gesture starts, the system does not inform the view of which type
   // of gesture is happening (magnify, rotate, etc), rather, it just informs
   // the view that some as-yet-undefined gesture is starting. Capture the
   // information about the gesture's beginning event here. It will be used to
   // create a specific gesture begin event later.
   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_;
+  // threshold be reached until the page has been zoomed back to page scale of
+  // one.
+  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
   // gesture ends.
   BOOL gestureBeginPinchSent_;
 
   // If true then escape key down events are suppressed until the first escape
   // key up event. (The up event is suppressed as well). This is used by the
   // flash fullscreen code to avoid sending a key up event without a matching
   // key down event.
@@ skipping 265 matching lines @@
 
   // Container for ui::Compositor the CALayer tree drawn by it.
   scoped_ptr<BrowserCompositorMac> browser_compositor_;
 
   // Placeholder that is allocated while browser_compositor_ is NULL,
   // indicating that a BrowserCompositorViewMac may be allocated. This is to
   // help in recycling the internals of BrowserCompositorViewMac.
   scoped_ptr<BrowserCompositorMacPlaceholder>
       browser_compositor_placeholder_;
 
+  // Set when the currently-displayed frame is at page scale one. Used to
+  // determine if pinch gestures need to be thresholded.
+  bool page_is_at_scale_one_;
+
   NSWindow* pepper_fullscreen_window() const {
     return pepper_fullscreen_window_;
   }
 
   CONTENT_EXPORT void release_pepper_fullscreen_window_for_testing();
 
   RenderWidgetHostViewMac* fullscreen_parent_host_view() const {
     return fullscreen_parent_host_view_;
   }
 
@@ skipping 121 matching lines @@
 
   // Factory used to safely scope delayed calls to ShutdownHost().
   base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_