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 1bb44aa75c313e4fedabc107a41e9beb2e01e4dc..1232df2b9655e8be65e35d1bafafffe62a39acb7 100644 |
--- a/android_webview/browser/render_thread_manager.cc |
+++ b/android_webview/browser/render_thread_manager.cc |
@@ -287,17 +287,20 @@ void RenderThreadManager::DrawGL(AwDrawGLInfo* draw_info) { |
// 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( |
danakj
2016/06/10 23:13:10
Do you mean for this to be above the creation of h
boliu
2016/06/10 23:15:01
I added it right below new HardwareRenderer too :)
danakj
2016/06/10 23:19:05
Oh ok, I was thinking of just moving the ScopedAll
|
+ state_restore.framebuffer_binding_ext()); |
+ } |
+ |
+ ScopedAllowGL allow_gl; |
if (draw_info->mode == AwDrawGLInfo::kModeDraw && !hardware_renderer_ && |
!IsInsideHardwareRelease() && HasFrameForHardwareRendererOnRT()) { |
hardware_renderer_.reset(new HardwareRenderer(this)); |
- hardware_renderer_->CommitFrame(); |
- } |
- if (hardware_renderer_) { |
hardware_renderer_->SetBackingFrameBufferObject( |
state_restore.framebuffer_binding_ext()); |
+ hardware_renderer_->CommitFrame(); |
} |
- ScopedAllowGL allow_gl; |
if (draw_info->mode == AwDrawGLInfo::kModeProcessNoContext) { |
LOG(ERROR) << "Received unexpected kModeProcessNoContext"; |