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 "webkit/compositor_bindings/web_layer_impl.h" |
6 | 6 |
7 #include "SkMatrix44.h" | |
8 #ifdef LOG | |
9 #undef LOG | |
10 #endif | |
11 #include "base/string_util.h" | 7 #include "base/string_util.h" |
12 #include "cc/animation.h" | 8 #include "cc/animation.h" |
13 #include "cc/layer.h" | 9 #include "cc/layer.h" |
14 #include "cc/region.h" | 10 #include "cc/region.h" |
15 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" | 11 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" |
16 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h" | 12 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h" |
17 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" | 13 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" |
18 #include "third_party/WebKit/Source/Platform/chromium/public/WebTransformationMa
trix.h" | 14 #include "third_party/WebKit/Source/Platform/chromium/public/WebTransformationMa
trix.h" |
19 #include "web_animation_impl.h" | 15 #include "third_party/skia/include/utils/SkMatrix44.h" |
| 16 #include "webkit/compositor_bindings/web_animation_impl.h" |
20 | 17 |
21 using cc::Animation; | 18 using cc::Animation; |
22 using cc::Layer; | 19 using cc::Layer; |
23 | 20 |
24 namespace { | 21 namespace { |
25 gfx::Transform convertWebTransformationMatrixToTransform(const WebKit::WebTransf
ormationMatrix& matrix) | 22 gfx::Transform convertWebTransformationMatrixToTransform(const WebKit::WebTransf
ormationMatrix& matrix) |
26 { | 23 { |
27 // TODO(jamesr): When gfx::Transform provides a constructor that does not | 24 // TODO(jamesr): When gfx::Transform provides a constructor that does not |
28 // initialize the matrix, use that. | 25 // initialize the matrix, use that. |
29 gfx::Transform transform; | 26 gfx::Transform transform; |
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
444 { | 441 { |
445 m_layer->setLayerScrollClient(scrollClient); | 442 m_layer->setLayerScrollClient(scrollClient); |
446 } | 443 } |
447 | 444 |
448 Layer* WebLayerImpl::layer() const | 445 Layer* WebLayerImpl::layer() const |
449 { | 446 { |
450 return m_layer.get(); | 447 return m_layer.get(); |
451 } | 448 } |
452 | 449 |
453 } // namespace WebKit | 450 } // namespace WebKit |
OLD | NEW |