Make sure FBO is correct for both kModeProcess and kModeDraw

android_webview/browser/hardware_renderer.cc

 // Copyright 2014 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 "android_webview/browser/hardware_renderer.h"
 
 #include "android_webview/browser/aw_gl_surface.h"
 #include "android_webview/browser/aw_render_thread_context_provider.h"
 #include "android_webview/browser/child_frame.h"
 #include "android_webview/browser/deferred_gpu_command_service.h"
@@ skipping 88 matching lines @@
       surface_factory_->Destroy(child_id_);
     child_id_ = surface_id_allocator_->GenerateId();
     surface_factory_->Create(child_id_);
   }
 
   surface_factory_->SubmitCompositorFrame(child_id_, frame.Pass(),
                                           cc::SurfaceFactory::DrawCallback());
 }
 
 void HardwareRenderer::DrawGL(bool stencil_enabled,
-                              int framebuffer_binding_ext,
                               AwDrawGLInfo* draw_info) {
   TRACE_EVENT0("android_webview", "HardwareRenderer::DrawGL");
 
   // We need to watch if the current Android context has changed and enforce
   // a clean-up in the compositor.
   EGLContext current_context = eglGetCurrentContext();
   DCHECK(current_context) << "DrawGL called without EGLContext";
 
   // TODO(boliu): Handle context loss.
   if (last_egl_context_ != current_context)
@@ skipping 48 matching lines @@
   if (root_id_.is_null()) {
     root_id_ = surface_id_allocator_->GenerateId();
     surface_factory_->Create(root_id_);
     display_->SetSurfaceId(root_id_, 1.f);
   }
   surface_factory_->SubmitCompositorFrame(root_id_, frame.Pass(),
                                           cc::SurfaceFactory::DrawCallback());
 
   display_->Resize(viewport);
 
-  gl_surface_->SetBackingFrameBufferObject(framebuffer_binding_ext);
   if (!output_surface_) {
     scoped_refptr<cc::ContextProvider> context_provider =
         AwRenderThreadContextProvider::Create(
             gl_surface_, DeferredGpuCommandService::GetInstance());
     scoped_ptr<ParentOutputSurface> output_surface_holder(
         new ParentOutputSurface(context_provider));
     output_surface_ = output_surface_holder.get();
     display_->Initialize(output_surface_holder.Pass(), nullptr);
   }
   output_surface_->SetExternalStencilTest(stencil_enabled);
   display_->SetExternalClip(clip);
   display_->DrawAndSwap();
-  gl_surface_->ResetBackingFrameBufferObject();
 }
 
 void HardwareRenderer::ReturnResources(
     const cc::ReturnedResourceArray& resources) {
   shared_renderer_state_->InsertReturnedResourcesOnRT(resources);
 }
 
+void HardwareRenderer::SetBackingFrameBufferObject(
+    int framebuffer_binding_ext) {
+  gl_surface_->SetBackingFrameBufferObject(framebuffer_binding_ext);
+}
+
 }  // namespace android_webview