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

Side by Side Diff: cc/layers/painted_scrollbar_layer_impl.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/painted_scrollbar_layer.cc ('k') | cc/layers/picture_image_layer.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/painted_scrollbar_layer_impl.h" 5 #include "cc/layers/painted_scrollbar_layer_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "cc/animation/scrollbar_animation_controller.h" 9 #include "cc/animation/scrollbar_animation_controller.h"
10 #include "cc/layers/layer.h" 10 #include "cc/layers/layer.h"
(...skipping 25 matching lines...) Expand all
36 thumb_length_(0), 36 thumb_length_(0),
37 track_start_(0), 37 track_start_(0),
38 track_length_(0), 38 track_length_(0),
39 vertical_adjust_(0.f), 39 vertical_adjust_(0.f),
40 scroll_layer_id_(Layer::INVALID_ID) {} 40 scroll_layer_id_(Layer::INVALID_ID) {}
41 41
42 PaintedScrollbarLayerImpl::~PaintedScrollbarLayerImpl() {} 42 PaintedScrollbarLayerImpl::~PaintedScrollbarLayerImpl() {}
43 43
44 scoped_ptr<LayerImpl> PaintedScrollbarLayerImpl::CreateLayerImpl( 44 scoped_ptr<LayerImpl> PaintedScrollbarLayerImpl::CreateLayerImpl(
45 LayerTreeImpl* tree_impl) { 45 LayerTreeImpl* tree_impl) {
46 return PaintedScrollbarLayerImpl::Create(tree_impl, id(), orientation()); 46 return PaintedScrollbarLayerImpl::Create(tree_impl, id(), orientation())
47 .PassAs<LayerImpl>();
47 } 48 }
48 49
49 void PaintedScrollbarLayerImpl::PushPropertiesTo(LayerImpl* layer) { 50 void PaintedScrollbarLayerImpl::PushPropertiesTo(LayerImpl* layer) {
50 ScrollbarLayerImplBase::PushPropertiesTo(layer); 51 ScrollbarLayerImplBase::PushPropertiesTo(layer);
51 52
52 PaintedScrollbarLayerImpl* scrollbar_layer = 53 PaintedScrollbarLayerImpl* scrollbar_layer =
53 static_cast<PaintedScrollbarLayerImpl*>(layer); 54 static_cast<PaintedScrollbarLayerImpl*>(layer);
54 55
55 scrollbar_layer->SetThumbThickness(thumb_thickness_); 56 scrollbar_layer->SetThumbThickness(thumb_thickness_);
56 scrollbar_layer->SetThumbLength(thumb_length_); 57 scrollbar_layer->SetThumbLength(thumb_length_);
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 183
183 bool PaintedScrollbarLayerImpl::IsThumbResizable() const { 184 bool PaintedScrollbarLayerImpl::IsThumbResizable() const {
184 return false; 185 return false;
185 } 186 }
186 187
187 const char* PaintedScrollbarLayerImpl::LayerTypeAsString() const { 188 const char* PaintedScrollbarLayerImpl::LayerTypeAsString() const {
188 return "cc::PaintedScrollbarLayerImpl"; 189 return "cc::PaintedScrollbarLayerImpl";
189 } 190 }
190 191
191 } // namespace cc 192 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/painted_scrollbar_layer.cc ('k') | cc/layers/picture_image_layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698