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 a240f8a112be65e8281829b5e91e3cc0048964ac..599c5ec4d7ad2e485a0f2c19eed9195c36ac21df 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp |
@@ -2886,9 +2886,7 @@ void LayoutBox::updateLogicalHeight() { |
m_intrinsicContentLogicalHeight = contentLogicalHeight(); |
LogicalExtentComputedValues computedValues; |
- LayoutUnit height = style()->containsSize() ? borderAndPaddingLogicalHeight() |
- : logicalHeight(); |
- computeLogicalHeight(height, logicalTop(), computedValues); |
+ computeLogicalHeight(computedValues); |
setLogicalHeight(computedValues.m_extent); |
setLogicalTop(computedValues.m_position); |
@@ -2901,6 +2899,13 @@ static inline Length heightForDocumentElement(const Document& document) { |
} |
void LayoutBox::computeLogicalHeight( |
+ LogicalExtentComputedValues& computedValues) const { |
+ LayoutUnit height = style()->containsSize() ? borderAndPaddingLogicalHeight() |
+ : logicalHeight(); |
+ computeLogicalHeight(height, logicalTop(), computedValues); |
+} |
+ |
+void LayoutBox::computeLogicalHeight( |
LayoutUnit logicalHeight, |
LayoutUnit logicalTop, |
LogicalExtentComputedValues& computedValues) const { |