Merge 122386 - Fix Mac custom cursor color.

webkit/glue/webcursor.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 WEBKIT_GLUE_WEBCURSOR_H_
 #define WEBKIT_GLUE_WEBCURSOR_H_
 
 #include "base/basictypes.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/size.h"
@@ skipping 73 matching lines @@
   // Return the stock GdkCursorType for this cursor, or GDK_CURSOR_IS_PIXMAP
   // if it's a custom cursor. Return GDK_LAST_CURSOR to indicate that the cursor
   // should be set to the system default.
   // Returns an int so we don't need to include GDK headers in this header file.
   int GetCursorType() const;
 
   // Return a new GdkCursor* for this cursor.  Only valid if GetCursorType
   // returns GDK_CURSOR_IS_PIXMAP.
   GdkCursor* GetCustomCursor();
 #elif defined(OS_MACOSX)
-  // Gets an NSCursor* for this cursor.
-  NSCursor* GetCursor() const;
-
   // Initialize this from the given Carbon ThemeCursor.
   void InitFromThemeCursor(ThemeCursor cursor);
 
   // Initialize this from the given Carbon Cursor.
   void InitFromCursor(const Cursor* cursor);
 
   // Initialize this from the given Cocoa NSCursor.
   void InitFromNSCursor(NSCursor* cursor);
 #endif
 
@@ skipping 43 matching lines @@
   HCURSOR external_cursor_;
   // A custom cursor created from custom bitmap data by Webkit.
   HCURSOR custom_cursor_;
 #elif defined(TOOLKIT_USES_GTK)
   // A custom cursor created that should be unref'ed from the destructor.
   GdkCursor* unref_;
 #endif
 };
 
 #endif  // WEBKIT_GLUE_WEBCURSOR_H_