Index: Source/core/animation/css/CSSAnimatableValueFactory.cpp |
diff --git a/Source/core/animation/css/CSSAnimatableValueFactory.cpp b/Source/core/animation/css/CSSAnimatableValueFactory.cpp |
index 91c34e953fb9d93eb555400d46e46a030611d91d..df19558d18c8c54baed7942ec68bf0c17da6dc29 100644 |
--- a/Source/core/animation/css/CSSAnimatableValueFactory.cpp |
+++ b/Source/core/animation/css/CSSAnimatableValueFactory.cpp |
@@ -56,7 +56,7 @@ |
#include "core/css/CSSPrimitiveValue.h" |
#include "core/css/CSSPrimitiveValueMappings.h" |
#include "core/css/CSSPropertyMetadata.h" |
-#include "core/layout/style/LayoutStyle.h" |
+#include "core/layout/style/ComputedStyle.h" |
#include "platform/Length.h" |
#include "platform/LengthBox.h" |
@@ -89,7 +89,7 @@ static PassRefPtrWillBeRawPtr<AnimatableValue> createFromLengthWithZoom(const Le |
return nullptr; |
} |
-static PassRefPtrWillBeRawPtr<AnimatableValue> createFromLength(const Length& length, const LayoutStyle& style) |
+static PassRefPtrWillBeRawPtr<AnimatableValue> createFromLength(const Length& length, const ComputedStyle& style) |
{ |
return createFromLengthWithZoom(length, style.effectiveZoom()); |
} |
@@ -99,7 +99,7 @@ static PassRefPtrWillBeRawPtr<AnimatableValue> createFromUnzoomedLength(const Un |
return createFromLengthWithZoom(unzoomedLength.length(), 1); |
} |
-static PassRefPtrWillBeRawPtr<AnimatableValue> createFromLineHeight(const Length& length, const LayoutStyle& style) |
+static PassRefPtrWillBeRawPtr<AnimatableValue> createFromLineHeight(const Length& length, const ComputedStyle& style) |
{ |
if (length.type() == Percent) { |
double value = length.value(); |
@@ -116,7 +116,7 @@ inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromDouble(double va |
return AnimatableDouble::create(value, constraint); |
} |
-inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromLengthBox(const LengthBox& lengthBox, const LayoutStyle& style) |
+inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromLengthBox(const LengthBox& lengthBox, const ComputedStyle& style) |
{ |
return AnimatableLengthBox::create( |
createFromLength(lengthBox.left(), style), |
@@ -125,14 +125,14 @@ inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromLengthBox(const |
createFromLength(lengthBox.bottom(), style)); |
} |
-static PassRefPtrWillBeRawPtr<AnimatableValue> createFromBorderImageLength(const BorderImageLength& borderImageLength, const LayoutStyle& style) |
+static PassRefPtrWillBeRawPtr<AnimatableValue> createFromBorderImageLength(const BorderImageLength& borderImageLength, const ComputedStyle& style) |
{ |
if (borderImageLength.isNumber()) |
return createFromDouble(borderImageLength.number()); |
return createFromLength(borderImageLength.length(), style); |
} |
-inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromBorderImageLengthBox(const BorderImageLengthBox& borderImageLengthBox, const LayoutStyle& style) |
+inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromBorderImageLengthBox(const BorderImageLengthBox& borderImageLengthBox, const ComputedStyle& style) |
{ |
return AnimatableLengthBox::create( |
createFromBorderImageLength(borderImageLengthBox.left(), style), |
@@ -141,26 +141,26 @@ inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromBorderImageLengt |
createFromBorderImageLength(borderImageLengthBox.bottom(), style)); |
} |
-inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromLengthBoxAndBool(const LengthBox lengthBox, const bool flag, const LayoutStyle& style) |
+inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromLengthBoxAndBool(const LengthBox lengthBox, const bool flag, const ComputedStyle& style) |
{ |
return AnimatableLengthBoxAndBool::create( |
createFromLengthBox(lengthBox, style), |
flag); |
} |
-inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromDoubleAndBool(double number, const bool flag, const LayoutStyle& style) |
+inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromDoubleAndBool(double number, const bool flag, const ComputedStyle& style) |
{ |
return AnimatableDoubleAndBool::create(number, flag); |
} |
-inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromLengthPoint(const LengthPoint& lengthPoint, const LayoutStyle& style) |
+inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromLengthPoint(const LengthPoint& lengthPoint, const ComputedStyle& style) |
{ |
return AnimatableLengthPoint::create( |
createFromLength(lengthPoint.x(), style), |
createFromLength(lengthPoint.y(), style)); |
} |
-inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromTransformOrigin(const TransformOrigin& transformOrigin, const LayoutStyle& style) |
+inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromTransformOrigin(const TransformOrigin& transformOrigin, const ComputedStyle& style) |
{ |
return AnimatableLengthPoint3D::create( |
createFromLength(transformOrigin.x(), style), |
@@ -168,7 +168,7 @@ inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromTransformOrigin( |
createFromDouble(transformOrigin.z())); |
} |
-inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromLengthSize(const LengthSize& lengthSize, const LayoutStyle& style) |
+inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromLengthSize(const LengthSize& lengthSize, const ComputedStyle& style) |
{ |
return AnimatableLengthSize::create( |
createFromLength(lengthSize.width(), style), |
@@ -184,7 +184,7 @@ inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromStyleImage(Style |
return AnimatableUnknown::create(CSSValueNone); |
} |
-inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromFillSize(const FillSize& fillSize, const LayoutStyle& style) |
+inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromFillSize(const FillSize& fillSize, const ComputedStyle& style) |
{ |
switch (fillSize.type) { |
case SizeLength: |
@@ -199,7 +199,7 @@ inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromFillSize(const F |
} |
} |
-inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromBackgroundPosition(const Length& length, bool originIsSet, BackgroundEdgeOrigin origin, const LayoutStyle& style) |
+inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromBackgroundPosition(const Length& length, bool originIsSet, BackgroundEdgeOrigin origin, const ComputedStyle& style) |
{ |
if (!originIsSet || origin == LeftEdge || origin == TopEdge) |
return createFromLength(length, style); |
@@ -207,7 +207,7 @@ inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromBackgroundPositi |
} |
template<CSSPropertyID property> |
-inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromFillLayers(const FillLayer& fillLayers, const LayoutStyle& style) |
+inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromFillLayers(const FillLayer& fillLayers, const ComputedStyle& style) |
{ |
WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>> values; |
for (const FillLayer* fillLayer = &fillLayers; fillLayer; fillLayer = fillLayer->next()) { |
@@ -234,7 +234,7 @@ inline static PassRefPtrWillBeRawPtr<AnimatableValue> createFromFillLayers(const |
return AnimatableRepeatable::create(values); |
} |
-PassRefPtrWillBeRawPtr<AnimatableValue> CSSAnimatableValueFactory::createFromColor(CSSPropertyID property, const LayoutStyle& style) |
+PassRefPtrWillBeRawPtr<AnimatableValue> CSSAnimatableValueFactory::createFromColor(CSSPropertyID property, const ComputedStyle& style) |
{ |
Color color = style.colorIncludingFallback(property, false); |
Color visitedLinkColor = style.colorIncludingFallback(property, true); |
@@ -298,7 +298,7 @@ static SVGPaintType normalizeSVGPaintType(SVGPaintType paintType) |
} |
// FIXME: Generate this function. |
-PassRefPtrWillBeRawPtr<AnimatableValue> CSSAnimatableValueFactory::create(CSSPropertyID property, const LayoutStyle& style) |
+PassRefPtrWillBeRawPtr<AnimatableValue> CSSAnimatableValueFactory::create(CSSPropertyID property, const ComputedStyle& style) |
{ |
ASSERT(CSSPropertyMetadata::isAnimatableProperty(property)); |
switch (property) { |