| Index: Source/core/style/ComputedStyle.h
|
| diff --git a/Source/core/style/ComputedStyle.h b/Source/core/style/ComputedStyle.h
|
| index 84bca97d0b11b3746168b62dba3e15167982b0ef..3e7c3fd5b7b5328b41359ca779ee87a2d2af0279 100644
|
| --- a/Source/core/style/ComputedStyle.h
|
| +++ b/Source/core/style/ComputedStyle.h
|
| @@ -851,6 +851,7 @@ public:
|
| ScaleTransformOperation* scale() const { return rareNonInheritedData->m_transform->m_scale.get(); }
|
| float transformOriginZ() const { return transformOrigin().z(); }
|
| bool has3DTransform() const { return rareNonInheritedData->m_transform->has3DTransform(); }
|
| + bool hasTransformOperations() const { return !rareNonInheritedData->m_transform->m_operations.operations().isEmpty(); }
|
| bool hasTransform() const { return hasTransformOperations() || hasMotionPath() || hasCurrentTransformAnimation() || translate() || rotate() || scale(); }
|
| bool transformDataEquivalent(const ComputedStyle& otherStyle) const { return rareNonInheritedData->m_transform == otherStyle.rareNonInheritedData->m_transform; }
|
|
|
| @@ -1348,7 +1349,6 @@ public:
|
| void setTranslate(PassRefPtr<TranslateTransformOperation> v) { rareNonInheritedData.access()->m_transform.access()->m_translate = v; }
|
| void setRotate(PassRefPtr<RotateTransformOperation> v) { rareNonInheritedData.access()->m_transform.access()->m_rotate = v; }
|
| void setScale(PassRefPtr<ScaleTransformOperation> v) { rareNonInheritedData.access()->m_transform.access()->m_scale = v; }
|
| -
|
| void setSpeak(ESpeak s) { SET_VAR(rareInheritedData, speak, s); }
|
| void setTextCombine(TextCombine v) { SET_VAR(rareNonInheritedData, m_textCombine, v); }
|
| void setTextDecorationColor(const StyleColor& c) { SET_VAR(rareNonInheritedData, m_textDecorationColor, c); }
|
| @@ -1816,7 +1816,6 @@ private:
|
|
|
| void appendContent(PassOwnPtr<ContentData>);
|
| void addAppliedTextDecoration(const AppliedTextDecoration&);
|
| - bool hasTransformOperations() const { return !rareNonInheritedData->m_transform->m_operations.operations().isEmpty(); }
|
| void applyMotionPathTransform(TransformationMatrix&) const;
|
|
|
| bool diffNeedsFullLayoutAndPaintInvalidation(const ComputedStyle& other) const;
|
|
|