Chromium Code Reviews| Index: sky/engine/core/rendering/RenderObject.cpp |
| diff --git a/sky/engine/core/rendering/RenderObject.cpp b/sky/engine/core/rendering/RenderObject.cpp |
| index 914e2f1b4b95a6d97d6b73da2d77751f8966db4b..4fb08279689a8206008f90b8be543d8b9d4f2f03 100644 |
| --- a/sky/engine/core/rendering/RenderObject.cpp |
| +++ b/sky/engine/core/rendering/RenderObject.cpp |
| @@ -1646,9 +1646,9 @@ void RenderObject::handleDynamicFloatPositionChange() |
| // We have gone from not affecting the inline status of the parent flow to suddenly |
| // having an impact. See if there is a mismatch between the parent flow's |
| - // childrenInline() state and our state. |
| + // isRenderParagraph() state and our state. |
|
ojan
2014/11/21 22:55:10
This comment doesn't really make sense anymore sin
rafaelw
2014/11/21 23:13:54
Done.
|
| setInline(style()->isDisplayInlineType()); |
| - ASSERT(isInline() == parent()->childrenInline()); |
| + ASSERT(isInline() == parent()->isRenderParagraph()); |
| } |
| StyleDifference RenderObject::adjustStyleDifference(StyleDifference diff) const |
| @@ -2178,7 +2178,7 @@ void RenderObject::insertedIntoTree() |
| addLayers(layer); |
| } |
| - if (parent()->childrenInline()) |
| + if (parent()->isRenderParagraph()) |
| parent()->dirtyLinesFromChangedChild(this); |
| } |
| @@ -2190,7 +2190,7 @@ void RenderObject::willBeRemovedFromTree() |
| if (slowFirstChild() || hasLayer()) |
| removeLayers(parent()->enclosingLayer()); |
| - if (isOutOfFlowPositioned() && parent()->childrenInline()) |
| + if (isOutOfFlowPositioned() && parent()->isRenderParagraph()) |
| parent()->dirtyLinesFromChangedChild(this); |
| } |