[layoutng] Use the override width even when we're not a flex item

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

Index: third_party/WebKit/Source/core/layout/LayoutBox.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
index 68cd2c8c38d5183b11618cf442cea34293d272ba..ceda19d736df198810bb3f7c2d9de80fdc95a461 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
@@ -2479,22 +2479,19 @@ void LayoutBox::computeLogicalWidth(
   computedValues.m_margins.m_start = marginStart();
   computedValues.m_margins.m_end = marginEnd();
 
-  if (isOutOfFlowPositioned()) {
-    computePositionedLogicalWidth(computedValues);
-    return;
-  }
-
   // The parent box is flexing us, so it has increased or decreased our
   // width.  Use the width from the style context.
-  // FIXME: Account for writing-mode in flexible boxes.
-  // https://bugs.webkit.org/show_bug.cgi?id=46418
-  if (hasOverrideLogicalContentWidth() &&
-      parent()->isFlexibleBoxIncludingDeprecated()) {
+  if (hasOverrideLogicalContentWidth()) {
     computedValues.m_extent =
         overrideLogicalContentWidth() + borderAndPaddingLogicalWidth();
     return;
   }
 
+  if (isOutOfFlowPositioned()) {
+    computePositionedLogicalWidth(computedValues);
+    return;
+  }
+
   // FIXME: Account for writing-mode in flexible boxes.
   // https://bugs.webkit.org/show_bug.cgi?id=46418
   bool inVerticalBox = parent()->isDeprecatedFlexibleBox() &&
@@ -2979,8 +2976,6 @@ void LayoutBox::computeLogicalHeight(
 
     // The parent box is flexing us, so it has increased or decreased our
     // height. We have to grab our cached flexible height.
-    // FIXME: Account for writing-mode in flexible boxes.
-    // https://bugs.webkit.org/show_bug.cgi?id=46418
     if (hasOverrideLogicalContentHeight()) {
       h = Length(overrideLogicalContentHeight(), Fixed);
     } else if (treatAsReplaced) {