Fixes pinch-to-zoom when linking against the 10.11 SDK or newer.

content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

 // 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.
 
 #include "content/browser/renderer_host/render_widget_host_view_mac.h"
 
 #include <Cocoa/Cocoa.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <tuple>
@@ skipping 106 matching lines @@
     EXPECT_TRUE(InputMsg_HandleInputEvent::Read(message, &params));
     const blink::WebInputEvent* event = std::get<0>(params);
     if (i != 0)
       result += " ";
     result += blink::WebInputEvent::GetName(event->type());
   }
   process->sink().ClearMessages();
   return result;
 }
 
+NSEventPhase PhaseForEventType(NSEventType type) {
+  if (type == NSEventTypeBeginGesture)
+    return NSEventPhaseBegan;
+  if (type == NSEventTypeEndGesture)
+    return NSEventPhaseEnded;
+  return NSEventPhaseChanged;
+}
+
 id MockGestureEvent(NSEventType type, double magnification) {
   id event = [OCMockObject mockForClass:[NSEvent class]];
+  NSEventPhase phase = PhaseForEventType(type);
   NSPoint locationInWindow = NSMakePoint(0, 0);
   CGFloat deltaX = 0;
   CGFloat deltaY = 0;
   NSTimeInterval timestamp = 1;
   NSUInteger modifierFlags = 0;
 
   [(NSEvent*)[[event stub] andReturnValue:OCMOCK_VALUE(type)] type];
+  [(NSEvent*)[[event stub] andReturnValue:OCMOCK_VALUE(phase)] phase];
   [(NSEvent*)[[event stub]
       andReturnValue:OCMOCK_VALUE(locationInWindow)] locationInWindow];
   [(NSEvent*)[[event stub] andReturnValue:OCMOCK_VALUE(deltaX)] deltaX];
   [(NSEvent*)[[event stub] andReturnValue:OCMOCK_VALUE(deltaY)] deltaY];
   [(NSEvent*)[[event stub] andReturnValue:OCMOCK_VALUE(timestamp)] timestamp];
   [(NSEvent*)[[event stub]
       andReturnValue:OCMOCK_VALUE(modifierFlags)] modifierFlags];
   [(NSEvent*)[[event stub]
       andReturnValue:OCMOCK_VALUE(magnification)] magnification];
   return event;
@@ skipping 1072 matching lines @@
         MockGestureEvent(NSEventTypeBeginGesture, 0);
     NSEvent* pinchUpdateEvents[3] = {
         MockGestureEvent(NSEventTypeMagnify, 0.25),
         MockGestureEvent(NSEventTypeMagnify, 0.25),
         MockGestureEvent(NSEventTypeMagnify, 0.25),
     };
     NSEvent* pinchEndEvent =
         MockGestureEvent(NSEventTypeEndGesture, 0);
 
     [view->cocoa_view() beginGestureWithEvent:pinchBeginEvent];
+    [view->cocoa_view() magnifyWithEvent:pinchBeginEvent];
     EXPECT_EQ(0U, process_host_->sink().message_count());
 
     // No zoom is sent for the first update event.
     [view->cocoa_view() magnifyWithEvent:pinchUpdateEvents[0]];
     host->OnMessageReceived(*response);
     EXPECT_EQ(2U, process_host_->sink().message_count());
     EXPECT_TRUE(ZoomDisabledForPinchUpdateMessage());
     process_host_->sink().ClearMessages();
 
     // The second update event crosses the threshold of 0.4, and so zoom is no
     // longer disabled.
     [view->cocoa_view() magnifyWithEvent:pinchUpdateEvents[1]];
     EXPECT_FALSE(ZoomDisabledForPinchUpdateMessage());
     host->OnMessageReceived(*response);
     EXPECT_EQ(1U, process_host_->sink().message_count());
     process_host_->sink().ClearMessages();
 
     // The third update still has zoom enabled.
     [view->cocoa_view() magnifyWithEvent:pinchUpdateEvents[2]];
     EXPECT_FALSE(ZoomDisabledForPinchUpdateMessage());
     host->OnMessageReceived(*response);
     EXPECT_EQ(1U, process_host_->sink().message_count());
     process_host_->sink().ClearMessages();
 
     [view->cocoa_view() endGestureWithEvent:pinchEndEvent];
+    [view->cocoa_view() magnifyWithEvent:pinchEndEvent];
     EXPECT_EQ(1U, process_host_->sink().message_count());
     process_host_->sink().ClearMessages();
   }
 
   // Do a gesture that doesn't cross the threshold, but happens when we're not
   // at page scale factor one, so it should be sent to the renderer.
   {
     NSEvent* pinchBeginEvent = MockGestureEvent(NSEventTypeBeginGesture, 0);
     NSEvent* pinchUpdateEvent = MockGestureEvent(NSEventTypeMagnify, 0.25);
     NSEvent* pinchEndEvent = MockGestureEvent(NSEventTypeEndGesture, 0);
 
     view->page_at_minimum_scale_ = false;
 
     [view->cocoa_view() beginGestureWithEvent:pinchBeginEvent];
+    [view->cocoa_view() magnifyWithEvent:pinchBeginEvent];
     EXPECT_EQ(0U, process_host_->sink().message_count());
 
     // Expect that a zoom happen because the time threshold has not passed.
     [view->cocoa_view() magnifyWithEvent:pinchUpdateEvent];
     EXPECT_FALSE(ZoomDisabledForPinchUpdateMessage());
     host->OnMessageReceived(*response);
     EXPECT_EQ(2U, process_host_->sink().message_count());
     process_host_->sink().ClearMessages();
 
     [view->cocoa_view() endGestureWithEvent:pinchEndEvent];
+    [view->cocoa_view() magnifyWithEvent:pinchEndEvent];
     EXPECT_EQ(1U, process_host_->sink().message_count());
     process_host_->sink().ClearMessages();
   }
 
   // Do a gesture again, after the page scale is no longer at one, and ensure
   // that it is thresholded again.
   {
     NSEvent* pinchBeginEvent = MockGestureEvent(NSEventTypeBeginGesture, 0);
     NSEvent* pinchUpdateEvent = MockGestureEvent(NSEventTypeMagnify, 0.25);
     NSEvent* pinchEndEvent = MockGestureEvent(NSEventTypeEndGesture, 0);
 
     view->page_at_minimum_scale_ = true;
 
     [view->cocoa_view() beginGestureWithEvent:pinchBeginEvent];
+    [view->cocoa_view() magnifyWithEvent:pinchBeginEvent];
     EXPECT_EQ(0U, process_host_->sink().message_count());
 
     // Get back to zoom one right after the begin event. This should still keep
     // the thresholding in place (it is latched at the begin event).
     view->page_at_minimum_scale_ = false;
 
     // Expect that zoom be disabled because the time threshold has passed.
     [view->cocoa_view() magnifyWithEvent:pinchUpdateEvent];
     EXPECT_EQ(2U, process_host_->sink().message_count());
     EXPECT_TRUE(ZoomDisabledForPinchUpdateMessage());
     host->OnMessageReceived(*response);
     process_host_->sink().ClearMessages();
 
     [view->cocoa_view() endGestureWithEvent:pinchEndEvent];
+    [view->cocoa_view() magnifyWithEvent:pinchEndEvent];
     EXPECT_EQ(1U, process_host_->sink().message_count());
     process_host_->sink().ClearMessages();
   }
 
   // Clean up.
   host->ShutdownAndDestroyWidget(true);
 }
 
 TEST_F(RenderWidgetHostViewMacTest, EventLatencyOSMouseWheelHistogram) {
   base::HistogramTester histogram_tester;
@@ skipping 324 matching lines @@
   // Verify that this IPC is asking for no monitoring or immediate updates.
   InputMsg_RequestCompositionUpdate::Read(composition_request_msg_for_child,
                                           &child_msg_params);
   is_child_msg_for_immediate_request = std::get<0>(child_msg_params);
   is_child_msg_for_monitor_request = std::get<1>(child_msg_params);
   EXPECT_FALSE(is_child_msg_for_immediate_request);
   EXPECT_FALSE(is_child_msg_for_monitor_request);
 }
 
 }  // namespace content