ÜC: support DelegatedFrameData in Aura

    
Note: this tries to share as much as possible from the texture path,
unfortunately there's a bit of impedence mismatch between the
SwapBuffersPrepare/SwapBuffersCompleted steps and what needs to be done for
DelegatedFrameData. It will be easier to do if/when we remove the
TextureImageTransportSurface path.
    
BUG=146080,123444

Review URL: https://chromiumcodereview.appspot.com/11414092

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186529 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 5 deletions

diff --git a/content/port/browser/render_widget_host_view_port.h b/content/port/browser/render_widget_host_view_port.h
index 8907d1da..9ab3224 100644
--- a/content/port/browser/render_widget_host_view_port.h
+++ b/content/port/browser/render_widget_host_view_port.h
@@ -8,6 +8,7 @@
 #include "base/callback.h"
 #include "base/process_util.h"
 #include "base/string16.h"
+#include "cc/compositor_frame.h"
 #include "content/common/content_export.h"
 #include "content/port/common/input_event_ack_state.h"
 #include "content/public/browser/render_widget_host_view.h"
@@ -27,10 +28,6 @@ struct GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params;
 struct ViewHostMsg_TextInputState_Params;
 struct ViewHostMsg_SelectionBounds_Params;
 
-namespace cc {
-class CompositorFrame;
-}
-
 namespace media {
 class VideoFrame;
 }
@@ -239,7 +236,7 @@ class CONTENT_EXPORT RenderWidgetHostViewPort : public RenderWidgetHostView,
   // returned only if the accelerated surface size matches.
   virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) = 0;
 
-  virtual void OnSwapCompositorFrame(const cc::CompositorFrame& frame) = 0;
+  virtual void OnSwapCompositorFrame(scoped_ptr<cc::CompositorFrame> frame) = 0;
 
   virtual void GetScreenInfo(WebKit::WebScreenInfo* results) = 0;