Expose the WebGraphicsContext3D for Android

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/native_window_jni.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 43 matching lines @@
     {
         return m_context3D.get();
     }
 
     virtual void sendFrameToParentCompositor(
         const WebKit::WebCompositorFrame&) OVERRIDE
     {
     }
 
 private:
     scoped_ptr<WebKit::WebGraphicsContext3D> m_context3D;

[piman, 2012/10/12 16:38:48]

I just realize because of this CL, both this and the
ImageTransportFactoryAndroid own (in the scoped_ptr sense) the context. Isn't it
a problem?

[no sievers, 2012/10/12 16:42:43]

Actually they ImageTransportFactory has its own context that lives on the UI
thread. And we share resources between all contexts.

In the longer term I hope we can get rid of this extra context and the need for
it to do ETC1 uploads too.

On 2012/10/12 16:38:48, piman wrote:

     Capabilities m_capabilities;
     WebKit::WebCompositorOutputSurfaceClient* m_client;
 };
 
 } // anonymous namespace
 
 namespace content {
 
 // static
 Compositor* Compositor::Create() {
@@ skipping 93 matching lines @@
   root_layer_->setBounds(size);
 }
 
 bool CompositorImpl::CompositeAndReadback(void *pixels, const gfx::Rect& rect) {
   if (host_.get())
     return host_->compositeAndReadback(pixels, rect);
   else
     return false;
 }
 
+WebKit::WebGraphicsContext3D* CompositorImpl::GetContext3D() {
+  return ImageTransportFactoryAndroid::GetInstance()->GetContext3D();
+}
+
 void CompositorImpl::updateAnimations(double frameBeginTime) {
 }
 
 void CompositorImpl::layout() {
 }
 
 void CompositorImpl::applyScrollAndScale(const WebKit::WebSize& scrollDelta,
                                      float scaleFactor) {
 }
 
@@ skipping 29 matching lines @@
 void CompositorImpl::didCommitAndDrawFrame() {
 }
 
 void CompositorImpl::didCompleteSwapBuffers() {
 }
 
 void CompositorImpl::scheduleComposite() {
 }
 
 } // namespace content