[Merge M54] aw: Fix FBO restore in webview functor

android_webview/browser/render_thread_manager.cc

Index: android_webview/browser/render_thread_manager.cc
diff --git a/android_webview/browser/render_thread_manager.cc b/android_webview/browser/render_thread_manager.cc
index 9ffaec25ea3dfff81786f03e6eda12cc898e5df1..bb85bfbd5ce175eb5cda9d3874a35deee4d933ae 100644
--- a/android_webview/browser/render_thread_manager.cc
+++ b/android_webview/browser/render_thread_manager.cc
@@ -285,20 +285,10 @@ void RenderThreadManager::DrawGL(AwDrawGLInfo* draw_info) {
       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 (hardware_renderer_) {
-    hardware_renderer_->SetBackingFrameBufferObject(
-        state_restore.framebuffer_binding_ext());
-  }
-
   ScopedAllowGL allow_gl;
   if (!hardware_renderer_ && draw_info->mode == AwDrawGLInfo::kModeDraw &&
       !IsInsideHardwareRelease() && HasFrameForHardwareRendererOnRT()) {
     hardware_renderer_.reset(new HardwareRenderer(this));
-    hardware_renderer_->SetBackingFrameBufferObject(
-        state_restore.framebuffer_binding_ext());
     hardware_renderer_->CommitFrame();
   }
 
@@ -322,7 +312,7 @@ void RenderThreadManager::DrawGL(AwDrawGLInfo* draw_info) {
   }
 
   if (hardware_renderer_)
-    hardware_renderer_->DrawGL(draw_info, state_restore);
+    hardware_renderer_->DrawGL(draw_info);
   DeferredGpuCommandService::GetInstance()->PerformIdleWork(false);
 }