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

Unified Diff: android_webview/browser/hardware_renderer.cc

Issue 551023002: aw: Skip hardware onDraw when visible rect is empty (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove unrelated change Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/browser/browser_view_renderer.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/browser/hardware_renderer.cc
diff --git a/android_webview/browser/hardware_renderer.cc b/android_webview/browser/hardware_renderer.cc
index 28cec803ab7a589801d844c1e0c48f30689078d1..c2737af172d6234aa7df3bbcea516c5f09e8590e 100644
--- a/android_webview/browser/hardware_renderer.cc
+++ b/android_webview/browser/hardware_renderer.cc
@@ -139,10 +139,9 @@ void HardwareRenderer::DidBeginMainFrame() {
void HardwareRenderer::CommitFrame() {
scoped_ptr<DrawGLInput> input = shared_renderer_state_->PassDrawGLInput();
- if (!input.get()) {
- DLOG(WARNING) << "No frame to commit";
+ // Happens with empty global visible rect.
+ if (!input.get())
return;
- }
DCHECK(!input->frame.gl_frame_data);
DCHECK(!input->frame.software_frame_data);
@@ -192,11 +191,6 @@ void HardwareRenderer::DrawGL(bool stencil_enabled,
return;
}
- if (!delegated_layer_.get()) {
- DLOG(ERROR) << "No frame committed";
- return;
- }
-
// TODO(boliu): Handle context loss.
if (last_egl_context_ != current_context)
DLOG(WARNING) << "EGLContextChanged";
@@ -216,6 +210,9 @@ void HardwareRenderer::DrawGL(bool stencil_enabled,
draw_constraints);
}
+ if (!delegated_layer_.get())
+ return;
+
viewport_.SetSize(draw_info->width, draw_info->height);
layer_tree_host_->SetViewportSize(viewport_);
clip_.SetRect(draw_info->clip_left,
« 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