Update To 11.40.268.0

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

diff --git a/src/third_party/WebKit/Source/core/rendering/style/RenderStyleConstants.h b/src/third_party/WebKit/Source/core/rendering/style/RenderStyleConstants.h
index a58e2fd..dc397a1 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/style/RenderStyleConstants.h
+++ b/src/third_party/WebKit/Source/core/rendering/style/RenderStyleConstants.h
@@ -152,11 +152,6 @@ enum BackgroundEdgeOrigin { TopEdge, RightEdge, BottomEdge, LeftEdge };
 // CSS Mask Source Types
 enum EMaskSourceType { MaskAlpha, MaskLuminance };
 
-// CSS3 Marquee Properties
-
-enum EMarqueeBehavior { MNONE, MSCROLL, MSLIDE, MALTERNATE };
-enum EMarqueeDirection { MAUTO = 0, MLEFT = 1, MRIGHT = -1, MUP = 2, MDOWN = -2, MFORWARD = 3, MBACKWARD = -3 };
-
 // Deprecated Flexible Box Properties
 
 enum EBoxPack { Start, Center, End, Justify };
@@ -170,7 +165,6 @@ enum EBoxDirection { BNORMAL, BREVERSE };
 enum EAlignContent { AlignContentFlexStart, AlignContentFlexEnd, AlignContentCenter, AlignContentSpaceBetween, AlignContentSpaceAround, AlignContentStretch };
 enum EFlexDirection { FlowRow, FlowRowReverse, FlowColumn, FlowColumnReverse };
 enum EFlexWrap { FlexNoWrap, FlexWrap, FlexWrapReverse };
-enum EJustifyContent { JustifyFlexStart, JustifyFlexEnd, JustifyCenter, JustifySpaceBetween, JustifySpaceAround };
 
 enum ETextSecurity {
     TSNONE, TSDISC, TSCIRCLE, TSSQUARE
@@ -304,8 +298,6 @@ enum QuoteType {
     OPEN_QUOTE, CLOSE_QUOTE, NO_OPEN_QUOTE, NO_CLOSE_QUOTE
 };
 
-enum EBorderFit { BorderFitBorder, BorderFitLines };
-
 enum EAnimPlayState {
     AnimPlayStatePlaying,
     AnimPlayStatePaused
@@ -544,6 +536,27 @@ enum ItemPositionType {
     LegacyPosition
 };
 
+enum ContentPosition {
+    ContentPositionAuto,
+    ContentPositionBaseline,
+    ContentPositionLastBaseline,
+    ContentPositionCenter,
+    ContentPositionStart,
+    ContentPositionEnd,
+    ContentPositionFlexStart,
+    ContentPositionFlexEnd,
+    ContentPositionLeft,
+    ContentPositionRight
+};
+
+enum ContentDistributionType {
+    ContentDistributionDefault,
+    ContentDistributionSpaceBetween,
+    ContentDistributionSpaceAround,
+    ContentDistributionSpaceEvenly,
+    ContentDistributionStretch
+};
+
 // Reasonable maximum to prevent insane font sizes from causing crashes on some platforms (such as Windows).
 static const float maximumAllowedFontSize = 1000000.0f;