Commit 7164bd87 authored by leviw@chromium.org's avatar leviw@chromium.org

Rename updateIntrinsicContentLogicalHeight to setIntrinsicContentLogicalHeight

Following Christian's suggestion on https://codereview.chromium.org/715083002

Review URL: https://codereview.chromium.org/718943003

git-svn-id: svn://svn.chromium.org/blink/trunk@185178 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 68a3594c
...@@ -643,7 +643,7 @@ public: ...@@ -643,7 +643,7 @@ public:
bool backgroundHasOpaqueTopLayer() const; bool backgroundHasOpaqueTopLayer() const;
void updateIntrinsicContentLogicalHeight(LayoutUnit intrinsicContentLogicalHeight) const { m_intrinsicContentLogicalHeight = intrinsicContentLogicalHeight; } void setIntrinsicContentLogicalHeight(LayoutUnit intrinsicContentLogicalHeight) const { m_intrinsicContentLogicalHeight = intrinsicContentLogicalHeight; }
protected: protected:
virtual void willBeDestroyed() override; virtual void willBeDestroyed() override;
......
...@@ -1355,7 +1355,7 @@ void RenderFlexibleBox::applyStretchAlignmentToChild(RenderBox& child, LayoutUni ...@@ -1355,7 +1355,7 @@ void RenderFlexibleBox::applyStretchAlignmentToChild(RenderBox& child, LayoutUni
// height correctly even when there's an overrideHeight. // height correctly even when there's an overrideHeight.
LayoutUnit childIntrinsicContentLogicalHeight = child.intrinsicContentLogicalHeight(); LayoutUnit childIntrinsicContentLogicalHeight = child.intrinsicContentLogicalHeight();
child.forceChildLayout(); child.forceChildLayout();
child.updateIntrinsicContentLogicalHeight(childIntrinsicContentLogicalHeight); child.setIntrinsicContentLogicalHeight(childIntrinsicContentLogicalHeight);
} }
} }
} else if (isColumnFlow() && child.style()->logicalWidth().isAuto()) { } else if (isColumnFlow() && child.style()->logicalWidth().isAuto()) {
......
...@@ -125,7 +125,7 @@ void RenderListBox::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop, Logi ...@@ -125,7 +125,7 @@ void RenderListBox::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop, Logi
{ {
LayoutUnit height = itemHeight() * size(); LayoutUnit height = itemHeight() * size();
// FIXME: The item height should have been added before updateLogicalHeight was called to avoid this hack. // FIXME: The item height should have been added before updateLogicalHeight was called to avoid this hack.
updateIntrinsicContentLogicalHeight(height); setIntrinsicContentLogicalHeight(height);
height += borderAndPaddingHeight(); height += borderAndPaddingHeight();
......
...@@ -82,7 +82,7 @@ void RenderSliderContainer::computeLogicalHeight(LayoutUnit logicalHeight, Layou ...@@ -82,7 +82,7 @@ void RenderSliderContainer::computeLogicalHeight(LayoutUnit logicalHeight, Layou
trackHeight *= zoomFactor; trackHeight *= zoomFactor;
// FIXME: The trackHeight should have been added before updateLogicalHeight was called to avoid this hack. // FIXME: The trackHeight should have been added before updateLogicalHeight was called to avoid this hack.
updateIntrinsicContentLogicalHeight(trackHeight); setIntrinsicContentLogicalHeight(trackHeight);
RenderBox::computeLogicalHeight(trackHeight, logicalTop, computedValues); RenderBox::computeLogicalHeight(trackHeight, logicalTop, computedValues);
return; return;
...@@ -91,7 +91,7 @@ void RenderSliderContainer::computeLogicalHeight(LayoutUnit logicalHeight, Layou ...@@ -91,7 +91,7 @@ void RenderSliderContainer::computeLogicalHeight(LayoutUnit logicalHeight, Layou
logicalHeight = RenderSlider::defaultTrackLength; logicalHeight = RenderSlider::defaultTrackLength;
// FIXME: The trackHeight should have been added before updateLogicalHeight was called to avoid this hack. // FIXME: The trackHeight should have been added before updateLogicalHeight was called to avoid this hack.
updateIntrinsicContentLogicalHeight(logicalHeight); setIntrinsicContentLogicalHeight(logicalHeight);
RenderBox::computeLogicalHeight(logicalHeight, logicalTop, computedValues); RenderBox::computeLogicalHeight(logicalHeight, logicalTop, computedValues);
} }
......
...@@ -558,7 +558,7 @@ void RenderTable::layout() ...@@ -558,7 +558,7 @@ void RenderTable::layout()
// FIXME: This value isn't the intrinsic content logical height, but we need // FIXME: This value isn't the intrinsic content logical height, but we need
// to update the value as its used by flexbox layout. crbug.com/367324 // to update the value as its used by flexbox layout. crbug.com/367324
updateIntrinsicContentLogicalHeight(contentLogicalHeight()); setIntrinsicContentLogicalHeight(contentLogicalHeight());
if (view()->layoutState()->pageLogicalHeight()) if (view()->layoutState()->pageLogicalHeight())
setPageLogicalOffset(view()->layoutState()->pageLogicalOffset(*this, logicalTop())); setPageLogicalOffset(view()->layoutState()->pageLogicalOffset(*this, logicalTop()));
......
...@@ -253,7 +253,7 @@ void RenderTableCell::layout() ...@@ -253,7 +253,7 @@ void RenderTableCell::layout()
// FIXME: This value isn't the intrinsic content logical height, but we need // FIXME: This value isn't the intrinsic content logical height, but we need
// to update the value as its used by flexbox layout. crbug.com/367324 // to update the value as its used by flexbox layout. crbug.com/367324
updateIntrinsicContentLogicalHeight(contentLogicalHeight()); setIntrinsicContentLogicalHeight(contentLogicalHeight());
setCellWidthChanged(false); setCellWidthChanged(false);
} }
......
...@@ -140,7 +140,7 @@ void RenderTextControl::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUni ...@@ -140,7 +140,7 @@ void RenderTextControl::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUni
// FIXME: The logical height of the inner text box should have been added before calling computeLogicalHeight to // FIXME: The logical height of the inner text box should have been added before calling computeLogicalHeight to
// avoid this hack. // avoid this hack.
updateIntrinsicContentLogicalHeight(logicalHeight); setIntrinsicContentLogicalHeight(logicalHeight);
logicalHeight += borderAndPaddingHeight(); logicalHeight += borderAndPaddingHeight();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment