Fix processing of mouse events on MacViews.

ui/views/cocoa/bridged_content_view.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 "ui/views/cocoa/bridged_content_view.h"
 
 #include "base/logging.h"
 #import "base/mac/mac_util.h"
 #import "base/mac/scoped_nsobject.h"
 #import "base/mac/sdk_forward_declarations.h"
@@ skipping 37 matching lines @@
 bool IsRectInsidePath(NSRect rect, NSBezierPath* path) {
   return [path containsPoint:rect.origin] &&
          [path containsPoint:NSMakePoint(rect.origin.x + rect.size.width,
                                          rect.origin.y)] &&
          [path containsPoint:NSMakePoint(rect.origin.x,
                                          rect.origin.y + rect.size.height)] &&
          [path containsPoint:NSMakePoint(rect.origin.x + rect.size.width,
                                          rect.origin.y + rect.size.height)];
 }
 
-// Convert a |point| in |source_window|'s AppKit coordinate system (origin at
-// the bottom left of the window) to |target_window|'s content rect, with the
-// origin at the top left of the content area.
-// If |source_window| is nil, |point| will be treated as screen coordinates.
-gfx::Point MovePointToWindow(const NSPoint& point,
-                             NSWindow* source_window,
-                             NSWindow* target_window) {
-  NSPoint point_in_screen = source_window
-      ? ui::ConvertPointFromWindowToScreen(source_window, point)
-      : point;
-
-  NSPoint point_in_window =
-      ui::ConvertPointFromScreenToWindow(target_window, point_in_screen);
-  NSRect content_rect =
-      [target_window contentRectForFrameRect:[target_window frame]];
-  return gfx::Point(point_in_window.x,
-                    NSHeight(content_rect) - point_in_window.y);
-}
-
 // Dispatch |event| to |menu_controller| and return true if |event| is
 // swallowed.
 bool DispatchEventToMenu(MenuController* menu_controller, ui::KeyEvent* event) {
   return menu_controller &&
          menu_controller->OnWillDispatchKeyEvent(event) ==
              ui::POST_DISPATCH_NONE;
 }
 
 // Returns true if |client| has RTL text.
 bool IsTextRTL(const ui::TextInputClient* client) {
@@ skipping 251 matching lines @@
 }
 
 - (void)clearView {
   textInputClient_ = nullptr;
   hostedView_ = nullptr;
   [[NSDistributedNotificationCenter defaultCenter] removeObserver:self];
   [cursorTrackingArea_.get() clearOwner];
   [self removeTrackingArea:cursorTrackingArea_.get()];
 }
 
-- (void)processCapturedMouseEvent:(NSEvent*)theEvent {
-  if (!hostedView_)
-    return;
-
-  NSWindow* source = [theEvent window];
-  NSWindow* target = [self window];
-  DCHECK(target);
-
-  // If it's the view's window, process normally.
-  if ([target isEqual:source]) {
-    [self mouseEvent:theEvent];
-    return;
-  }
-
-  ui::MouseEvent event(theEvent);
-  event.set_location(
-      MovePointToWindow([theEvent locationInWindow], source, target));
-  hostedView_->GetWidget()->OnMouseEvent(&event);
-}
-
 - (void)updateTooltipIfRequiredAt:(const gfx::Point&)locationInContent {
   DCHECK(hostedView_);
   base::string16 newTooltipText;
 
   views::View* view = hostedView_->GetTooltipHandlerForPoint(locationInContent);
   if (view) {
     gfx::Point viewPoint = locationInContent;
     views::View::ConvertPointToScreen(hostedView_, &viewPoint);
     views::View::ConvertPointFromScreen(view, &viewPoint);
     if (!view->GetTooltipText(viewPoint, &newTooltipText))
       DCHECK(newTooltipText.empty());
   }
   if (newTooltipText != lastTooltipText_) {
     std::swap(newTooltipText, lastTooltipText_);
     [self setToolTipAtMousePoint:base::SysUTF16ToNSString(lastTooltipText_)];
   }
 }
 
+- (void)hideTooltipIfRequired {
+  if (!lastTooltipText_.empty()) {
+    lastTooltipText_.clear();
+    [self setToolTipAtMousePoint:nil];
+  }
+}
+
 - (void)updateWindowMask {
   DCHECK(![self inLiveResize]);
   DCHECK(base::mac::IsOS10_9());
   DCHECK(hostedView_);
 
   views::Widget* widget = hostedView_->GetWidget();
   if (!widget->non_client_view())
     return;
 
   const NSRect frameRect = [self bounds];
@@ skipping 177 matching lines @@
           eventFlags:ui::EF_CONTROL_DOWN];
 }
 
 // BaseView implementation.
 
 // Don't use tracking areas from BaseView. BridgedContentView's tracks
 // NSTrackingCursorUpdate and Apple's documentation suggests it's incompatible.
 - (void)enableTracking {
 }
 
+// Explicitly ignore BaseView's |dragging_| logic
+- (void)mouseDown:(NSEvent*)theEvent {
+  [self mouseEvent:theEvent];
+}
+
 // Translates the location of |theEvent| to toolkit-views coordinates and passes
 // the event to NativeWidgetMac for handling.
 - (void)mouseEvent:(NSEvent*)theEvent {
   if (!hostedView_)
     return;
-
-  ui::MouseEvent event(theEvent);
-
-  // Aura updates tooltips with the help of aura::Window::AddPreTargetHandler().
-  // Mac hooks in here.
-  [self updateTooltipIfRequiredAt:event.location()];
-
-  hostedView_->GetWidget()->OnMouseEvent(&event);
+  views::NativeWidgetMac::GetBridgeForNativeWindow([self window])
+      ->OnMouseEvent(theEvent);
 }
 
 // NSView implementation.
 
 - (BOOL)acceptsFirstResponder {
   return YES;
 }
 
 - (BOOL)becomeFirstResponder {
   BOOL result = [super becomeFirstResponder];
@@ skipping 163 matching lines @@
 
 - (void)keyUp:(NSEvent*)theEvent {
   ui::KeyEvent event(theEvent);
   [self handleKeyEvent:&event];
 }
 
 - (void)scrollWheel:(NSEvent*)theEvent {
   if (!hostedView_)
     return;
 
-  ui::ScrollEvent event(theEvent);
-  hostedView_->GetWidget()->OnScrollEvent(&event);
+  // Passes the event to BridgedNativeWidget for handling.
+  views::NativeWidgetMac::GetBridgeForNativeWindow([self window])
+      ->OnMouseEvent(theEvent);
 }
 
 - (void)quickLookWithEvent:(NSEvent*)theEvent {
   if (!hostedView_)
     return;
 
   const gfx::Point locationInContent = ui::EventLocationFromNative(theEvent);
   views::View* target = hostedView_->GetEventHandlerForPoint(locationInContent);
   if (!target)
     return;
@@ skipping 641 matching lines @@
   return [hostedView_->GetNativeViewAccessible() accessibilityHitTest:point];
 }
 
 - (id)accessibilityFocusedUIElement {
   if (!hostedView_)
     return nil;
   return [hostedView_->GetNativeViewAccessible() accessibilityFocusedUIElement];
 }
 
 @end