Add new MouseCursor interface for setting the mouse cursor.

webkit/plugins/ppapi/ppapi_plugin_instance.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 "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
@@ skipping 431 matching lines @@
 
   // Free any associated graphics.
   SetFullscreen(false);
   FlashSetFullscreen(false, false);
   bound_graphics_ = NULL;
   InvalidateRect(gfx::Rect());
 
   delegate()->PluginCrashed(this);
 }
 
-bool PluginInstance::SetCursor(PP_CursorType_Dev type,
-                               PP_Resource custom_image,
-                               const PP_Point* hot_spot) {
-  if (type != PP_CURSORTYPE_CUSTOM) {
-    DoSetCursor(new WebCursorInfo(static_cast<WebCursorInfo::Type>(type)));
-    return true;
-  }
-
-  if (!hot_spot)
-    return false;
-
-  EnterResourceNoLock<PPB_ImageData_API> enter(custom_image, true);
-  if (enter.failed())
-    return false;
-  PPB_ImageData_Impl* image_data =
-      static_cast<PPB_ImageData_Impl*>(enter.object());
-
-  if (image_data->format() != PPB_ImageData_Impl::GetNativeImageDataFormat()) {
-    // TODO(yzshen): Handle the case that the image format is different from the
-    // native format.
-    NOTIMPLEMENTED();
-    return false;
-  }
-
-  ImageDataAutoMapper auto_mapper(image_data);
-  if (!auto_mapper.is_valid())
-    return false;
-
-  scoped_ptr<WebCursorInfo> custom_cursor(
-      new WebCursorInfo(WebCursorInfo::TypeCustom));
-  custom_cursor->hotSpot.x = hot_spot->x;
-  custom_cursor->hotSpot.y = hot_spot->y;
-
-#if WEBKIT_USING_SKIA
-  const SkBitmap* bitmap = image_data->GetMappedBitmap();
-  // Make a deep copy, so that the cursor remains valid even after the original
-  // image data gets freed.
-  if (!bitmap->copyTo(&custom_cursor->customImage.getSkBitmap(),
-                      bitmap->config())) {
-    return false;
-  }
-#elif WEBKIT_USING_CG
-  // TODO(yzshen): Implement it.
-  NOTIMPLEMENTED();
-  return false;
-#endif
-
-  DoSetCursor(custom_cursor.release());
-  return true;
-}
-
 bool PluginInstance::Initialize(WebPluginContainer* container,
                                 const std::vector<std::string>& arg_names,
                                 const std::vector<std::string>& arg_values,
                                 const GURL& plugin_url,
                                 bool full_frame) {
   container_ = container;
   plugin_url_ = plugin_url;
   full_frame_ = full_frame;
 
   size_t argc = 0;
@@ skipping 1500 matching lines @@
     NOTREACHED();
     return;
   }
   delegate()->ZoomLimitsChanged(minimum_factor, maximium_factor);
 }
 
 void PluginInstance::PostMessage(PP_Instance instance, PP_Var message) {
   message_channel_->PostMessageToJavaScript(message);
 }
 
+PP_Bool PluginInstance::SetCursor(PP_Instance instance,
+                                  PP_MouseCursor_Type type,
+                                  PP_Resource image,
+                                  const PP_Point* hot_spot) {
+  if (!ValidateSetCursorParams(type, image, hot_spot))
+    return PP_FALSE;
+
+  if (type != PP_CURSORTYPE_CUSTOM) {
+    DoSetCursor(new WebCursorInfo(static_cast<WebCursorInfo::Type>(type)));

[dmichael (off chromium), 2012/03/26 17:43:17]

Would it be possible to have a test or something to make sure your values line
up with the WebKit ones? I'm sure they're very unlikely to change, but if they
do, you have no way to detect it automatically. Comparing enum values can even
be done with compile asserts.

[brettw, 2012/03/27 05:17:19]

There were already compiler asserts for this in ppapi_plugin_instance.cc, but I
realized it's still testing the old enum. I fixed this.

+    return PP_TRUE;
+  }
+
+  EnterResourceNoLock<PPB_ImageData_API> enter(image, true);
+  if (enter.failed())
+    return PP_FALSE;
+  PPB_ImageData_Impl* image_data =
+      static_cast<PPB_ImageData_Impl*>(enter.object());
+
+  ImageDataAutoMapper auto_mapper(image_data);
+  if (!auto_mapper.is_valid())
+    return PP_FALSE;
+
+  scoped_ptr<WebCursorInfo> custom_cursor(
+      new WebCursorInfo(WebCursorInfo::TypeCustom));
+  custom_cursor->hotSpot.x = hot_spot->x;
+  custom_cursor->hotSpot.y = hot_spot->y;
+
+#if WEBKIT_USING_SKIA
+  const SkBitmap* bitmap = image_data->GetMappedBitmap();
+  // Make a deep copy, so that the cursor remains valid even after the original
+  // image data gets freed.
+  if (!bitmap->copyTo(&custom_cursor->customImage.getSkBitmap(),
+                      bitmap->config())) {
+    return PP_FALSE;
+  }
+#elif WEBKIT_USING_CG
+  // TODO(yzshen): Implement it.
+  NOTIMPLEMENTED();
+  return false;
+#endif
+
+  DoSetCursor(custom_cursor.release());
+  return PP_TRUE;
+}
+
 int32_t PluginInstance::LockMouse(PP_Instance instance,
                                   PP_CompletionCallback callback) {
   if (!callback.func) {
     // Don't support synchronous call.
     return PP_ERROR_BLOCKS_MAIN_THREAD;
   }
   if (lock_mouse_callback_.func)  // A lock is pending.
     return PP_ERROR_INPROGRESS;
 
   if (delegate()->IsMouseLocked(this))
@@ skipping 135 matching lines @@
   screen_size_for_fullscreen_ = gfx::Size();
   WebElement element = container_->element();
   element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_);
 }
 
 }  // namespace ppapi
 }  // namespace webkit