Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1747)

Unified Diff: android_webview/browser/render_thread_manager.cc

Issue 2063523002: aw: allow gl in HardwareRenderer constructor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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";
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698