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

Unified Diff: content/browser/android/in_process/synchronous_compositor_output_surface.cc

Issue 1394263004: android webview: allow cc to fail hardware draw (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tests compile but crash Created 5 years, 2 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
« cc/scheduler/scheduler_state_machine.cc ('K') | « cc/trees/layer_tree_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/android/in_process/synchronous_compositor_output_surface.cc
diff --git a/content/browser/android/in_process/synchronous_compositor_output_surface.cc b/content/browser/android/in_process/synchronous_compositor_output_surface.cc
index f03f992d83d4a289296527d774ef66aa65783037..753390b5818b5f7abb89a9c217cf47fa7818d4fe 100644
--- a/content/browser/android/in_process/synchronous_compositor_output_surface.cc
+++ b/content/browser/android/in_process/synchronous_compositor_output_surface.cc
@@ -74,7 +74,6 @@ SynchronousCompositorOutputSurface::SynchronousCompositorOutputSurface(
current_sw_canvas_(nullptr),
memory_policy_(0),
frame_swap_message_queue_(frame_swap_message_queue) {
- capabilities_.draw_and_swap_full_viewport_every_frame = true;
capabilities_.adjust_deadline_for_parent = false;
capabilities_.delegated_rendering = true;
capabilities_.max_frames_pending = 1;
@@ -213,7 +212,9 @@ void SynchronousCompositorOutputSurface::InvokeComposite(
viewport_rect_for_tile_priority,
transform_for_tile_priority,
!hardware_draw);
- SetNeedsRedrawRect(gfx::Rect(viewport.size()));
+ if (!hardware_draw) {
+ SetNeedsRedrawRect(gfx::Rect(viewport.size()));
+ }
client_->OnDraw();
« cc/scheduler/scheduler_state_machine.cc ('K') | « cc/trees/layer_tree_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698