Remove the "horizontal-bt" value from -webkit-writing-mode

third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp

Index: third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
index c7c84ae991d7753fcfea20867cb2792d12c82b2e..8898788c4045f7803b4e39042d6aee2d2bb3f5d6 100644
--- a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
@@ -458,22 +458,21 @@ LayoutUnit LayoutFlexibleBox::computeMainAxisExtentForChild(const LayoutBox& chi
     return child.computeLogicalWidthUsing(sizeType, size, contentLogicalWidth(), this) - borderAndPadding;
 }
 
-WritingMode LayoutFlexibleBox::transformedWritingMode() const
+LayoutFlexibleBox::TransformedWritingMode LayoutFlexibleBox::transformedWritingMode() const
 {
     WritingMode mode = style()->writingMode();
     if (!isColumnFlow())
-        return mode;
+        return static_cast<TransformedWritingMode>(mode);

[cbiesinger, 2015/10/30 19:11:02]

That seems a little scary, maybe add some COMPILE_ASSERTs to ensure that the
values are the same between the two enums?

[kojii, 2015/11/01 06:58:55]

Added static_assert, thank you for the advice.

 
     switch (mode) {
     case TopToBottomWritingMode:
-    case BottomToTopWritingMode:
-        return style()->isLeftToRightDirection() ? LeftToRightWritingMode : RightToLeftWritingMode;
+        return style()->isLeftToRightDirection() ? TransformedWritingMode::LeftToRightWritingMode : TransformedWritingMode::RightToLeftWritingMode;
     case LeftToRightWritingMode:
     case RightToLeftWritingMode:
-        return style()->isLeftToRightDirection() ? TopToBottomWritingMode : BottomToTopWritingMode;
+        return style()->isLeftToRightDirection() ? TransformedWritingMode::TopToBottomWritingMode : TransformedWritingMode::BottomToTopWritingMode;
     }
     ASSERT_NOT_REACHED();
-    return TopToBottomWritingMode;
+    return TransformedWritingMode::TopToBottomWritingMode;
 }
 
 LayoutUnit LayoutFlexibleBox::flowAwareBorderStart() const
@@ -493,13 +492,13 @@ LayoutUnit LayoutFlexibleBox::flowAwareBorderEnd() const
 LayoutUnit LayoutFlexibleBox::flowAwareBorderBefore() const
 {
     switch (transformedWritingMode()) {
-    case TopToBottomWritingMode:
+    case TransformedWritingMode::TopToBottomWritingMode:
         return borderTop();
-    case BottomToTopWritingMode:
+    case TransformedWritingMode::BottomToTopWritingMode:
         return borderBottom();
-    case LeftToRightWritingMode:
+    case TransformedWritingMode::LeftToRightWritingMode:
         return borderLeft();
-    case RightToLeftWritingMode:
+    case TransformedWritingMode::RightToLeftWritingMode:
         return borderRight();
     }
     ASSERT_NOT_REACHED();
@@ -509,13 +508,13 @@ LayoutUnit LayoutFlexibleBox::flowAwareBorderBefore() const
 LayoutUnit LayoutFlexibleBox::flowAwareBorderAfter() const
 {
     switch (transformedWritingMode()) {
-    case TopToBottomWritingMode:
+    case TransformedWritingMode::TopToBottomWritingMode:
         return borderBottom();
-    case BottomToTopWritingMode:
+    case TransformedWritingMode::BottomToTopWritingMode:
         return borderTop();
-    case LeftToRightWritingMode:
+    case TransformedWritingMode::LeftToRightWritingMode:
         return borderRight();
-    case RightToLeftWritingMode:
+    case TransformedWritingMode::RightToLeftWritingMode:
         return borderLeft();
     }
     ASSERT_NOT_REACHED();
@@ -539,13 +538,13 @@ LayoutUnit LayoutFlexibleBox::flowAwarePaddingEnd() const
 LayoutUnit LayoutFlexibleBox::flowAwarePaddingBefore() const
 {
     switch (transformedWritingMode()) {
-    case TopToBottomWritingMode:
+    case TransformedWritingMode::TopToBottomWritingMode:
         return paddingTop();
-    case BottomToTopWritingMode:
+    case TransformedWritingMode::BottomToTopWritingMode:
         return paddingBottom();
-    case LeftToRightWritingMode:
+    case TransformedWritingMode::LeftToRightWritingMode:
         return paddingLeft();
-    case RightToLeftWritingMode:
+    case TransformedWritingMode::RightToLeftWritingMode:
         return paddingRight();
     }
     ASSERT_NOT_REACHED();
@@ -555,13 +554,13 @@ LayoutUnit LayoutFlexibleBox::flowAwarePaddingBefore() const
 LayoutUnit LayoutFlexibleBox::flowAwarePaddingAfter() const
 {
     switch (transformedWritingMode()) {
-    case TopToBottomWritingMode:
+    case TransformedWritingMode::TopToBottomWritingMode:
         return paddingBottom();
-    case BottomToTopWritingMode:
+    case TransformedWritingMode::BottomToTopWritingMode:
         return paddingTop();
-    case LeftToRightWritingMode:
+    case TransformedWritingMode::LeftToRightWritingMode:
         return paddingRight();
-    case RightToLeftWritingMode:
+    case TransformedWritingMode::RightToLeftWritingMode:
         return paddingLeft();
     }
     ASSERT_NOT_REACHED();
@@ -585,13 +584,13 @@ LayoutUnit LayoutFlexibleBox::flowAwareMarginEndForChild(const LayoutBox& child)
 LayoutUnit LayoutFlexibleBox::flowAwareMarginBeforeForChild(const LayoutBox& child) const
 {
     switch (transformedWritingMode()) {
-    case TopToBottomWritingMode:
+    case TransformedWritingMode::TopToBottomWritingMode:
         return child.marginTop();
-    case BottomToTopWritingMode:
+    case TransformedWritingMode::BottomToTopWritingMode:
         return child.marginBottom();
-    case LeftToRightWritingMode:
+    case TransformedWritingMode::LeftToRightWritingMode:
         return child.marginLeft();
-    case RightToLeftWritingMode:
+    case TransformedWritingMode::RightToLeftWritingMode:
         return child.marginRight();
     }
     ASSERT_NOT_REACHED();