Merge 122386 - Fix Mac custom cursor color.

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/debug/trace_event.h"
@@ skipping 488 matching lines @@
   // Don't update the cursor if a context menu is being shown.
   if (is_showing_context_menu_)
     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_.GetCursor();
+  NSCursor* ns_cursor = current_cursor_.GetNativeCursor();
   [ns_cursor set];
 }
 
 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.
 }
 
 void RenderWidgetHostViewMac::TextInputStateChanged(
@@ skipping 2247 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