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

Side by Side Diff: cc/blink/web_scrollbar_layer_impl.cc

Issue 1101823002: CC Animations: Make LayerAnimationController creation optional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Plumb LayerSettings parameter for cc::Layer construction. Created 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/blink/web_scrollbar_layer_impl.h" 5 #include "cc/blink/web_scrollbar_layer_impl.h"
6 6
7 #include "cc/blink/scrollbar_impl.h" 7 #include "cc/blink/scrollbar_impl.h"
8 #include "cc/blink/web_layer_impl.h" 8 #include "cc/blink/web_layer_impl.h"
9 #include "cc/layers/layer.h" 9 #include "cc/layers/layer.h"
10 #include "cc/layers/painted_scrollbar_layer.h" 10 #include "cc/layers/painted_scrollbar_layer.h"
(...skipping 13 matching lines...) Expand all
24 24
25 } // namespace 25 } // namespace
26 26
27 namespace cc_blink { 27 namespace cc_blink {
28 28
29 WebScrollbarLayerImpl::WebScrollbarLayerImpl( 29 WebScrollbarLayerImpl::WebScrollbarLayerImpl(
30 blink::WebScrollbar* scrollbar, 30 blink::WebScrollbar* scrollbar,
31 blink::WebScrollbarThemePainter painter, 31 blink::WebScrollbarThemePainter painter,
32 blink::WebScrollbarThemeGeometry* geometry) 32 blink::WebScrollbarThemeGeometry* geometry)
33 : layer_(new WebLayerImpl(PaintedScrollbarLayer::Create( 33 : layer_(new WebLayerImpl(PaintedScrollbarLayer::Create(
34 WebLayerImpl::LayerSettings(),
34 scoped_ptr<cc::Scrollbar>( 35 scoped_ptr<cc::Scrollbar>(
35 new ScrollbarImpl(make_scoped_ptr(scrollbar), 36 new ScrollbarImpl(make_scoped_ptr(scrollbar),
36 painter, 37 painter,
37 make_scoped_ptr(geometry))).Pass(), 38 make_scoped_ptr(geometry))).Pass(),
38 0))) { 39 0))) {
39 } 40 }
40 41
41 WebScrollbarLayerImpl::WebScrollbarLayerImpl( 42 WebScrollbarLayerImpl::WebScrollbarLayerImpl(
42 blink::WebScrollbar::Orientation orientation, 43 blink::WebScrollbar::Orientation orientation,
43 int thumb_thickness, 44 int thumb_thickness,
44 int track_start, 45 int track_start,
45 bool is_left_side_vertical_scrollbar) 46 bool is_left_side_vertical_scrollbar)
46 : layer_(new WebLayerImpl( 47 : layer_(new WebLayerImpl(
47 SolidColorScrollbarLayer::Create(ConvertOrientation(orientation), 48 SolidColorScrollbarLayer::Create(WebLayerImpl::LayerSettings(),
49 ConvertOrientation(orientation),
48 thumb_thickness, 50 thumb_thickness,
49 track_start, 51 track_start,
50 is_left_side_vertical_scrollbar, 52 is_left_side_vertical_scrollbar,
51 0))) { 53 0))) {
52 } 54 }
53 55
54 WebScrollbarLayerImpl::~WebScrollbarLayerImpl() { 56 WebScrollbarLayerImpl::~WebScrollbarLayerImpl() {
55 } 57 }
56 58
57 blink::WebLayer* WebScrollbarLayerImpl::layer() { 59 blink::WebLayer* WebScrollbarLayerImpl::layer() {
58 return layer_.get(); 60 return layer_.get();
59 } 61 }
60 62
61 void WebScrollbarLayerImpl::setScrollLayer(blink::WebLayer* layer) { 63 void WebScrollbarLayerImpl::setScrollLayer(blink::WebLayer* layer) {
62 cc::Layer* scroll_layer = 64 cc::Layer* scroll_layer =
63 layer ? static_cast<WebLayerImpl*>(layer)->layer() : 0; 65 layer ? static_cast<WebLayerImpl*>(layer)->layer() : 0;
64 layer_->layer()->ToScrollbarLayer()->SetScrollLayer( 66 layer_->layer()->ToScrollbarLayer()->SetScrollLayer(
65 scroll_layer ? scroll_layer->id() : cc::Layer::INVALID_ID); 67 scroll_layer ? scroll_layer->id() : cc::Layer::INVALID_ID);
66 } 68 }
67 69
68 void WebScrollbarLayerImpl::setClipLayer(blink::WebLayer* layer) { 70 void WebScrollbarLayerImpl::setClipLayer(blink::WebLayer* layer) {
69 cc::Layer* clip_layer = 71 cc::Layer* clip_layer =
70 layer ? static_cast<WebLayerImpl*>(layer)->layer() : 0; 72 layer ? static_cast<WebLayerImpl*>(layer)->layer() : 0;
71 layer_->layer()->ToScrollbarLayer()->SetClipLayer( 73 layer_->layer()->ToScrollbarLayer()->SetClipLayer(
72 clip_layer ? clip_layer->id() : cc::Layer::INVALID_ID); 74 clip_layer ? clip_layer->id() : cc::Layer::INVALID_ID);
73 } 75 }
74 76
75 } // namespace cc_blink 77 } // namespace cc_blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698