Chromium Code Reviews| Index: Source/core/rendering/RenderBox.cpp |
| diff --git a/Source/core/rendering/RenderBox.cpp b/Source/core/rendering/RenderBox.cpp |
| index be4374f0f8c0a096b77b127b464ca3e2354c2699..58cd97a14c77820bbaebd2c5008740c648d97aba 100644 |
| --- a/Source/core/rendering/RenderBox.cpp |
| +++ b/Source/core/rendering/RenderBox.cpp |
| @@ -2868,8 +2868,8 @@ LayoutUnit RenderBox::computePercentageLogicalHeight(const Length& height) const |
| skippedAutoHeightContainingBlock = true; |
| containingBlockChild = cb; |
| cb = cb->containingBlock(); |
| - cb->addPercentHeightDescendant(const_cast<RenderBox*>(this)); |
| } |
| + cb->addPercentHeightDescendant(const_cast<RenderBox*>(this)); |
|
ojan
2014/01/03 02:04:26
I'm still not sure this is correct. For example, t
Xianzhu
2014/01/03 20:46:24
Actually percentHeightDescendants set doesn't incl
|
| RenderStyle* cbstyle = cb->style(); |
| @@ -3034,10 +3034,10 @@ LayoutUnit RenderBox::computeReplacedLogicalHeightUsing(Length logicalHeight) co |
| case Calculated: |
| { |
| RenderObject* cb = isOutOfFlowPositioned() ? container() : containingBlock(); |
| - while (cb->isAnonymous()) { |
| + while (cb->isAnonymous()) |
| cb = cb->containingBlock(); |
| + if (cb->isRenderBlock()) |
| toRenderBlock(cb)->addPercentHeightDescendant(const_cast<RenderBox*>(this)); |
| - } |
| // FIXME: This calculation is not patched for block-flow yet. |
| // https://bugs.webkit.org/show_bug.cgi?id=46500 |