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

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

Issue 1946583002: Avoid recreating hardware_renderer_ if a draw occurs during cleanup. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: return uncomitted frame to BVR when RTM dies Created 4 years, 7 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
« no previous file with comments | « android_webview/browser/browser_view_renderer.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 } 281 }
282 282
283 ScopedAppGLStateRestore state_restore( 283 ScopedAppGLStateRestore state_restore(
284 draw_info->mode == AwDrawGLInfo::kModeDraw 284 draw_info->mode == AwDrawGLInfo::kModeDraw
285 ? ScopedAppGLStateRestore::MODE_DRAW 285 ? ScopedAppGLStateRestore::MODE_DRAW
286 : ScopedAppGLStateRestore::MODE_RESOURCE_MANAGEMENT); 286 : ScopedAppGLStateRestore::MODE_RESOURCE_MANAGEMENT);
287 // Set the correct FBO before kModeDraw. The GL commands run in kModeDraw 287 // Set the correct FBO before kModeDraw. The GL commands run in kModeDraw
288 // require a correctly bound FBO. The FBO remains until the next kModeDraw. 288 // require a correctly bound FBO. The FBO remains until the next kModeDraw.
289 // So kModeProcess between kModeDraws has correctly bound FBO, too. 289 // So kModeProcess between kModeDraws has correctly bound FBO, too.
290 if (draw_info->mode == AwDrawGLInfo::kModeDraw && !hardware_renderer_ && 290 if (draw_info->mode == AwDrawGLInfo::kModeDraw && !hardware_renderer_ &&
291 HasFrameForHardwareRendererOnRT()) { 291 !IsInsideHardwareRelease() && HasFrameForHardwareRendererOnRT()) {
292 hardware_renderer_.reset(new HardwareRenderer(this)); 292 hardware_renderer_.reset(new HardwareRenderer(this));
293 hardware_renderer_->CommitFrame(); 293 hardware_renderer_->CommitFrame();
294 } 294 }
295 if (hardware_renderer_) { 295 if (hardware_renderer_) {
296 hardware_renderer_->SetBackingFrameBufferObject( 296 hardware_renderer_->SetBackingFrameBufferObject(
297 state_restore.framebuffer_binding_ext()); 297 state_restore.framebuffer_binding_ext());
298 } 298 }
299 299
300 ScopedAllowGL allow_gl; 300 ScopedAllowGL allow_gl;
301 301
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 : render_thread_manager_(render_thread_manager) { 390 : render_thread_manager_(render_thread_manager) {
391 DCHECK(!render_thread_manager_->IsInsideHardwareRelease()); 391 DCHECK(!render_thread_manager_->IsInsideHardwareRelease());
392 render_thread_manager_->SetInsideHardwareRelease(true); 392 render_thread_manager_->SetInsideHardwareRelease(true);
393 } 393 }
394 394
395 RenderThreadManager::InsideHardwareReleaseReset::~InsideHardwareReleaseReset() { 395 RenderThreadManager::InsideHardwareReleaseReset::~InsideHardwareReleaseReset() {
396 render_thread_manager_->SetInsideHardwareRelease(false); 396 render_thread_manager_->SetInsideHardwareRelease(false);
397 } 397 }
398 398
399 } // namespace android_webview 399 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/browser/browser_view_renderer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698