Fix cursor in fullscreen pepper

content/renderer/render_widget_fullscreen_pepper.cc

 // Copyright (c) 2011 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/renderer/render_widget_fullscreen_pepper.h"
 
 #include "base/message_loop.h"
 #include "content/common/view_messages.h"
 #include "content/renderer/gpu/gpu_channel_host.h"
 #include "content/renderer/pepper_platform_context_3d_impl.h"
@@ skipping 20 matching lines @@
 using WebKit::WebWidget;
 
 namespace {
 
 // WebWidget that simply wraps the pepper plugin.
 class PepperWidget : public WebWidget {
  public:
   PepperWidget(webkit::ppapi::PluginInstance* plugin,
                RenderWidgetFullscreenPepper* widget)
       : plugin_(plugin),
-        widget_(widget),
-        cursor_(WebCursorInfo::TypePointer) {
+        widget_(widget) {
   }
 
   virtual ~PepperWidget() {}
 
   // WebWidget API
   virtual void close() {
     delete this;
   }
 
   virtual WebSize size() {
@@ skipping 37 matching lines @@
     gl->BindTexture(GL_TEXTURE_2D, texture);
     gl->DrawArrays(GL_TRIANGLES, 0, 3);
     widget_->SwapBuffers();
   }
 
   virtual void themeChanged() {
     NOTIMPLEMENTED();
   }
 
   virtual bool handleInputEvent(const WebInputEvent& event) {
-    bool result = plugin_->HandleInputEvent(event, &cursor_);
+    // This cursor info is ignored, we always set the cursor directly from
+    // RenderWidgetFullscreenPepper::DidChangeCursor.
+    WebCursorInfo cursor;
+    bool result = plugin_->HandleInputEvent(event, &cursor);
 
     // For normal web pages, WebViewImpl does input event translations and
     // generates context menu events. Since we don't have a WebView, we need to
     // do the necessary translation ourselves.
     if (WebInputEvent::isMouseEventType(event.type)) {
       const WebMouseEvent& mouse_event =
           reinterpret_cast<const WebMouseEvent&>(event);
       bool send_context_menu_event = false;
       // On Mac/Linux, we handle it on mouse down.
       // On Windows, we handle it on mouse up.
 #if defined(OS_WIN)
       send_context_menu_event =
           mouse_event.type == WebInputEvent::MouseUp &&
           mouse_event.button == WebMouseEvent::ButtonRight;
 #elif defined(OS_MACOSX)
       send_context_menu_event =
           mouse_event.type == WebInputEvent::MouseDown &&
           (mouse_event.button == WebMouseEvent::ButtonRight ||
            (mouse_event.button == WebMouseEvent::ButtonLeft &&
             mouse_event.modifiers & WebMouseEvent::ControlKey));
 #else
       send_context_menu_event =
           mouse_event.type == WebInputEvent::MouseDown &&
           mouse_event.button == WebMouseEvent::ButtonRight;
 #endif
       if (send_context_menu_event) {
         WebMouseEvent context_menu_event(mouse_event);
         context_menu_event.type = WebInputEvent::ContextMenu;
-        plugin_->HandleInputEvent(context_menu_event, &cursor_);
+        plugin_->HandleInputEvent(context_menu_event, &cursor);
       }
     }
     return result;
   }
 
   virtual void mouseCaptureLost() {
     NOTIMPLEMENTED();
   }
 
   virtual void setFocus(bool focus) {
@@ skipping 41 matching lines @@
   }
 
   virtual bool isAcceleratedCompositingActive() const {
     return widget_->context() && (plugin_->GetBackingTextureId() != 0);
   }
 
  private:
   scoped_refptr<webkit::ppapi::PluginInstance> plugin_;
   RenderWidgetFullscreenPepper* widget_;
   WebSize size_;
-  WebCursorInfo cursor_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperWidget);
 };
 
 void DestroyContext(RendererGLContext* context, GLuint program, GLuint buffer) {
   DCHECK(context);
   gpu::gles2::GLES2Implementation* gl = context->GetImplementation();
   if (program)
     gl->DeleteProgram(program);
   if (buffer)
@@ skipping 53 matching lines @@
   }
 }
 
 void RenderWidgetFullscreenPepper::Destroy() {
   // This function is called by the plugin instance as it's going away, so reset
   // plugin_ to NULL to avoid calling into a dangling pointer e.g. on Close().
   plugin_ = NULL;
   Send(new ViewHostMsg_Close(routing_id_));
 }
 
+void RenderWidgetFullscreenPepper::DidChangeCursor(
+    const WebKit::WebCursorInfo& cursor) {
+  didChangeCursor(cursor);
+}
+
 webkit::ppapi::PluginDelegate::PlatformContext3D*
 RenderWidgetFullscreenPepper::CreateContext3D() {
   if (!context_) {
     CreateContext();
   }
   if (!context_)
     return NULL;
   return new PlatformContext3DImpl(context_);
 }
 
@@ skipping 212 matching lines @@
       NewRunnableFunction(DestroyContext, context_, program_, buffer_));
   context_ = NULL;
   program_ = 0;
   buffer_ = 0;
   OnSwapBuffersAborted();
 }
 
 void RenderWidgetFullscreenPepper::OnSwapBuffersCompleteByRendererGLContext() {
   OnSwapBuffersComplete();
 }