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

Side by Side Diff: cc/layers/solid_color_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/picture_layer_impl_unittest.cc ('k') | cc/layers/solid_color_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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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_layer.h" 5 #include "cc/layers/solid_color_layer.h"
6 6
7 #include "cc/layers/solid_color_layer_impl.h" 7 #include "cc/layers/solid_color_layer_impl.h"
8 8
9 namespace cc { 9 namespace cc {
10 10
11 scoped_ptr<LayerImpl> SolidColorLayer::CreateLayerImpl( 11 scoped_ptr<LayerImpl> SolidColorLayer::CreateLayerImpl(
12 LayerTreeImpl* tree_impl) { 12 LayerTreeImpl* tree_impl) {
13 return SolidColorLayerImpl::Create(tree_impl, id()); 13 return SolidColorLayerImpl::Create(tree_impl, id()).PassAs<LayerImpl>();
14 } 14 }
15 15
16 scoped_refptr<SolidColorLayer> SolidColorLayer::Create() { 16 scoped_refptr<SolidColorLayer> SolidColorLayer::Create() {
17 return make_scoped_refptr(new SolidColorLayer()); 17 return make_scoped_refptr(new SolidColorLayer());
18 } 18 }
19 19
20 SolidColorLayer::SolidColorLayer() 20 SolidColorLayer::SolidColorLayer()
21 : Layer() {} 21 : Layer() {}
22 22
23 SolidColorLayer::~SolidColorLayer() {} 23 SolidColorLayer::~SolidColorLayer() {}
24 24
25 void SolidColorLayer::SetBackgroundColor(SkColor color) { 25 void SolidColorLayer::SetBackgroundColor(SkColor color) {
26 SetContentsOpaque(SkColorGetA(color) == 255); 26 SetContentsOpaque(SkColorGetA(color) == 255);
27 Layer::SetBackgroundColor(color); 27 Layer::SetBackgroundColor(color);
28 } 28 }
29 29
30 } // namespace cc 30 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/picture_layer_impl_unittest.cc ('k') | cc/layers/solid_color_layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698