Migrate Graphics2D to new design.

webkit/plugins/ppapi/plugin_delegate.h

 // 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_PLUGINS_PPAPI_PLUGIN_DELEGATE_H_
 #define WEBKIT_PLUGINS_PPAPI_PLUGIN_DELEGATE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 56 matching lines @@
 namespace thunk {
 class ResourceCreationAPI;
 }
 
 }  // namespace ppapi
 
 namespace skia {
 class PlatformCanvas;
 }
 
+class SkCanvas;
+
 namespace WebKit {
+typedef SkCanvas WebCanvas;
 class WebGamepads;
 class WebPlugin;
 struct WebCompositionUnderline;
 struct WebCursorInfo;
 }
 
 namespace webkit_glue {
 class ClipboardClient;
 class P2PTransport;
 class NetworkListObserver;
 }  // namespace webkit_glue
 
 namespace webkit {
 namespace ppapi {
 
 class FileIO;
 class FullscreenContainer;
 class PluginInstance;
 class PluginModule;
 class PPB_Broker_Impl;
 class PPB_Flash_Menu_Impl;
+class PPB_ImageData_Impl;
 class PPB_TCPSocket_Private_Impl;
 class PPB_UDPSocket_Private_Impl;
 
 // Virtual interface that the browser implements to implement features for
 // PPAPI plugins.
 class PluginDelegate {
  public:
   // This interface is used for the PluginModule to tell the code in charge of
   // re-using modules which modules currently exist.
   //
@@ skipping 55 matching lines @@
 
     // Returns the platform-specific shared memory handle of the data backing
     // this image. This is used by PPAPI proxying to send the image to the
     // out-of-process plugin. On success, the size in bytes will be placed into
     // |*bytes_count|. Returns 0 on failure.
     virtual intptr_t GetSharedMemoryHandle(uint32* byte_count) const = 0;
 
     virtual TransportDIB* GetTransportDIB() const = 0;
   };
 
+  class PlatformGraphics2D {
+   public:
+    virtual bool ReadImageData(PP_Resource image, const PP_Point* top_left) = 0;
+
+    // Assciates this device with the given plugin instance. You can pass NULL
+    // to clear the existing device. Returns true on success. In this case, a
+    // repaint of the page will also be scheduled. Failure means that the device
+    // is already bound to a different instance, and nothing will happen.
+    virtual bool BindToInstance(PluginInstance* new_instance) = 0;
+
+    // Paints the current backing store to the web page.
+    virtual void Paint(WebKit::WebCanvas* canvas,
+                       const gfx::Rect& plugin_rect,
+                       const gfx::Rect& paint_rect) = 0;
+
+    // Notifications about the view's progress painting.  See PluginInstance.
+    // These messages are used to send Flush callbacks to the plugin.
+    virtual void ViewWillInitiatePaint() = 0;
+    virtual void ViewInitiatedPaint() = 0;
+    virtual void ViewFlushedPaint() = 0;
+
+    virtual bool is_always_opaque() const = 0;

[brettw, 2012/10/02 21:18:57]

Since these are virtual functions, they should always be named in CamelCase (so
IsAlwaysOpaque). The lower_case_style should be for inline getters only. Same
for image_data() below.

[victorhsieh, 2012/10/02 22:15:03]

Done.

+    virtual float GetScale() const = 0;
+    virtual PPB_ImageData_Impl* image_data() = 0;
+  };
+
   class PlatformContext3D {
    public:
     virtual ~PlatformContext3D() {}
 
     // Initialize the context.
     virtual bool Init(const int32* attrib_list,
                       PlatformContext3D* share_context) = 0;
 
     // If the plugin instance is backed by an OpenGL, return its ID in the
     // compositors namespace. Otherwise return 0. Returns 0 by default.
@@ skipping 171 matching lines @@
   virtual SkBitmap* GetSadPluginBitmap() = 0;
 
   // Creates a replacement plug-in that is shown when the plug-in at |file_path|
   // couldn't be loaded.
   virtual WebKit::WebPlugin* CreatePluginReplacement(
       const FilePath& file_path) = 0;
 
   // The caller will own the pointer returned from this.
   virtual PlatformImage2D* CreateImage2D(int width, int height) = 0;
 
   // The caller will own the pointer returned from this.

[brettw, 2012/10/02 21:18:57]

I don't think this comment is correct. It looks like this just returns a pointer
to the interface corresponding to the given resource, and that the ownership of
the pointer is with the resource. Given this behavior, it seems like the name of
this function would be better if this was "GetPlatformGraphics2D" like you used
elsewhere.

[victorhsieh, 2012/10/02 22:15:03]

Done.

+  virtual PlatformGraphics2D* CreateGraphics2D(PluginInstance* instance,
+                                               PP_Resource graphics_2d) = 0;
+
+  // The caller will own the pointer returned from this.
   virtual PlatformContext3D* CreateContext3D() = 0;
 
   // Set that the context will now present to the delegate.
   virtual void ReparentContext(PlatformContext3D*) = 0;
 
   // If |device_id| is empty, the default video capture device will be used. The
   // user can start using the returned object to capture video right away.
   // Otherwise, the specified device will be used. The user needs to wait till
   // |handler| gets an OnInitialized() notification to start using the returned
   // object.
@@ skipping 299 matching lines @@
   // Returns restrictions on local data handled by the plug-in.
   virtual PP_FlashLSORestrictions GetLocalDataRestrictions(
       const GURL& document_url,
       const GURL& plugin_url) = 0;
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PLUGIN_DELEGATE_H_