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

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

Issue 608503005: Revert of cc: Remove use of PassAs() and constructor-casting with scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 unified diff | Download patch
« no previous file with comments | « cc/layers/solid_color_layer_impl.cc ('k') | cc/layers/solid_color_scrollbar_layer_impl.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/solid_color_scrollbar_layer.h" 5 #include "cc/layers/solid_color_scrollbar_layer.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "cc/layers/layer_impl.h" 8 #include "cc/layers/layer_impl.h"
9 #include "cc/layers/solid_color_scrollbar_layer_impl.h" 9 #include "cc/layers/solid_color_scrollbar_layer_impl.h"
10 10
11 namespace cc { 11 namespace cc {
12 12
13 scoped_ptr<LayerImpl> SolidColorScrollbarLayer::CreateLayerImpl( 13 scoped_ptr<LayerImpl> SolidColorScrollbarLayer::CreateLayerImpl(
14 LayerTreeImpl* tree_impl) { 14 LayerTreeImpl* tree_impl) {
15 const bool kIsOverlayScrollbar = true; 15 const bool kIsOverlayScrollbar = true;
16 return SolidColorScrollbarLayerImpl::Create(tree_impl, 16 return SolidColorScrollbarLayerImpl::Create(tree_impl,
17 id(), 17 id(),
18 orientation(), 18 orientation(),
19 thumb_thickness_, 19 thumb_thickness_,
20 track_start_, 20 track_start_,
21 is_left_side_vertical_scrollbar_, 21 is_left_side_vertical_scrollbar_,
22 kIsOverlayScrollbar); 22 kIsOverlayScrollbar)
23 .PassAs<LayerImpl>();
23 } 24 }
24 25
25 scoped_refptr<SolidColorScrollbarLayer> SolidColorScrollbarLayer::Create( 26 scoped_refptr<SolidColorScrollbarLayer> SolidColorScrollbarLayer::Create(
26 ScrollbarOrientation orientation, 27 ScrollbarOrientation orientation,
27 int thumb_thickness, 28 int thumb_thickness,
28 int track_start, 29 int track_start,
29 bool is_left_side_vertical_scrollbar, 30 bool is_left_side_vertical_scrollbar,
30 int scroll_layer_id) { 31 int scroll_layer_id) {
31 return make_scoped_refptr( 32 return make_scoped_refptr(
32 new SolidColorScrollbarLayer(orientation, 33 new SolidColorScrollbarLayer(orientation,
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 95
95 clip_layer_id_ = layer_id; 96 clip_layer_id_ = layer_id;
96 SetNeedsFullTreeSync(); 97 SetNeedsFullTreeSync();
97 } 98 }
98 99
99 ScrollbarOrientation SolidColorScrollbarLayer::orientation() const { 100 ScrollbarOrientation SolidColorScrollbarLayer::orientation() const {
100 return orientation_; 101 return orientation_;
101 } 102 }
102 103
103 } // namespace cc 104 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/solid_color_layer_impl.cc ('k') | cc/layers/solid_color_scrollbar_layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698