cc: Add BeginFrameArgs

content/browser/renderer_host/compositor_impl_android.cc

Index: content/browser/renderer_host/compositor_impl_android.cc
diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc
index c5560e61684d5a47b23ab6b2013888845634e40d..f19a50017b04942dcfc88eb2ea829911e63d6dc5 100644
--- a/content/browser/renderer_host/compositor_impl_android.cc
+++ b/content/browser/renderer_host/compositor_impl_android.cc
@@ -46,7 +46,9 @@ namespace {
 class DirectOutputSurface : public cc::OutputSurface {
  public:
   DirectOutputSurface(scoped_ptr<WebKit::WebGraphicsContext3D> context3d)
-      : cc::OutputSurface(context3d.Pass()) {}
+      : cc::OutputSurface(context3d.Pass()) {
+    capabilities_.has_parent_compositor = false;
+  }
 
   virtual void Reshape(gfx::Size size, float scale_factor) OVERRIDE {
     surface_size_ = size;
@@ -365,8 +367,10 @@ scoped_ptr<cc::OutputSurface> CompositorImpl::CreateOutputSurface() {
       LOG(ERROR) << "Failed to create 3D context for compositor.";
       return scoped_ptr<cc::OutputSurface>();
     }
-    return make_scoped_ptr(new cc::OutputSurface(
-        context.PassAs<WebKit::WebGraphicsContext3D>()));
+    cc::OutputSurface* output_surface = new cc::OutputSurface(

[no sievers, 2013/06/14 21:15:32]

nit:
scoped_ptr<OutputSurface> output_surface(new ...());
return output_surface.Pass();

+        context.PassAs<WebKit::WebGraphicsContext3D>());
+    output_surface->capabilities().has_parent_compositor = false;
+    return make_scoped_ptr(output_surface);
   }
 }