Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(464)

Unified Diff: third_party/WebKit/Source/core/layout/LayoutBox.cpp

Issue 2429113002: Don't update height in LayoutBlock::markFixedPositionObjectForLayoutIfNeeded. (Closed)
Patch Set: address review comments Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBox.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 {
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBox.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698