Revert of [table] Stretching tables when needed due to self-alignment properties

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

 /*
  * Copyright (C) 1997 Martin Jones (mjones@kde.org)
  *           (C) 1997 Torben Weis (weis@kde.org)
  *           (C) 1998 Waldo Bastian (bastian@kde.org)
  *           (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc.
  *               All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
@@ skipping 279 matching lines @@
 
     // Subtract out our margins to get the available content width.
     LayoutUnit availableContentLogicalWidth =
         (containerWidthInInlineDirection - marginTotal).clampNegativeToZero();
     if (shrinkToAvoidFloats() && cb->isLayoutBlockFlow() &&
         toLayoutBlockFlow(cb)->containsFloats() &&
         !hasPerpendicularContainingBlock)
       availableContentLogicalWidth = shrinkLogicalWidthToAvoidFloats(
           marginStart, marginEnd, toLayoutBlockFlow(cb));
 
-    if (hasStretchedLogicalWidth()) {
-      setLogicalWidth(availableContentLogicalWidth);
-    } else {
-      // Ensure we aren't bigger than our available width.
-      LayoutUnit maxWidth = maxPreferredLogicalWidth();
-      // scaledWidthFromPercentColumns depends on m_layoutStruct in
-      // TableLayoutAlgorithmAuto, which maxPreferredLogicalWidth fills in. So
-      // scaledWidthFromPercentColumns has to be called after
-      // maxPreferredLogicalWidth.
-      LayoutUnit scaledWidth = m_tableLayout->scaledWidthFromPercentColumns() +
-                               bordersPaddingAndSpacingInRowDirection();
-      maxWidth = std::max(scaledWidth, maxWidth);
-      setLogicalWidth(
-          LayoutUnit(std::min(availableContentLogicalWidth, maxWidth).floor()));
-    }
+    // Ensure we aren't bigger than our available width.
+    LayoutUnit maxWidth = maxPreferredLogicalWidth();
+    // scaledWidthFromPercentColumns depends on m_layoutStruct in
+    // TableLayoutAlgorithmAuto, which maxPreferredLogicalWidth fills in. So
+    // scaledWidthFromPercentColumns has to be called after
+    // maxPreferredLogicalWidth.
+    LayoutUnit scaledWidth = m_tableLayout->scaledWidthFromPercentColumns() +
+                             bordersPaddingAndSpacingInRowDirection();
+    maxWidth = std::max(scaledWidth, maxWidth);
+    setLogicalWidth(
+        LayoutUnit(std::min(availableContentLogicalWidth, maxWidth).floor()));
   }
 
   // Ensure we aren't bigger than our max-width style.
   Length styleMaxLogicalWidth = style()->logicalMaxWidth();
   if ((styleMaxLogicalWidth.isSpecified() &&
        !styleMaxLogicalWidth.isNegative()) ||
       styleMaxLogicalWidth.isIntrinsic()) {
     LayoutUnit computedMaxLogicalWidth =
         convertStyleLogicalWidthToComputedWidth(styleMaxLogicalWidth,
                                                 availableLogicalWidth);
@@ skipping 137 matching lines @@
   if (neededLayout || tableHeightChanging == TableHeightChanging)
     section.setLogicalHeight(LayoutUnit(section.calcRowLogicalHeight()));
 
   if (view()->layoutState()->isPaginated())
     updateFragmentationInfoForChild(section);
   setLogicalHeight(logicalHeight() + section.logicalHeight());
 }
 
 LayoutUnit LayoutTable::logicalHeightFromStyle() const {
   LayoutUnit computedLogicalHeight;
-  if (hasOverrideLogicalContentHeight()) {
-    computedLogicalHeight = overrideLogicalContentHeight();
-  } else {
-    Length logicalHeightLength = style()->logicalHeight();
-    if (logicalHeightLength.isIntrinsic() ||
-        (logicalHeightLength.isSpecified() &&
-         logicalHeightLength.isPositive())) {
-      computedLogicalHeight =
-          convertStyleLogicalHeightToComputedHeight(logicalHeightLength);
-    }
+  Length logicalHeightLength = style()->logicalHeight();
+  if (logicalHeightLength.isIntrinsic() ||
+      (logicalHeightLength.isSpecified() && logicalHeightLength.isPositive())) {
+    computedLogicalHeight =
+        convertStyleLogicalHeightToComputedHeight(logicalHeightLength);
   }
 
   Length logicalMaxHeightLength = style()->logicalMaxHeight();
   if (logicalMaxHeightLength.isIntrinsic() ||
       (logicalMaxHeightLength.isSpecified() &&
        !logicalMaxHeightLength.isNegative())) {
     LayoutUnit computedMaxLogicalHeight =
         convertStyleLogicalHeightToComputedHeight(logicalMaxHeightLength);
     computedLogicalHeight =
         std::min(computedLogicalHeight, computedMaxLogicalHeight);
@@ skipping 1228 matching lines @@
 }
 
 LayoutUnit LayoutTable::paddingRight() const {
   if (collapseBorders())
     return LayoutUnit();
 
   return LayoutBlock::paddingRight();
 }
 
 }  // namespace blink