remove childrenInline & setChildrenInline

sky/engine/core/rendering/RenderObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 1628 matching lines @@
 {
     view()->selectionStartEnd(spos, epos);
 }
 
 void RenderObject::handleDynamicFloatPositionChange()
 {
     // FIXME(sky): Inline this function.
 
     // 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 since there's no state involved
anymore. Really, this function needs to be inlined (see FIXME a couple lines up)
and the comment deleted.

[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
 {
     // If transform changed, and the layer does not paint into its own separate backing, then we need to invalidate paints.
     if (diff.transformChanged()) {
         // Text nodes share style with their parents but transforms don't apply to them,
         // hence the !isText() check.
         if (!isText() && (!hasLayer() || !toRenderLayerModelObject(this)->layer()->hasStyleDeterminedDirectCompositingReasons()))
             diff.setNeedsPaintInvalidationLayer();
@@ skipping 509 matching lines @@
     // FIXME: We should ASSERT(isRooted()) here but generated content makes some out-of-order insertion.
 
     // Keep our layer hierarchy updated. Optimize for the common case where we don't have any children
     // and don't have a layer attached to ourselves.
     RenderLayer* layer = 0;
     if (slowFirstChild() || hasLayer()) {
         layer = parent()->enclosingLayer();
         addLayers(layer);
     }
 
-    if (parent()->childrenInline())
+    if (parent()->isRenderParagraph())
         parent()->dirtyLinesFromChangedChild(this);
 }
 
 void RenderObject::willBeRemovedFromTree()
 {
     // FIXME: We should ASSERT(isRooted()) but we have some out-of-order removals which would need to be fixed first.
 
     // Keep our layer hierarchy updated.
     if (slowFirstChild() || hasLayer())
         removeLayers(parent()->enclosingLayer());
 
-    if (isOutOfFlowPositioned() && parent()->childrenInline())
+    if (isOutOfFlowPositioned() && parent()->isRenderParagraph())
         parent()->dirtyLinesFromChangedChild(this);
 }
 
 void RenderObject::destroyAndCleanupAnonymousWrappers()
 {
     // If the tree is destroyed, there is no need for a clean-up phase.
     if (documentBeingDestroyed()) {
         destroy();
         return;
     }
@@ skipping 406 matching lines @@
 {
     if (object1) {
         const blink::RenderObject* root = object1;
         while (root->parent())
             root = root->parent();
         root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
     }
 }
 
 #endif