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

Side by Side Diff: content/renderer/gpu/render_widget_compositor.cc

Issue 2922113002: Revert of cc: Don't use StreamVideoDrawQuad on any platform but Android. (patchset #3 id:40001 of h… (Closed)
Patch Set: Revert of cc: Don't use StreamVideoDrawQuad on any platform but Android. (patchset #3 id:40001 of h… Created 3 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 unified diff | Download patch
« no previous file with comments | « cc/trees/layer_tree_settings.h ('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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "content/renderer/gpu/render_widget_compositor.h" 5 #include "content/renderer/gpu/render_widget_compositor.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <cmath> 9 #include <cmath>
10 #include <limits> 10 #include <limits>
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 GetSwitchValueAsInt( 381 GetSwitchValueAsInt(
382 cmd, cc::switches::kSlowDownRasterScaleFactor, kMinSlowDownScaleFactor, 382 cmd, cc::switches::kSlowDownRasterScaleFactor, kMinSlowDownScaleFactor,
383 kMaxSlowDownScaleFactor, 383 kMaxSlowDownScaleFactor,
384 &settings.initial_debug_state.slow_down_raster_scale_factor); 384 &settings.initial_debug_state.slow_down_raster_scale_factor);
385 } 385 }
386 386
387 #if defined(OS_ANDROID) 387 #if defined(OS_ANDROID)
388 bool using_synchronous_compositor = 388 bool using_synchronous_compositor =
389 GetContentClient()->UsingSynchronousCompositing(); 389 GetContentClient()->UsingSynchronousCompositing();
390 390
391 settings.use_stream_video_draw_quad = true;
392 settings.using_synchronous_renderer_compositor = using_synchronous_compositor; 391 settings.using_synchronous_renderer_compositor = using_synchronous_compositor;
393 if (using_synchronous_compositor) { 392 if (using_synchronous_compositor) {
394 // Android WebView uses system scrollbars, so make ours invisible. 393 // Android WebView uses system scrollbars, so make ours invisible.
395 // http://crbug.com/677348: This can't be done using hide_scrollbars 394 // http://crbug.com/677348: This can't be done using hide_scrollbars
396 // setting because supporting -webkit custom scrollbars is still desired 395 // setting because supporting -webkit custom scrollbars is still desired
397 // on sublayers. 396 // on sublayers.
398 settings.scrollbar_animator = cc::LayerTreeSettings::NO_ANIMATOR; 397 settings.scrollbar_animator = cc::LayerTreeSettings::NO_ANIMATOR;
399 settings.solid_color_scrollbar_color = SK_ColorTRANSPARENT; 398 settings.solid_color_scrollbar_color = SK_ColorTRANSPARENT;
400 } else { 399 } else {
401 settings.scrollbar_animator = cc::LayerTreeSettings::ANDROID_OVERLAY; 400 settings.scrollbar_animator = cc::LayerTreeSettings::ANDROID_OVERLAY;
(...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after
1150 void RenderWidgetCompositor::SetContentSourceId(uint32_t id) { 1149 void RenderWidgetCompositor::SetContentSourceId(uint32_t id) {
1151 layer_tree_host_->SetContentSourceId(id); 1150 layer_tree_host_->SetContentSourceId(id);
1152 } 1151 }
1153 1152
1154 void RenderWidgetCompositor::SetLocalSurfaceId( 1153 void RenderWidgetCompositor::SetLocalSurfaceId(
1155 const cc::LocalSurfaceId& local_surface_id) { 1154 const cc::LocalSurfaceId& local_surface_id) {
1156 layer_tree_host_->SetLocalSurfaceId(local_surface_id); 1155 layer_tree_host_->SetLocalSurfaceId(local_surface_id);
1157 } 1156 }
1158 1157
1159 } // namespace content 1158 } // namespace content
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_settings.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698