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

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc.
  *               All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 2461 matching lines @@
 
 DISABLE_CFI_PERF
 void LayoutBox::computeLogicalWidth(
     LogicalExtentComputedValues& computedValues) const {
   computedValues.m_extent =
       style()->containsSize() ? borderAndPaddingLogicalWidth() : logicalWidth();
   computedValues.m_position = logicalLeft();
   computedValues.m_margins.m_start = marginStart();
   computedValues.m_margins.m_end = marginEnd();
 
+  // The parent box is flexing us, so it has increased or decreased our
+  // width.  Use the width from the style context.
+  if (hasOverrideLogicalContentWidth()) {
+    computedValues.m_extent =
+        overrideLogicalContentWidth() + borderAndPaddingLogicalWidth();
+    return;
+  }
+
   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()) {
-    computedValues.m_extent =
-        overrideLogicalContentWidth() + borderAndPaddingLogicalWidth();
-    return;
-  }
-
   // FIXME: Account for writing-mode in flexible boxes.
   // https://bugs.webkit.org/show_bug.cgi?id=46418
   bool inVerticalBox = parent()->isDeprecatedFlexibleBox() &&
                        (parent()->style()->boxOrient() == VERTICAL);
   bool stretching = (parent()->style()->boxAlign() == BSTRETCH);
   // TODO (lajava): Stretching is the only reason why we don't want the box to
   // be treated as a replaced element, so we could perhaps refactor all this
   // logic, not only for flex and grid since alignment is intended to be applied
   // to any block.
   bool treatAsReplaced = shouldComputeSizeAsReplaced() &&
@@ skipping 464 matching lines @@
     // https://bugs.webkit.org/show_bug.cgi?id=46418
     bool inHorizontalBox = parent()->isDeprecatedFlexibleBox() &&
                            parent()->style()->boxOrient() == HORIZONTAL;
     bool stretching = parent()->style()->boxAlign() == BSTRETCH;
     bool treatAsReplaced =
         shouldComputeSizeAsReplaced() && (!inHorizontalBox || !stretching);
     bool checkMinMaxHeight = false;
 
     // 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) {
       h = Length(computeReplacedLogicalHeight(), Fixed);
     } else {
       h = style()->logicalHeight();
       checkMinMaxHeight = true;
     }
 
     // Block children of horizontal flexible boxes fill the height of the box.
@@ skipping 2700 matching lines @@
     block->adjustChildDebugRect(rect);
 
   return rect;
 }
 
 bool LayoutBox::shouldClipOverflow() const {
   return hasOverflowClip() || styleRef().containsPaint() || hasControlClip();
 }
 
 }  // namespace blink