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