cc: Add BeginFrameArgs

content/browser/renderer_host/compositor_impl_android.cc

 // 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.
 
 #include "content/browser/renderer_host/compositor_impl_android.h"
 
 #include <android/bitmap.h>
 #include <android/native_window_jni.h>
 #include <map>
 
@@ skipping 28 matching lines @@
 namespace gfx {
 class JavaBitmap;
 }
 
 namespace {
 
 // Used for drawing directly to the screen. Bypasses resizing and swaps.
 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;

[no sievers, 2013/06/13 01:17:47]

This is for the soon-to-be-deprecated WebView w/browser compositor path....

+  }
 
   virtual void Reshape(gfx::Size size, float scale_factor) OVERRIDE {
     surface_size_ = size;
   }
   virtual void SwapBuffers(cc::CompositorFrame*) OVERRIDE {
     context3d()->shallowFlushCHROMIUM();
   }
 };
 
 static bool g_initialized = false;
@@ skipping 302 matching lines @@
                                                   url,
                                                   factory,
                                                   weak_factory_.GetWeakPtr()));
     if (!context->InitializeWithDefaultBufferSizes(
         attrs,
         false,
         CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE)) {
       LOG(ERROR) << "Failed to create 3D context for compositor.";
       return scoped_ptr<cc::OutputSurface>();
     }
     return make_scoped_ptr(new cc::OutputSurface(

[no sievers, 2013/06/13 01:17:47]

...while this is created for Chrome, ContentShell etc. for the browser
compositor. Do we also need to set has_parent_compositor to false here?

[brianderson, 2013/06/14 20:12:02]

Ok, will change this.

         context.PassAs<WebKit::WebGraphicsContext3D>()));
   }
 }
 
 void CompositorImpl::DidCompleteSwapBuffers() {
   client_->OnSwapBuffersCompleted();
 }
 
 void CompositorImpl::ScheduleComposite() {
   client_->ScheduleComposite();
@@ skipping 77 matching lines @@
     case ANDROID_BITMAP_FORMAT_RGBA_8888:
       return GL_UNSIGNED_BYTE;
       break;
     case ANDROID_BITMAP_FORMAT_RGB_565:
     default:
       return GL_UNSIGNED_SHORT_5_6_5;
   }
 }
 
 } // namespace content