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

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_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
 #include <list>
@@ skipping 48 matching lines @@
   id trackingRectOwner_;              // (not retained)
   void *trackingRectUserData_;
   NSTrackingRectTag lastToolTipTag_;
   scoped_nsobject<NSString> toolTip_;
 
   // Is YES if there was a mouse-down as yet unbalanced with a mouse-up.
   BOOL hasOpenMouseDown_;
 
   NSWindow* lastWindow_;  // weak
 
+  // The cursor for the page. This is passed up from the renderer.
+  NSCursor* current_cursor_;

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

Rather than the retains/releases in the .mm, you should use scoped_nsobject
here.

+
   // Variables used by our implementaion of the NSTextInput protocol.
   // An input method of Mac calls the methods of this protocol not only to
   // notify an application of its status, but also to retrieve the status of
   // the application. That is, an application cannot control an input method
   // directly.
   // This object keeps the status of a composition of the renderer and returns
   // it when an input method asks for it.
   // We need to implement Objective-C methods for the NSTextInput protocol. On
   // the other hand, we need to implement a C++ method for an IPC-message
   // handler which receives input-method events from the renderer.
@@ skipping 68 matching lines @@
 - (void)cancelComposition;
 // Confirm ongoing composition.
 - (void)confirmComposition;
 // Enables or disables plugin IME.
 - (void)setPluginImeActive:(BOOL)active;
 // Updates the current plugin focus state.
 - (void)pluginFocusChanged:(BOOL)focused forPlugin:(int)pluginId;
 // Evaluates the event in the context of plugin IME, if plugin IME is enabled.
 // Returns YES if the event was handled.
 - (BOOL)postProcessEventForPluginIme:(NSEvent*)event;
-
+- (void)updateCursor:(NSCursor*)cursor;
 @end
 
 ///////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewMac
 //
 //  An object representing the "View" of a rendered web page. This object is
 //  responsible for displaying the content of the web page, and integrating with
 //  the Cocoa view system. It is the implementation of the RenderWidgetHostView
 //  that the cross-platform RenderWidgetHost object uses
 //  to display the data.
@@ skipping 207 matching lines @@
   friend class content::RenderWidgetHostView;
 
   // The view will associate itself with the given widget. The native view must
   // be hooked up immediately to the view hierarchy, or else when it is
   // deleted it will delete this out from under the caller.
   explicit RenderWidgetHostViewMac(content::RenderWidgetHost* widget);
 
   // Returns whether this render view is a popup (autocomplete window).
   bool IsPopup() const;
 
-  // Updates the display cursor if the current event is over the view's window.
-  void UpdateCursorIfNecessary();
-
   // Shuts down the render_widget_host_.  This is a separate function so we can
   // invoke it from the message loop.
   void ShutdownHost();
 
   // Called when a GPU SwapBuffers is received.
   void GotAcceleratedFrame();
   // Called when a software DIB is received.
   void GotSoftwareFrame();
 
   // The associated view. This is weak and is inserted into the view hierarchy
   // to own this RenderWidgetHostViewMac object.
   RenderWidgetHostViewCocoa* cocoa_view_;
 
-  // The cursor for the page. This is passed up from the renderer.
-  WebCursor current_cursor_;
-
   // Indicates if the page is loading.
   bool is_loading_;
 
   // true if the View is not visible.
   bool is_hidden_;
 
   // The text to be shown in the tooltip, supplied by the renderer.
   string16 tooltip_text_;
 
   // Factory used to safely scope delayed calls to ShutdownHost().
   base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_;
 
   // selected text on the renderer.
   std::string selected_text_;
 
   // The fullscreen window used for pepper flash.
   scoped_nsobject<NSWindow> pepper_fullscreen_window_;
   scoped_nsobject<FullscreenWindowManager> fullscreen_window_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
 };
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_