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

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

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 440 matching lines @@
     LayoutUnit borderAndPadding = child.borderAndPaddingLogicalWidth();
     if (child.styleRef().logicalWidth().isAuto()) {
         if (size.type() == MinContent)
             return child.minPreferredLogicalWidth() - borderAndPadding;
         if (size.type() == MaxContent)
             return child.maxPreferredLogicalWidth() - borderAndPadding;
     }
     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
 {
     if (isHorizontalFlow())
         return isLeftToRightFlow() ? borderLeft() : borderRight();
     return isLeftToRightFlow() ? borderTop() : borderBottom();
 }
 
 LayoutUnit LayoutFlexibleBox::flowAwareBorderEnd() const
 {
     if (isHorizontalFlow())
         return isLeftToRightFlow() ? borderRight() : borderLeft();
     return isLeftToRightFlow() ? borderBottom() : borderTop();
 }
 
 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();
     return borderTop();
 }
 
 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();
     return borderTop();
 }
 
 LayoutUnit LayoutFlexibleBox::flowAwarePaddingStart() const
 {
     if (isHorizontalFlow())
         return isLeftToRightFlow() ? paddingLeft() : paddingRight();
     return isLeftToRightFlow() ? paddingTop() : paddingBottom();
 }
 
 LayoutUnit LayoutFlexibleBox::flowAwarePaddingEnd() const
 {
     if (isHorizontalFlow())
         return isLeftToRightFlow() ? paddingRight() : paddingLeft();
     return isLeftToRightFlow() ? paddingBottom() : paddingTop();
 }
 
 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();
     return paddingTop();
 }
 
 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();
     return paddingTop();
 }
 
 LayoutUnit LayoutFlexibleBox::flowAwareMarginStartForChild(const LayoutBox& child) const
 {
     if (isHorizontalFlow())
         return isLeftToRightFlow() ? child.marginLeft() : child.marginRight();
     return isLeftToRightFlow() ? child.marginTop() : child.marginBottom();
 }
 
 LayoutUnit LayoutFlexibleBox::flowAwareMarginEndForChild(const LayoutBox& child) const
 {
     if (isHorizontalFlow())
         return isLeftToRightFlow() ? child.marginRight() : child.marginLeft();
     return isLeftToRightFlow() ? child.marginBottom() : child.marginTop();
 }
 
 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();
     return marginTop();
 }
 
 LayoutUnit LayoutFlexibleBox::crossAxisMarginExtentForChild(const LayoutBox& child) const
 {
     return isHorizontalFlow() ? child.marginHeight() : child.marginWidth();
 }
@@ skipping 913 matching lines @@
             ASSERT(child);
             LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisExtent;
             LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge;
             LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxisExtent;
             adjustAlignmentForChild(*child, newOffset - originalOffset);
         }
     }
 }
 
 }