cc: Use the correct internal format for glCopyTexImage2D calls.

content/browser/compositor/offscreen_browser_compositor_output_surface.cc

 // Copyright 2015 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/compositor/offscreen_browser_compositor_output_surface.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "build/build_config.h"
@@ skipping 12 matching lines @@
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 
 using cc::CompositorFrame;
 using cc::GLFrameData;
 using cc::ResourceProvider;
 using gpu::gles2::GLES2Interface;
 
 namespace content {
 
+static cc::ResourceFormat kFboTextureFormat = cc::RGBA_8888;
+
 OffscreenBrowserCompositorOutputSurface::
     OffscreenBrowserCompositorOutputSurface(
         scoped_refptr<ContextProviderCommandBuffer> context,
         scoped_refptr<ui::CompositorVSyncManager> vsync_manager,
         cc::SyntheticBeginFrameSource* begin_frame_source,
         std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
             overlay_candidate_validator)
     : BrowserCompositorOutputSurface(std::move(context),
                                      std::move(vsync_manager),
                                      begin_frame_source,
                                      std::move(overlay_candidate_validator)),
       fbo_(0),
       is_backbuffer_discarded_(false),
       weak_ptr_factory_(this) {
   capabilities_.uses_default_gl_framebuffer = false;
 }
 
 OffscreenBrowserCompositorOutputSurface::
     ~OffscreenBrowserCompositorOutputSurface() {
   DiscardBackbuffer();
 }
 
 void OffscreenBrowserCompositorOutputSurface::EnsureBackbuffer() {
   is_backbuffer_discarded_ = false;
 
-  if (!reflector_texture_.get()) {
+  if (!reflector_texture_) {
     reflector_texture_.reset(new ReflectorTexture(context_provider()));
 
     GLES2Interface* gl = context_provider_->ContextGL();
 
     const int max_texture_size =
         context_provider_->ContextCapabilities().max_texture_size;
     int texture_width = std::min(max_texture_size, surface_size_.width());
     int texture_height = std::min(max_texture_size, surface_size_.height());
 
-    cc::ResourceFormat format = cc::RGBA_8888;
     gl->BindTexture(GL_TEXTURE_2D, reflector_texture_->texture_id());
     gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
     gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
     gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    gl->TexImage2D(GL_TEXTURE_2D, 0, GLInternalFormat(format),
+    gl->TexImage2D(GL_TEXTURE_2D, 0, GLInternalFormat(kFboTextureFormat),
                    texture_width, texture_height, 0,
-                   GLDataFormat(format), GLDataType(format), nullptr);
+                   GLDataFormat(kFboTextureFormat),
+                   GLDataType(kFboTextureFormat), nullptr);
     if (!fbo_)
       gl->GenFramebuffers(1, &fbo_);
 
     gl->BindFramebuffer(GL_FRAMEBUFFER, fbo_);
     gl->FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
                              GL_TEXTURE_2D, reflector_texture_->texture_id(),
                              0);
     reflector_->OnSourceTextureMailboxUpdated(
         reflector_texture_->mailbox());
   }
@@ skipping 33 matching lines @@
   bool need_to_bind = !!reflector_texture_.get();
   EnsureBackbuffer();
   DCHECK(reflector_texture_.get());
 
   if (need_to_bind) {
     GLES2Interface* gl = context_provider_->ContextGL();
     gl->BindFramebuffer(GL_FRAMEBUFFER, fbo_);
   }
 }
 
+GLenum
+OffscreenBrowserCompositorOutputSurface::GetFramebufferCopyTextureFormat() {
+  return GLCopyTextureInternalFormat(kFboTextureFormat);
+}
+
 void OffscreenBrowserCompositorOutputSurface::SwapBuffers(
     cc::CompositorFrame* frame) {
   if (reflector_) {
     if (frame->gl_frame_data->sub_buffer_rect ==
         gfx::Rect(frame->gl_frame_data->size))
       reflector_->OnSourceSwapBuffers();
     else
       reflector_->OnSourcePostSubBuffer(frame->gl_frame_data->sub_buffer_rect);
   }
 
@@ skipping 17 matching lines @@
   if (reflector_)
     EnsureBackbuffer();
 }
 
 base::Closure
 OffscreenBrowserCompositorOutputSurface::CreateCompositionStartedCallback() {
   return base::Closure();
 }
 
 }  // namespace content