OLD | NEW |
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 "config.h" | 5 #include "config.h" |
6 | 6 |
7 #if USE(ACCELERATED_COMPOSITING) | 7 #if USE(ACCELERATED_COMPOSITING) |
8 | 8 |
9 #include "SolidColorLayerChromium.h" | 9 #include "SolidColorLayerChromium.h" |
10 | 10 |
11 #include "CCSolidColorLayerImpl.h" | 11 #include "CCSolidColorLayerImpl.h" |
12 | 12 |
13 namespace cc { | 13 namespace cc { |
14 | 14 |
15 PassOwnPtr<CCLayerImpl> SolidColorLayerChromium::createCCLayerImpl() | 15 scoped_ptr<CCLayerImpl> SolidColorLayerChromium::createCCLayerImpl() |
16 { | 16 { |
17 return CCSolidColorLayerImpl::create(id()); | 17 return CCSolidColorLayerImpl::create(id()).PassAs<CCLayerImpl>(); |
18 } | 18 } |
19 | 19 |
20 scoped_refptr<SolidColorLayerChromium> SolidColorLayerChromium::create() | 20 scoped_refptr<SolidColorLayerChromium> SolidColorLayerChromium::create() |
21 { | 21 { |
22 return make_scoped_refptr(new SolidColorLayerChromium()); | 22 return make_scoped_refptr(new SolidColorLayerChromium()); |
23 } | 23 } |
24 | 24 |
25 SolidColorLayerChromium::SolidColorLayerChromium() | 25 SolidColorLayerChromium::SolidColorLayerChromium() |
26 : LayerChromium() | 26 : LayerChromium() |
27 { | 27 { |
28 } | 28 } |
29 | 29 |
30 SolidColorLayerChromium::~SolidColorLayerChromium() | 30 SolidColorLayerChromium::~SolidColorLayerChromium() |
31 { | 31 { |
32 } | 32 } |
33 | 33 |
34 } // namespace cc | 34 } // namespace cc |
35 | 35 |
36 #endif // USE(ACCELERATED_COMPOSITING) | 36 #endif // USE(ACCELERATED_COMPOSITING) |
OLD | NEW |