OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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 "web_layer_impl.h" | 5 #include "web_layer_impl.h" |
6 | 6 |
7 #include "SkMatrix44.h" | 7 #include "SkMatrix44.h" |
8 #ifdef LOG | 8 #ifdef LOG |
9 #undef LOG | 9 #undef LOG |
10 #endif | 10 #endif |
11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
12 #include "cc/active_animation.h" | 12 #include "cc/active_animation.h" |
13 #include "cc/layer.h" | 13 #include "cc/layer.h" |
14 #include "cc/region.h" | 14 #include "cc/region.h" |
15 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" | 15 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" |
16 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h" | 16 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h" |
17 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" | 17 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" |
18 #include "third_party/WebKit/Source/Platform/chromium/public/WebTransformationMa
trix.h" | 18 #include "third_party/WebKit/Source/Platform/chromium/public/WebTransformationMa
trix.h" |
19 #include "web_animation_impl.h" | 19 #include "web_animation_impl.h" |
20 | 20 |
21 using cc::ActiveAnimation; | 21 using cc::ActiveAnimation; |
22 using cc::Layer; | 22 using cc::Layer; |
23 | 23 |
24 namespace WebKit { | 24 namespace WebKit { |
25 | 25 |
26 WebLayer* WebLayer::create() | |
27 { | |
28 return new WebLayerImpl(); | |
29 } | |
30 | |
31 WebLayerImpl::WebLayerImpl() | 26 WebLayerImpl::WebLayerImpl() |
32 : m_layer(Layer::create()) | 27 : m_layer(Layer::create()) |
33 { | 28 { |
34 } | 29 } |
35 | 30 |
36 WebLayerImpl::WebLayerImpl(scoped_refptr<Layer> layer) | 31 WebLayerImpl::WebLayerImpl(scoped_refptr<Layer> layer) |
37 : m_layer(layer) | 32 : m_layer(layer) |
38 { | 33 { |
39 } | 34 } |
40 | 35 |
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
422 { | 417 { |
423 m_layer->setLayerScrollClient(scrollClient); | 418 m_layer->setLayerScrollClient(scrollClient); |
424 } | 419 } |
425 | 420 |
426 Layer* WebLayerImpl::layer() const | 421 Layer* WebLayerImpl::layer() const |
427 { | 422 { |
428 return m_layer.get(); | 423 return m_layer.get(); |
429 } | 424 } |
430 | 425 |
431 } // namespace WebKit | 426 } // namespace WebKit |
OLD | NEW |