Make sure FBO is correct for both kModeProcess and kModeDraw

android_webview/browser/shared_renderer_state.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/shared_renderer_state.h"
 
 #include "android_webview/browser/browser_view_renderer.h"
 #include "android_webview/browser/child_frame.h"
 #include "android_webview/browser/deferred_gpu_command_service.h"
 #include "android_webview/browser/hardware_renderer.h"
@@ skipping 241 matching lines @@
     base::AutoLock lock(lock_);
     if (renderer_manager_key_ != manager->NullKey()) {
       manager->DidDrawGL(renderer_manager_key_);
     }
   }
 
   ScopedAppGLStateRestore state_restore(
       draw_info->mode == AwDrawGLInfo::kModeDraw
           ? ScopedAppGLStateRestore::MODE_DRAW
           : ScopedAppGLStateRestore::MODE_RESOURCE_MANAGEMENT);
+  // Set the correct FBO before kModeDraw. The GL commands run in kModeDraw
+  // require a correctly bound FBO. The FBO remains until the next kModeDraw.
+  // So kModeProcess between kModeDraws has correctly bound FBO, too.
+  if (draw_info->mode == AwDrawGLInfo::kModeDraw) {
+    if (!hardware_renderer_) {
+      hardware_renderer_.reset(new HardwareRenderer(this));
+      hardware_renderer_->CommitFrame();
+    }
+    hardware_renderer_->SetBackingFrameBufferObject(
+        state_restore.framebuffer_binding_ext());
+  }
+
   ScopedAllowGL allow_gl;
 
   if (draw_info->mode == AwDrawGLInfo::kModeProcessNoContext) {
     LOG(ERROR) << "Received unexpected kModeProcessNoContext";
   }
 
   if (IsInsideHardwareRelease()) {
     hardware_renderer_.reset();
     // Flush the idle queue in tear down.
     DeferredGpuCommandService::GetInstance()->PerformAllIdleWork();
     return;
   }
 
   if (draw_info->mode != AwDrawGLInfo::kModeDraw) {
     if (draw_info->mode == AwDrawGLInfo::kModeProcess) {
       DeferredGpuCommandService::GetInstance()->PerformIdleWork(true);
     }
     return;
   }
 
-  if (!hardware_renderer_) {
-    hardware_renderer_.reset(new HardwareRenderer(this));
-    hardware_renderer_->CommitFrame();
-  }
-
-  hardware_renderer_->DrawGL(state_restore.stencil_enabled(),
-                             state_restore.framebuffer_binding_ext(),
-                             draw_info);
+  hardware_renderer_->DrawGL(state_restore.stencil_enabled(), draw_info);
   DeferredGpuCommandService::GetInstance()->PerformIdleWork(false);
 }
 
 void SharedRendererState::ReleaseHardwareDrawIfNeededOnUI() {
   ReleaseCompositorResourcesIfNeededOnUI(true);
 }
 
 void SharedRendererState::DeleteHardwareRendererOnUI() {
   ReleaseCompositorResourcesIfNeededOnUI(false);
 }
@@ skipping 52 matching lines @@
     : shared_renderer_state_(shared_renderer_state) {
   DCHECK(!shared_renderer_state_->IsInsideHardwareRelease());
   shared_renderer_state_->SetInsideHardwareRelease(true);
 }
 
 SharedRendererState::InsideHardwareReleaseReset::~InsideHardwareReleaseReset() {
   shared_renderer_state_->SetInsideHardwareRelease(false);
 }
 
 }  // namespace android_webview