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

android_webview/browser/render_thread_manager.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/render_thread_manager.h"
 
 #include <utility>
 
 #include "android_webview/browser/child_frame.h"
 #include "android_webview/browser/compositor_frame_producer.h"
@@ skipping 267 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 (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();
   }
 
   if (draw_info->mode == AwDrawGLInfo::kModeProcessNoContext) {
     LOG(ERROR) << "Received unexpected kModeProcessNoContext";
   }
 
   if (IsInsideHardwareRelease()) {
     hardware_renderer_has_frame_ = false;
     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_->DrawGL(draw_info, state_restore);
+    hardware_renderer_->DrawGL(draw_info);
   DeferredGpuCommandService::GetInstance()->PerformIdleWork(false);
 }
 
 void RenderThreadManager::DeleteHardwareRendererOnUI() {
   DCHECK(ui_loop_->BelongsToCurrentThread());
 
   InsideHardwareReleaseReset auto_inside_hardware_release_reset(this);
 
   client_->DetachFunctorFromView();
 
@@ skipping 60 matching lines @@
     : render_thread_manager_(render_thread_manager) {
   DCHECK(!render_thread_manager_->IsInsideHardwareRelease());
   render_thread_manager_->SetInsideHardwareRelease(true);
 }
 
 RenderThreadManager::InsideHardwareReleaseReset::~InsideHardwareReleaseReset() {
   render_thread_manager_->SetInsideHardwareRelease(false);
 }
 
 }  // namespace android_webview