Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / style / StyleRareNonInheritedData.h

diff --git a/src/third_party/WebKit/Source/core/rendering/style/StyleRareNonInheritedData.h b/src/third_party/WebKit/Source/core/rendering/style/StyleRareNonInheritedData.h
index 773afe8..034c3a8 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/style/StyleRareNonInheritedData.h
+++ b/src/third_party/WebKit/Source/core/rendering/style/StyleRareNonInheritedData.h
@@ -131,7 +131,6 @@ public:
 
     RefPtr<ShapeValue> m_shapeOutside;
     Length m_shapeMargin;
-    Length m_shapePadding;
     float m_shapeImageThreshold;
 
     RefPtr<ClipPathOperation> m_clipPath;
@@ -174,7 +173,12 @@ public:
     unsigned m_wrapFlow: 3; // WrapFlow
     unsigned m_wrapThrough: 1; // WrapThrough
 
-    unsigned m_runningAcceleratedAnimation : 1;
+    unsigned m_hasCurrentOpacityAnimation : 1;
+    unsigned m_hasCurrentTransformAnimation : 1;
+    unsigned m_hasCurrentFilterAnimation : 1;
+    unsigned m_runningOpacityAnimationOnCompositor : 1;
+    unsigned m_runningTransformAnimationOnCompositor : 1;
+    unsigned m_runningFilterAnimationOnCompositor : 1;
 
     unsigned m_hasAspectRatio : 1; // Whether or not an aspect ratio has been specified.