Render Core Animation plugins through WebKit's compositor rather than

content/plugin/webplugin_accelerated_surface_proxy_mac.h

Index: content/plugin/webplugin_accelerated_surface_proxy_mac.h
===================================================================
--- content/plugin/webplugin_accelerated_surface_proxy_mac.h	(revision 111400)
+++ content/plugin/webplugin_accelerated_surface_proxy_mac.h	(working copy)
@@ -19,22 +19,31 @@
     : public webkit::npapi::WebPluginAcceleratedSurface {
  public:
   // Creates a new WebPluginAcceleratedSurfaceProxy that uses plugin_proxy
-  // to proxy calls. plugin_proxy must outlive this object.
-  WebPluginAcceleratedSurfaceProxy(WebPluginProxy* plugin_proxy,
-                                   gfx::GpuPreference gpu_preference);
+  // to proxy calls. plugin_proxy must outlive this object. Returns NULL if
+  // initialization fails.
+  static WebPluginAcceleratedSurfaceProxy* Create(
+      WebPluginProxy* plugin_proxy,
+      gfx::GpuPreference gpu_preference);
+
   virtual ~WebPluginAcceleratedSurfaceProxy();
 
   // WebPluginAcceleratedSurface implementation.
   virtual void SetWindowHandle(gfx::PluginWindowHandle window) OVERRIDE;
+  virtual bool IsComposited() OVERRIDE;
   virtual void SetSize(const gfx::Size& size) OVERRIDE;
   virtual CGLContextObj context() OVERRIDE;
   virtual void StartDrawing() OVERRIDE;
   virtual void EndDrawing() OVERRIDE;
 
  private:
+  WebPluginAcceleratedSurfaceProxy(WebPluginProxy* plugin_proxy,
+                                   AcceleratedSurface* surface,
+                                   bool composited);
+
   WebPluginProxy* plugin_proxy_;  // Weak ref.
   gfx::PluginWindowHandle window_handle_;
   AcceleratedSurface* surface_;
+  bool composited_;
 
   DISALLOW_COPY_AND_ASSIGN(WebPluginAcceleratedSurfaceProxy);
 };