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

Unified Diff: cc/trees/layer_tree_host_impl.cc

Issue 17550008: Make IsSolidColor() a property on CC scrollbar layers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Jochen's comments. Created 7 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 side-by-side diff with in-line comments
Download patch
Index: cc/trees/layer_tree_host_impl.cc
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 56562b54c46cd7afa493a14ecf0ceeab5126772a..90cedb224351c3717d71605114e20098e50b0fe8 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -1261,7 +1261,7 @@ gfx::SizeF LayerTreeHostImpl::VisibleViewportSize() const {
// The clip layer should be used if non-overlay scrollbars may exist since
// it adjusts for them.
LayerImpl* clip_layer = active_tree_->RootClipLayer();
- if (!Settings().solid_color_scrollbars && clip_layer &&
+ if (!settings().force_solid_color_scrollbars && clip_layer &&
clip_layer->masks_to_bounds())
dip_size = clip_layer->bounds();
@@ -1567,7 +1567,7 @@ bool LayerTreeHostImpl::DeferredInitialize(
scoped_refptr<ContextProvider> offscreen_context_provider) {
DCHECK(output_surface_->capabilities().deferred_gl_initialization);
DCHECK(settings_.impl_side_painting);
- DCHECK(settings_.solid_color_scrollbars);
+ DCHECK(settings_.force_solid_color_scrollbars);
DCHECK(output_surface_->context3d());
ReleaseTreeResources();

Powered by Google App Engine
This is Rietveld 408576698