Migrate Graphics2D to new design.

content/renderer/pepper/pepper_graphics_2d_host.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 CONTENT_RENDERER_PEPPER_PEPPER_GRAPHICS_2D_HOST_H_
+#define CONTENT_RENDERER_PEPPER_PEPPER_GRAPHICS_2D_HOST_H_
+
+#include "base/compiler_specific.h"
+#include "base/memory/weak_ptr.h"
+#include "content/common/content_export.h"
+#include "ppapi/c/ppb_graphics_2d.h"
+#include "ppapi/host/resource_host.h"
+#include "ppapi/host/host_message_context.h"
+#include "webkit/plugins/ppapi/plugin_delegate.h"
+#include "webkit/plugins/ppapi/ppb_graphics_2d_impl.h"  // TODO: merge to here
+
+namespace webkit {
+namespace ppapi {
+class PPB_ImageData_Impl;
+class PluginInstance;
+}
+}
+
+namespace content {
+
+class RendererPpapiHost;
+
+class CONTENT_EXPORT PepperGraphics2DHost
+    : public ppapi::host::ResourceHost,
+      public webkit::ppapi::PluginDelegate::PlatformGraphics2D,
+      public base::SupportsWeakPtr<PepperGraphics2DHost> {
+ public:
+  static PepperGraphics2DHost* Create(RendererPpapiHost* host,

[brettw, 2012/10/05 22:38:06]

I'd delete this two-phase init and put everything into the constructor. When
running out-of-process we can't return errors anyway. Instead, the messages
should just do nothing, and Flush should return PP_ERROR_FAILED.

[victorhsieh, 2012/10/05 23:26:57]

In that case, PPB_Graphics2D.Create no longer returns 0.  I was worried that
developer might expect that once they get the resource created, everything
should be correct.  But if that's ok, I can delete this Create.

[brettw, 2012/10/09 20:47:13]

Yeah, it kind of sucks that we can't return an error. But there's no way to do
this out-of-process without a sync message which we really don't want. And it's
not clear there's anything useful the developer can do in response to this error
(since they can't display anything!).

[victorhsieh, 2012/10/11 22:56:23]

Done.

+                                      PP_Instance instance,
+                                      PP_Resource resource,
+                                      const PP_Size& size,
+                                      PP_Bool is_always_opaque);
+
+  virtual ~PepperGraphics2DHost();
+
+  virtual int32_t OnResourceMessageReceived(
+      const IPC::Message& msg,
+      ppapi::host::HostMessageContext* context) OVERRIDE;
+
+  // PlatformGraphics2D overrides.
+  bool ReadImageData(PP_Resource image, const PP_Point* top_left) OVERRIDE;
+  bool BindToInstance(webkit::ppapi::PluginInstance* new_instance) OVERRIDE;
+  void Paint(WebKit::WebCanvas* canvas,
+             const gfx::Rect& plugin_rect,
+             const gfx::Rect& paint_rect) OVERRIDE;
+  void ViewWillInitiatePaint() OVERRIDE;
+  void ViewInitiatedPaint() OVERRIDE;
+  void ViewFlushedPaint() OVERRIDE;
+
+  float GetScale() const OVERRIDE { return graphics_2d_->scale_; }
+
+  bool IsAlwaysOpaque() const OVERRIDE {
+    return graphics_2d_->is_always_opaque_;
+  }
+
+  webkit::ppapi::PPB_ImageData_Impl* ImageData() OVERRIDE {
+    return graphics_2d_->image_data_.get();
+  }
+
+  bool IsGraphics2DHost() const OVERRIDE { return true; }
+
+ private:
+  PepperGraphics2DHost(RendererPpapiHost* host,
+                       PP_Instance instance,
+                       PP_Resource resource);
+
+  int32_t OnHostMsgPaintImageData(ppapi::host::HostMessageContext* context,
+                                  const ppapi::HostResource& image_data,
+                                  const PP_Point& top_left,
+                                  bool src_rect_specified,
+                                  const PP_Rect& src_rect);
+  int32_t OnHostMsgScroll(ppapi::host::HostMessageContext* context,
+                          bool clip_specified,
+                          const PP_Rect& clip,
+                          const PP_Point& amount);
+  int32_t OnHostMsgReplaceContents(ppapi::host::HostMessageContext* context,
+                                   const ppapi::HostResource& image_data);
+  int32_t OnHostMsgFlush(ppapi::host::HostMessageContext* context);
+  int32_t OnHostMsgSetScale(ppapi::host::HostMessageContext* context,
+                            float scale);
+  int32_t OnHostMsgReadImageData(ppapi::host::HostMessageContext* context,
+                                 PP_Resource image,
+                                 const PP_Point& top_left);
+
+  static void SendFlushACKToPlugin(void* data, int32_t pp_error);
+
+  // TODO: merge this delegation into this host class.
+  scoped_refptr<webkit::ppapi::PPB_Graphics2D_Impl> graphics_2d_;
+
+  ppapi::host::ReplyMessageContext reply_context_;

[brettw, 2012/10/05 22:38:06]

Can you call this something more specific like "flush_reply_context_" instead?

[victorhsieh, 2012/10/05 23:26:57]

Done.

+
+  DISALLOW_COPY_AND_ASSIGN(PepperGraphics2DHost);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_RENDERER_PEPPER_PEPPER_GRAPHICS_2D_HOST_H_