Calculate border-box dimensions correctly for cells

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
  * modify it under the terms of the GNU Library General Public
@@ skipping 1155 matching lines @@
 }
 
 void LayoutBox::clearExtraInlineAndBlockOffests()
 {
     if (gExtraInlineOffsetMap)
         gExtraInlineOffsetMap->remove(this);
     if (gExtraBlockOffsetMap)
         gExtraBlockOffsetMap->remove(this);
 }
 
+static LayoutUnit borderPaddingWidthForBoxSizing(const LayoutBox* box)
+{
+    // This excludes intrinsic padding on cells. It includes width from collapsed borders.
+    return box->computedCSSPaddingStart() + box->computedCSSPaddingEnd() + box->borderStart() + box->borderEnd();
+}
+
+static LayoutUnit borderPaddingHeightForBoxSizing(const LayoutBox* box)
+{
+    // This excludes intrinsic padding on cells. It includes height from collapsed borders.
+    return box->computedCSSPaddingBefore() + box->computedCSSPaddingAfter() + box->borderBefore() + box->borderAfter();
+}
+
 LayoutUnit LayoutBox::adjustBorderBoxLogicalWidthForBoxSizing(float width) const
 {
-    LayoutUnit bordersPlusPadding = borderAndPaddingLogicalWidth();
+    LayoutUnit bordersPlusPadding = borderPaddingWidthForBoxSizing(this);
     LayoutUnit result(width);
     if (style()->boxSizing() == BoxSizingContentBox)
         return result + bordersPlusPadding;
     return std::max(result, bordersPlusPadding);
 }
 
 LayoutUnit LayoutBox::adjustBorderBoxLogicalHeightForBoxSizing(float height) const
 {
-    LayoutUnit bordersPlusPadding = borderAndPaddingLogicalHeight();
+    LayoutUnit bordersPlusPadding = borderPaddingHeightForBoxSizing(this);
     LayoutUnit result(height);
     if (style()->boxSizing() == BoxSizingContentBox)
         return result + bordersPlusPadding;
     return std::max(result, bordersPlusPadding);
 }
 
 LayoutUnit LayoutBox::adjustContentBoxLogicalWidthForBoxSizing(float width) const
 {
     LayoutUnit result(width);
     if (style()->boxSizing() == BoxSizingBorderBox)
-        result -= borderAndPaddingLogicalWidth();
+        result -= borderPaddingWidthForBoxSizing(this);
     return std::max(LayoutUnit(), result);
 }
 
 LayoutUnit LayoutBox::adjustContentBoxLogicalHeightForBoxSizing(float height) const
 {
     LayoutUnit result(height);
     if (style()->boxSizing() == BoxSizingBorderBox)
-        result -= borderAndPaddingLogicalHeight();
+        result -= borderPaddingHeightForBoxSizing(this);
     return std::max(LayoutUnit(), result);
 }
 
 // Hit Testing
 bool LayoutBox::nodeAtPoint(HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction action)
 {
     LayoutPoint adjustedLocation = accumulatedOffset + location();
 
     if (!isLayoutView()) {
         // Check if we need to do anything at all.
@@ skipping 1513 matching lines @@
     } else if (stretchedFlexHeight != LayoutUnit(-1)) {
         availableHeight = stretchedFlexHeight;
     } else if (hasOverrideContainingBlockLogicalHeight() && !isOutOfFlowPositionedWithSpecifiedHeight) {
         availableHeight = overrideContainingBlockContentLogicalHeight();
     } else if (cb->isGridItem() && cb->hasOverrideLogicalContentHeight()) {
         availableHeight = cb->overrideLogicalContentHeight();
     } else if (cbstyle.logicalHeight().isFixed()) {
         LayoutUnit contentBoxHeight = cb->adjustContentBoxLogicalHeightForBoxSizing(cbstyle.logicalHeight().value());
         availableHeight = cb->constrainContentBoxLogicalHeightByMinMax(
             contentBoxHeight - cb->scrollbarLogicalHeight(), LayoutUnit(-1)).clampNegativeToZero();
-        if (cb->isTableCell())
-            includeBorderPadding = true;
     } else if (cb->isTableCell()) {
         if (!skippedAutoHeightContainingBlock) {
             // Table cells violate what the CSS spec says to do with heights. Basically we
             // don't care if the cell specified a height or not. We just always make ourselves
             // be a percentage of the cell's current content height.
             if (!cb->hasOverrideLogicalContentHeight()) {
                 // Normally we would let the cell size intrinsically, but scrolling overflow has to be
                 // treated differently, since WinIE lets scrolled overflow regions shrink as needed.
                 // While we can't get all cases right, we can at least detect when the cell has a specified
                 // height or when the table has a specified height. In these cases we want to initially have
@@ skipping 2174 matching lines @@
         m_rareData->m_snapAreas->remove(&snapArea);
     }
 }
 
 SnapAreaSet* LayoutBox::snapAreas() const
 {
     return m_rareData ? m_rareData->m_snapAreas.get() : nullptr;
 }
 
 } // namespace blink