Chromium Code Reviews| Index: Source/core/layout/LayoutObject.cpp |
| diff --git a/Source/core/layout/LayoutObject.cpp b/Source/core/layout/LayoutObject.cpp |
| index 42299e6ca972a7887e4ea34179f8627f9a1a8637..cd4d65207ae6dfc28b061e223c34b1eadd0e7ffd 100644 |
| --- a/Source/core/layout/LayoutObject.cpp |
| +++ b/Source/core/layout/LayoutObject.cpp |
| @@ -797,6 +797,17 @@ inline void LayoutObject::invalidateContainerPreferredLogicalWidths() |
| } |
| } |
| +void LayoutObject::minMaxPreferredLogicalWidthForParent(LayoutUnit& minPreferredLogicalWidth, LayoutUnit& maxPreferredLogicalWidth) const |
| +{ |
| + if (isBox() && toLayoutBox(this)->isWritingModeOrthogonalToParent()) { |
| + const_cast<LayoutObject*>(this)->layoutIfNeeded(); |
|
eae
2015/05/04 00:06:59
I'd rather try to avoid calling layout during pref
|
| + minPreferredLogicalWidth = maxPreferredLogicalWidth = toLayoutBox(this)->logicalHeight(); |
| + return; |
| + } |
| + minPreferredLogicalWidth = this->minPreferredLogicalWidth(); |
| + maxPreferredLogicalWidth = this->maxPreferredLogicalWidth(); |
| +} |
| + |
| LayoutBlock* LayoutObject::containerForFixedPosition(const LayoutBoxModelObject* paintInvalidationContainer, bool* paintInvalidationContainerSkipped) const |
| { |
| ASSERT(!paintInvalidationContainerSkipped || !*paintInvalidationContainerSkipped); |