Make sure FBO is correct for both kModeProcess and kModeDraw

android_webview/browser/hardware_renderer.cc

Index: android_webview/browser/hardware_renderer.cc
diff --git a/android_webview/browser/hardware_renderer.cc b/android_webview/browser/hardware_renderer.cc
index eca386e6e4bb845c9969c28bee2bb6f0b8c051a6..a4a3f806713af8981664238ac5cd0e1fc4612309 100644
--- a/android_webview/browser/hardware_renderer.cc
+++ b/android_webview/browser/hardware_renderer.cc
@@ -106,7 +106,6 @@ void HardwareRenderer::CommitFrame() {
 }
 
 void HardwareRenderer::DrawGL(bool stencil_enabled,
-                              int framebuffer_binding_ext,
                               AwDrawGLInfo* draw_info) {
   TRACE_EVENT0("android_webview", "HardwareRenderer::DrawGL");
 
@@ -175,7 +174,6 @@ void HardwareRenderer::DrawGL(bool stencil_enabled,
 
   display_->Resize(viewport);
 
-  gl_surface_->SetBackingFrameBufferObject(framebuffer_binding_ext);
   if (!output_surface_) {
     scoped_refptr<cc::ContextProvider> context_provider =
         AwRenderThreadContextProvider::Create(
@@ -188,7 +186,6 @@ void HardwareRenderer::DrawGL(bool stencil_enabled,
   output_surface_->SetExternalStencilTest(stencil_enabled);
   display_->SetExternalClip(clip);
   display_->DrawAndSwap();
-  gl_surface_->ResetBackingFrameBufferObject();
 }
 
 void HardwareRenderer::ReturnResources(
@@ -196,4 +193,9 @@ void HardwareRenderer::ReturnResources(
   shared_renderer_state_->InsertReturnedResourcesOnRT(resources);
 }
 
+void HardwareRenderer::SetBackingFrameBufferObject(
+    int framebuffer_binding_ext) {
+  gl_surface_->SetBackingFrameBufferObject(framebuffer_binding_ext);
+}
+
 }  // namespace android_webview