Merge 122386 - Fix Mac custom cursor color.

webkit/glue/webcursor.h

Index: webkit/glue/webcursor.h
===================================================================
--- webkit/glue/webcursor.h	(revision 122555)
+++ webkit/glue/webcursor.h	(working copy)
@@ -1,4 +1,4 @@
-// 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.
 
@@ -92,9 +92,6 @@
   // 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);