Support custom cursors for windowless plugins on Windows Aura.

webkit/glue/webcursor_win.cc

 // 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 "base/logging.h"
 #include "base/pickle.h"
 #include "grit/webkit_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
 #include "ui/gfx/gdi_util.h"
@@ skipping 91 matching lines @@
       return MAKEINTRESOURCE(IDC_HAND_GRABBING);
   }
   NOTREACHED();
   return NULL;
 }
 
 static bool IsSystemCursorID(LPCWSTR cursor_id) {
   return cursor_id >= IDC_ARROW;  // See WinUser.h
 }
 
-static WebCursorInfo::Type ToCursorType(HCURSOR cursor) {
-  static struct {
-    HCURSOR cursor;
-    WebCursorInfo::Type type;
-  } kStandardCursors[] = {
-    { LoadCursor(NULL, IDC_ARROW),       WebCursorInfo::TypePointer },
-    { LoadCursor(NULL, IDC_CROSS),       WebCursorInfo::TypeCross },
-    { LoadCursor(NULL, IDC_HAND),        WebCursorInfo::TypeHand },
-    { LoadCursor(NULL, IDC_IBEAM),       WebCursorInfo::TypeIBeam },
-    { LoadCursor(NULL, IDC_WAIT),        WebCursorInfo::TypeWait },
-    { LoadCursor(NULL, IDC_HELP),        WebCursorInfo::TypeHelp },
-    { LoadCursor(NULL, IDC_SIZENESW),    WebCursorInfo::TypeNorthEastResize },
-    { LoadCursor(NULL, IDC_SIZENWSE),    WebCursorInfo::TypeNorthWestResize },
-    { LoadCursor(NULL, IDC_SIZENS),      WebCursorInfo::TypeNorthSouthResize },
-    { LoadCursor(NULL, IDC_SIZEWE),      WebCursorInfo::TypeEastWestResize },
-    { LoadCursor(NULL, IDC_SIZEALL),     WebCursorInfo::TypeMove },
-    { LoadCursor(NULL, IDC_APPSTARTING), WebCursorInfo::TypeProgress },
-    { LoadCursor(NULL, IDC_NO),          WebCursorInfo::TypeNotAllowed },
-  };
-  for (int i = 0; i < arraysize(kStandardCursors); i++) {
-    if (cursor == kStandardCursors[i].cursor)
-      return kStandardCursors[i].type;
-  }
-  return WebCursorInfo::TypeCustom;
-}
-
 HCURSOR WebCursor::GetCursor(HINSTANCE module_handle){
   if (!IsCustom()) {
     const wchar_t* cursor_id =
         ToCursorID(static_cast<WebCursorInfo::Type>(type_));
 
     if (IsSystemCursorID(cursor_id))
       module_handle = NULL;
 
     return LoadCursor(module_handle, cursor_id);
   }
@@ skipping 39 matching lines @@
   DeleteObject(bitmap_handle);
   DeleteDC(workingDC);
   ReleaseDC(0, dc);
   return custom_cursor_;
 }
 
 gfx::NativeCursor WebCursor::GetNativeCursor() {
   return GetCursor(NULL);
 }
 
-void WebCursor::InitFromExternalCursor(HCURSOR cursor) {
-  WebCursorInfo::Type cursor_type = ToCursorType(cursor);
-
-  InitFromCursorInfo(WebCursorInfo(cursor_type));
-
-  if (cursor_type == WebCursorInfo::TypeCustom)
-    external_cursor_ = cursor;
-}
-
 void WebCursor::InitPlatformData() {
-  external_cursor_ = NULL;
   custom_cursor_ = NULL;
 }
 
 bool WebCursor::SerializePlatformData(Pickle* pickle) const {
   // There are some issues with converting certain HCURSORS to bitmaps. The
   // HCURSOR being a user object can be marshaled as is.
   // HCURSORs are always 32 bits on Windows, even on 64 bit systems.
   return pickle->WriteUInt32(reinterpret_cast<uint32>(external_cursor_));
 }
 
@@ skipping 17 matching lines @@
 }
 
 void WebCursor::CleanupPlatformData() {
   external_cursor_ = NULL;
 
   if (custom_cursor_) {
     DestroyIcon(custom_cursor_);
     custom_cursor_ = NULL;
   }
 }