MacViews: Fix some TableView tests, add ui::EventGenerator::set_assume_window_at_origin(bool)

ui/views/test/event_generator_delegate_mac.mm

 // 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 <Cocoa/Cocoa.h>
 #include <stddef.h>
 
 #import "base/mac/scoped_nsobject.h"
 #import "base/mac/scoped_objc_class_swizzler.h"
 #include "base/macros.h"
@@ skipping 16 matching lines @@
 }  // namespace
 
 @interface NSEventDonor : NSObject
 @end
 
 @interface NSApplicationDonor : NSObject
 @end
 
 namespace {
 
+// Return the current owner of the EventGeneratorDelegate. May be null.
+ui::test::EventGenerator* GetActiveGenerator();
+
 NSPoint ConvertRootPointToTarget(NSWindow* target,
                                  const gfx::Point& point_in_root) {
-  // Normally this would do ui::ConvertPointFromScreenToWindow. However, Cocoa
-  // can reposition the window on screen and make things flaky. Initially, just
-  // assume that the contentRect of |target| is at the top-left corner of the
-  // screen.
-  NSRect content_rect = [target contentRectForFrameRect:[target frame]];
-  return NSMakePoint(point_in_root.x(),
-                     NSHeight(content_rect) - point_in_root.y());
+  DCHECK(GetActiveGenerator());
+  gfx::Point point = point_in_root;
+
+  if (GetActiveGenerator()->assume_window_at_origin()) {
+    // When assuming the window is at the origin, ignore the titlebar as well.
+    NSRect content_rect = [target contentRectForFrameRect:[target frame]];
+    return NSMakePoint(point.x(), NSHeight(content_rect) - point.y());
+  }
+
+  point -= gfx::ScreenRectFromNSRect([target frame]).OffsetFromOrigin();
+  return NSMakePoint(point.x(), NSHeight([target frame]) - point.y());
 }
 
 // Inverse of ui::EventFlagsFromModifiers().
 NSUInteger EventFlagsToModifiers(int flags) {
   NSUInteger modifiers = 0;
   modifiers |= (flags & ui::EF_SHIFT_DOWN) ? NSShiftKeyMask : 0;
   modifiers |= (flags & ui::EF_CONTROL_DOWN) ? NSControlKeyMask : 0;
   modifiers |= (flags & ui::EF_ALT_DOWN) ? NSAlternateKeyMask : 0;
   modifiers |= (flags & ui::EF_COMMAND_DOWN) ? NSCommandKeyMask : 0;
   modifiers |= (flags & ui::EF_CAPS_LOCK_ON) ? NSAlphaShiftKeyMask : 0;
@@ skipping 313 matching lines @@
 EventGeneratorDelegateMac::GetChildIterator() const {
   // Return nullptr to dispatch all events to the result of GetRootTarget().
   return nullptr;
 }
 
 void EventGeneratorDelegateMac::OnMouseEvent(ui::MouseEvent* event) {
   NSEvent* ns_event =
       event->type() == ui::ET_MOUSEWHEEL
           ? CreateMouseWheelEventInWindow(window_, event)
           : CreateMouseEventInWindow(window_, event->type(), event->location(),
-                                     event->changed_button_flags());
+                                     event->flags());
 
   using Target = ui::test::EventGenerator::Target;
   switch (owner_->target()) {
     case Target::APPLICATION:
       [NSApp sendEvent:ns_event];
       break;
     case Target::WINDOW:
       [window_ sendEvent:ns_event];
       break;
     case Target::WIDGET:
@@ skipping 164 matching lines @@
 }
 
 gfx::Point EventGeneratorDelegateMac::CenterOfWindow(
     gfx::NativeWindow window) const {
   DCHECK_EQ(window, window_);
   // Assume the window is at the top-left of the coordinate system (even if
   // AppKit has moved it into the work area) see ConvertRootPointToTarget().
   return gfx::Point(NSWidth([window frame]) / 2, NSHeight([window frame]) / 2);
 }
 
-// Return the current owner of the EventGeneratorDelegate. May be null.
 ui::test::EventGenerator* GetActiveGenerator() {
   return EventGeneratorDelegateMac::GetInstance()->owner();
 }
 
 }  // namespace
 
 namespace views {
 namespace test {
 
 void InitializeMacEventGeneratorDelegate() {
@@ skipping 44 matching lines @@
 - (NSEvent*)currentEvent {
   if (g_current_event)
     return g_current_event;
 
   // Find the original implementation and invoke it.
   IMP original = EventGeneratorDelegateMac::GetInstance()->CurrentEventMethod();
   return original(self, _cmd);
 }
 
 @end