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

Side by Side Diff: cc/layers/scrollbar_layer_impl_base.cc

Issue 1991523002: cc : Track ids for which active opacity always wins on property trees (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « cc/layers/scrollbar_layer_impl_base.h ('k') | cc/layers/scrollbar_layer_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 "cc/layers/scrollbar_layer_impl_base.h" 5 #include "cc/layers/scrollbar_layer_impl_base.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include "cc/trees/layer_tree_impl.h" 8 #include "cc/trees/layer_tree_impl.h"
9 #include "ui/gfx/geometry/rect_conversions.h" 9 #include "ui/gfx/geometry/rect_conversions.h"
10 10
(...skipping 22 matching lines...) Expand all
33 33
34 void ScrollbarLayerImplBase::PushPropertiesTo(LayerImpl* layer) { 34 void ScrollbarLayerImplBase::PushPropertiesTo(LayerImpl* layer) {
35 float active_opacity = layer->opacity(); 35 float active_opacity = layer->opacity();
36 LayerImpl::PushPropertiesTo(layer); 36 LayerImpl::PushPropertiesTo(layer);
37 layer->SetOpacity(active_opacity); 37 layer->SetOpacity(active_opacity);
38 DCHECK(layer->ToScrollbarLayer()); 38 DCHECK(layer->ToScrollbarLayer());
39 layer->ToScrollbarLayer()->set_is_overlay_scrollbar(is_overlay_scrollbar_); 39 layer->ToScrollbarLayer()->set_is_overlay_scrollbar(is_overlay_scrollbar_);
40 layer->ToScrollbarLayer()->SetScrollLayerId(ScrollLayerId()); 40 layer->ToScrollbarLayer()->SetScrollLayerId(ScrollLayerId());
41 } 41 }
42 42
43 void ScrollbarLayerImplBase::DidBecomeActive() {
44 LayerImpl::DidBecomeActive();
45 UpdatePropertyTreeOpacity();
46 }
47
48 ScrollbarLayerImplBase* ScrollbarLayerImplBase::ToScrollbarLayer() { 43 ScrollbarLayerImplBase* ScrollbarLayerImplBase::ToScrollbarLayer() {
49 return this; 44 return this;
50 } 45 }
51 46
52 void ScrollbarLayerImplBase::SetScrollLayerId(int scroll_layer_id) { 47 void ScrollbarLayerImplBase::SetScrollLayerId(int scroll_layer_id) {
53 if (scroll_layer_id_ == scroll_layer_id) 48 if (scroll_layer_id_ == scroll_layer_id)
54 return; 49 return;
55 50
56 layer_tree_impl()->UnregisterScrollbar(this); 51 layer_tree_impl()->UnregisterScrollbar(this);
57 52
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 : thumb_thickness_adjustment, 196 : thumb_thickness_adjustment,
202 thumb_offset, 197 thumb_offset,
203 thumb_thickness - thumb_thickness_adjustment, 198 thumb_thickness - thumb_thickness_adjustment,
204 thumb_length); 199 thumb_length);
205 } 200 }
206 201
207 return gfx::ToEnclosingRect(thumb_rect); 202 return gfx::ToEnclosingRect(thumb_rect);
208 } 203 }
209 204
210 } // namespace cc 205 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/scrollbar_layer_impl_base.h ('k') | cc/layers/scrollbar_layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698