| Index: Source/core/css/resolver/TransformBuilder.cpp
|
| diff --git a/Source/core/css/TransformBuilder.cpp b/Source/core/css/resolver/TransformBuilder.cpp
|
| similarity index 89%
|
| rename from Source/core/css/TransformBuilder.cpp
|
| rename to Source/core/css/resolver/TransformBuilder.cpp
|
| index 4c3825b231f9d114449b3476f45ad4cd647dcf47..a9ccdcf49b45c9a5b4babd6e841279a3eef3330d 100644
|
| --- a/Source/core/css/TransformBuilder.cpp
|
| +++ b/Source/core/css/resolver/TransformBuilder.cpp
|
| @@ -27,10 +27,12 @@
|
| */
|
|
|
| #include "config.h"
|
| -#include "core/css/TransformBuilder.h"
|
| +#include "core/css/resolver/TransformBuilder.h"
|
|
|
| +#include "core/css/CSSPrimitiveValueMappings.h"
|
| +#include "core/css/WebKitCSSFilterValue.h"
|
| #include "core/css/WebKitCSSTransformValue.h"
|
| -#include "core/rendering/style/RenderStyle.h"
|
| +#include "core/platform/graphics/filters/FilterOperation.h"
|
| #include "core/platform/graphics/transforms/Matrix3DTransformOperation.h"
|
| #include "core/platform/graphics/transforms/MatrixTransformOperation.h"
|
| #include "core/platform/graphics/transforms/PerspectiveTransformOperation.h"
|
| @@ -39,10 +41,7 @@
|
| #include "core/platform/graphics/transforms/SkewTransformOperation.h"
|
| #include "core/platform/graphics/transforms/TransformationMatrix.h"
|
| #include "core/platform/graphics/transforms/TranslateTransformOperation.h"
|
| -
|
| -#include "core/css/WebKitCSSFilterValue.h"
|
| -#include "core/platform/graphics/filters/FilterOperation.h"
|
| -#include "core/css/CSSPrimitiveValueMappings.h"
|
| +#include "core/rendering/style/RenderStyle.h"
|
|
|
| namespace WebCore {
|
|
|
| @@ -289,21 +288,21 @@ bool TransformBuilder::createTransformOperations(CSSValue* inValue, RenderStyle*
|
| if (transformValue->length() < 16)
|
| break;
|
| TransformationMatrix matrix(static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(0))->getDoubleValue(),
|
| - static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(1))->getDoubleValue(),
|
| - static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(2))->getDoubleValue(),
|
| - static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(3))->getDoubleValue(),
|
| - static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(4))->getDoubleValue(),
|
| - static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(5))->getDoubleValue(),
|
| - static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(6))->getDoubleValue(),
|
| - static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(7))->getDoubleValue(),
|
| - static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(8))->getDoubleValue(),
|
| - static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(9))->getDoubleValue(),
|
| - static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(10))->getDoubleValue(),
|
| - static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(11))->getDoubleValue(),
|
| - zoomFactor * static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(12))->getDoubleValue(),
|
| - zoomFactor * static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(13))->getDoubleValue(),
|
| - static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(14))->getDoubleValue(),
|
| - static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(15))->getDoubleValue());
|
| + static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(1))->getDoubleValue(),
|
| + static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(2))->getDoubleValue(),
|
| + static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(3))->getDoubleValue(),
|
| + static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(4))->getDoubleValue(),
|
| + static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(5))->getDoubleValue(),
|
| + static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(6))->getDoubleValue(),
|
| + static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(7))->getDoubleValue(),
|
| + static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(8))->getDoubleValue(),
|
| + static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(9))->getDoubleValue(),
|
| + static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(10))->getDoubleValue(),
|
| + static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(11))->getDoubleValue(),
|
| + zoomFactor * static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(12))->getDoubleValue(),
|
| + zoomFactor * static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(13))->getDoubleValue(),
|
| + static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(14))->getDoubleValue(),
|
| + static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(15))->getDoubleValue());
|
| operations.operations().append(Matrix3DTransformOperation::create(matrix));
|
| break;
|
| }
|
|
|