| 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" | 8 #include "CCActiveAnimation.h" |
| 9 #include "LayerChromium.h" | 9 #include "LayerChromium.h" |
| 10 #include "SkMatrix44.h" | 10 #include "SkMatrix44.h" |
| 11 #include "WebAnimationImpl.h" | 11 #include "WebAnimationImpl.h" |
| 12 #ifdef LOG | 12 #ifdef LOG |
| 13 #undef LOG | 13 #undef LOG |
| 14 #endif | 14 #endif |
| 15 #include "base/string_util.h" | 15 #include "base/string_util.h" |
| 16 #include "webcore_convert.h" | 16 #include "webcore_convert.h" |
| 17 #include <public/WebFloatPoint.h> | 17 #include <public/WebFloatPoint.h> |
| 18 #include <public/WebFloatRect.h> | 18 #include <public/WebFloatRect.h> |
| 19 #include <public/WebSize.h> | 19 #include <public/WebSize.h> |
| 20 #include <public/WebTransformationMatrix.h> | 20 #include <public/WebTransformationMatrix.h> |
| 21 | 21 |
| 22 using WebCore::CCActiveAnimation; | 22 using cc::CCActiveAnimation; |
| 23 using WebCore::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 { |
| 31 double data[16]; | 31 double data[16]; |
| 32 matrix.asColMajord(data); | 32 matrix.asColMajord(data); |
| 33 return WebTransformationMatrix(data[0], data[1], data[2], data[3], | 33 return WebTransformationMatrix(data[0], data[1], data[2], data[3], |
| (...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 388 { | 388 { |
| 389 m_layer->setLayerScrollClient(scrollClient); | 389 m_layer->setLayerScrollClient(scrollClient); |
| 390 } | 390 } |
| 391 | 391 |
| 392 LayerChromium* WebLayerImpl::layer() const | 392 LayerChromium* WebLayerImpl::layer() const |
| 393 { | 393 { |
| 394 return m_layer.get(); | 394 return m_layer.get(); |
| 395 } | 395 } |
| 396 | 396 |
| 397 } // namespace WebKit | 397 } // namespace WebKit |
| OLD | NEW |