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 "config.h" | 5 #include "config.h" |
6 #include "WebLayerImpl.h" | 6 #include "WebLayerImpl.h" |
7 | 7 |
8 #include "SkMatrix44.h" | 8 #include "SkMatrix44.h" |
9 #include "WebAnimationImpl.h" | 9 #include "WebAnimationImpl.h" |
10 #ifdef LOG | 10 #ifdef LOG |
11 #undef LOG | 11 #undef LOG |
12 #endif | 12 #endif |
| 13 #include "cc/active_animation.h" |
13 #include "base/string_util.h" | 14 #include "base/string_util.h" |
14 #include "cc/active_animation.h" | 15 #include "cc/active_animation.h" |
15 #include "cc/layer.h" | 16 #include "cc/layer.h" |
16 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" | 17 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" |
17 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h" | 18 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h" |
18 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" | 19 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" |
19 #include "third_party/WebKit/Source/Platform/chromium/public/WebTransformationMa
trix.h" | 20 #include "third_party/WebKit/Source/Platform/chromium/public/WebTransformationMa
trix.h" |
20 #include "webcore_convert.h" | 21 #include "webcore_convert.h" |
21 | 22 |
22 using cc::CCActiveAnimation; | 23 using cc::CCActiveAnimation; |
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
432 { | 433 { |
433 m_layer->setLayerScrollClient(scrollClient); | 434 m_layer->setLayerScrollClient(scrollClient); |
434 } | 435 } |
435 | 436 |
436 LayerChromium* WebLayerImpl::layer() const | 437 LayerChromium* WebLayerImpl::layer() const |
437 { | 438 { |
438 return m_layer.get(); | 439 return m_layer.get(); |
439 } | 440 } |
440 | 441 |
441 } // namespace WebKit | 442 } // namespace WebKit |
OLD | NEW |