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

Side by Side Diff: android_webview/browser/render_thread_manager.cc

Issue 2360963004: aw: Fix FBO restore bug (Closed)
Patch Set: Created 4 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "android_webview/browser/render_thread_manager.h" 5 #include "android_webview/browser/render_thread_manager.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "android_webview/browser/child_frame.h" 9 #include "android_webview/browser/child_frame.h"
10 #include "android_webview/browser/compositor_frame_producer.h" 10 #include "android_webview/browser/compositor_frame_producer.h"
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 // require a correctly bound FBO. The FBO remains until the next kModeDraw. 289 // require a correctly bound FBO. The FBO remains until the next kModeDraw.
290 // So kModeProcess between kModeDraws has correctly bound FBO, too. 290 // So kModeProcess between kModeDraws has correctly bound FBO, too.
291 if (hardware_renderer_) { 291 if (hardware_renderer_) {
292 hardware_renderer_->SetBackingFrameBufferObject( 292 hardware_renderer_->SetBackingFrameBufferObject(
293 state_restore.framebuffer_binding_ext()); 293 state_restore.framebuffer_binding_ext());
294 } 294 }
295 295
296 ScopedAllowGL allow_gl; 296 ScopedAllowGL allow_gl;
297 if (!hardware_renderer_ && draw_info->mode == AwDrawGLInfo::kModeDraw && 297 if (!hardware_renderer_ && draw_info->mode == AwDrawGLInfo::kModeDraw &&
298 !IsInsideHardwareRelease() && HasFrameForHardwareRendererOnRT()) { 298 !IsInsideHardwareRelease() && HasFrameForHardwareRendererOnRT()) {
299 hardware_renderer_.reset(new HardwareRenderer(this)); 299 hardware_renderer_.reset(
300 hardware_renderer_->SetBackingFrameBufferObject( 300 new HardwareRenderer(this, state_restore.framebuffer_binding_ext()));
301 state_restore.framebuffer_binding_ext());
302 hardware_renderer_->CommitFrame(); 301 hardware_renderer_->CommitFrame();
303 } 302 }
304 303
305 if (draw_info->mode == AwDrawGLInfo::kModeProcessNoContext) { 304 if (draw_info->mode == AwDrawGLInfo::kModeProcessNoContext) {
306 LOG(ERROR) << "Received unexpected kModeProcessNoContext"; 305 LOG(ERROR) << "Received unexpected kModeProcessNoContext";
307 } 306 }
308 307
309 if (IsInsideHardwareRelease()) { 308 if (IsInsideHardwareRelease()) {
310 hardware_renderer_has_frame_ = false; 309 hardware_renderer_has_frame_ = false;
311 hardware_renderer_.reset(); 310 hardware_renderer_.reset();
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 : render_thread_manager_(render_thread_manager) { 395 : render_thread_manager_(render_thread_manager) {
397 DCHECK(!render_thread_manager_->IsInsideHardwareRelease()); 396 DCHECK(!render_thread_manager_->IsInsideHardwareRelease());
398 render_thread_manager_->SetInsideHardwareRelease(true); 397 render_thread_manager_->SetInsideHardwareRelease(true);
399 } 398 }
400 399
401 RenderThreadManager::InsideHardwareReleaseReset::~InsideHardwareReleaseReset() { 400 RenderThreadManager::InsideHardwareReleaseReset::~InsideHardwareReleaseReset() {
402 render_thread_manager_->SetInsideHardwareRelease(false); 401 render_thread_manager_->SetInsideHardwareRelease(false);
403 } 402 }
404 403
405 } // namespace android_webview 404 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/browser/hardware_renderer.cc ('k') | android_webview/browser/surfaces_instance.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698