Apply a CursorRect to the extent of the render widget view for web page cursors.

content/browser/renderer_host/render_widget_host_view_mac.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 <QuartzCore/QuartzCore.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 528 matching lines @@
   if (!enclosing_window)
     return gfx::Rect();
 
   NSRect bounds = [cocoa_view_ bounds];
   bounds = [cocoa_view_ convertRect:bounds toView:nil];
   bounds.origin = [enclosing_window convertBaseToScreen:bounds.origin];
   return FlipNSRectToRectScreen(bounds);
 }
 
 void RenderWidgetHostViewMac::UpdateCursor(const WebCursor& cursor) {
-  current_cursor_ = cursor;
-  UpdateCursorIfNecessary();
-}
-
-void RenderWidgetHostViewMac::UpdateCursorIfNecessary() {
-  // Do something special (as Win Chromium does) for arrow cursor while loading
-  // a page? TODO(avi): decide
-
-  // Don't update the cursor if a context menu is being shown.
-  if (IsShowingContextMenu())
-    return;
-
-  // Can we synchronize to the event stream? Switch to -[NSWindow
-  // mouseLocationOutsideOfEventStream] if we cannot. TODO(avi): test and see
-  NSEvent* event = [[cocoa_view_ window] currentEvent];
-  if ([event window] != [cocoa_view_ window])
-    return;
-
-  NSCursor* ns_cursor = current_cursor_.GetNativeCursor();
-  [ns_cursor set];
+  WebCursor web_cursor = cursor;

[Avi (use Gerrit), 2012/05/24 15:14:49]

Why this copy? If GetNativeCursor() isn't const, can you make it?

+  [cocoa_view_ updateCursor:web_cursor.GetNativeCursor()];
 }
 
 void RenderWidgetHostViewMac::SetIsLoading(bool is_loading) {
   is_loading_ = is_loading;
   // If we ever decide to show the waiting cursor while the page is loading
-  // like Chrome does on Windows, call |UpdateCursorIfNecessary()| here.
+  // like Chrome does on Windows, call |UpdateCursor()| here.
 }
 
 void RenderWidgetHostViewMac::TextInputStateChanged(
     ui::TextInputType type,
     bool can_compose_inline) {
   if (text_input_type_ != type || can_compose_inline_ != can_compose_inline) {
     text_input_type_ = type;
     can_compose_inline_ = can_compose_inline;
     if (HasFocus()) {
       SetTextInputActive(true);
@@ skipping 159 matching lines @@
   // markedRange immediately after calling setMarkdText: returns the current
   // caret position.
   if (![cocoa_view_ hasMarkedText]) {
     [cocoa_view_ setMarkedRange:range.ToNSRange()];
   }
 }
 
 void RenderWidgetHostViewMac::SetShowingContextMenu(bool showing) {
   content::RenderWidgetHostViewBase::SetShowingContextMenu(showing);
 
-  // If the menu was closed, restore the cursor to the saved version initially,
-  // as the renderer will not re-send it if there was no change.
-  if (!showing)
-    UpdateCursorIfNecessary();
-
   // Create a fake mouse event to inform the render widget that the mouse
   // left or entered.
   NSWindow* window = [cocoa_view_ window];
   // TODO(asvitkine): If the location outside of the event stream doesn't
   // correspond to the current event (due to delayed event processing), then
   // this may result in a cursor flicker if there are later mouse move events
   // in the pipeline. Find a way to use the mouse location from the event that
   // dismissed the context menu.
   NSPoint location = [window mouseLocationOutsideOfEventStream];
   NSEvent* event = [NSEvent mouseEventWithType:NSMouseMoved
@@ skipping 468 matching lines @@
 // RenderWidgetHostViewCocoa ---------------------------------------------------
 
 @implementation RenderWidgetHostViewCocoa
 
 @synthesize selectedRange = selectedRange_;
 @synthesize markedRange = markedRange_;
 
 - (id)initWithRenderWidgetHostViewMac:(RenderWidgetHostViewMac*)r {
   self = [super initWithFrame:NSZeroRect];
   if (self) {
+    current_cursor_ = nil;
+
     editCommand_helper_.reset(new RenderWidgetHostViewMacEditCommandHelper);
     editCommand_helper_->AddEditingSelectorsToClass([self class]);
 
     renderWidgetHostView_.reset(r);
     canBeKeyView_ = YES;
     focusedPluginIdentifier_ = -1;
 
     // OpenGL support:
     handlingGlobalFrameDidChange_ = NO;
     [[NSNotificationCenter defaultCenter]
          addObserver:self
             selector:@selector(globalFrameDidChange:)
                 name:NSViewGlobalFrameDidChangeNotification
               object:self];
   }
   return self;
 }
 
 - (void)dealloc {
   if (delegate_ && [delegate_ respondsToSelector:@selector(viewGone:)])
     [delegate_ viewGone:self];
   [[NSNotificationCenter defaultCenter] removeObserver:self];
 
+  [current_cursor_ release];
+  current_cursor_ = nil;
+
   [super dealloc];
 }
 
+- (void)resetCursorRects {
+  [self addCursorRect:[self visibleRect] cursor:current_cursor_];
+  [current_cursor_ setOnMouseEntered:YES];
+}
+
 - (void)setRWHVDelegate:(NSObject<RenderWidgetHostViewMacDelegate>*)delegate {
   delegate_ = delegate;
 }
 
 - (void)gotUnhandledWheelEvent {
   if (delegate_ &&
       [delegate_ respondsToSelector:@selector(gotUnhandledWheelEvent)]) {
     [delegate_ gotUnhandledWheelEvent];
   }
 }
@@ skipping 1579 matching lines @@
     widget->Send(new ViewMsg_SetInLiveResize(widget->GetRoutingID(), true));
 }
 
 - (void)viewDidEndLiveResize {
   [super viewDidEndLiveResize];
   RenderWidgetHostImpl* widget = renderWidgetHostView_->render_widget_host_;
   if (widget)
     widget->Send(new ViewMsg_SetInLiveResize(widget->GetRoutingID(), false));
 }
 
+- (void)updateCursor:(NSCursor*)cursor {
+  if (current_cursor_ == cursor)
+    return;
+
+  [current_cursor_ release];
+  current_cursor_ = [cursor retain];
+  [[self window] invalidateCursorRectsForView:self];

[Avi (use Gerrit), 2012/05/24 15:14:49]

That is... elegant. Wow.

+}
+
 @end
 
 //
 // Supporting application services
 //
 @implementation RenderWidgetHostViewCocoa(NSServicesRequests)
 
 - (BOOL)writeSelectionToPasteboard:(NSPasteboard*)pboard
                              types:(NSArray*)types {
   const std::string& str = renderWidgetHostView_->selected_text();
@@ skipping 11 matching lines @@
   if (!string) return NO;
 
   // If the user is currently using an IME, confirm the IME input,
   // and then insert the text from the service, the same as TextEdit and Safari.
   [self confirmComposition];
   [self insertText:string];
   return YES;
 }
 
 @end