remove childrenInline & setChildrenInline

sky/engine/core/rendering/RenderObject.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 246 matching lines @@
     // FIXME: This could be used when changing the size of a renderer without children to skip some invalidations.
     bool rendererHasNoBoxEffect() const
     {
         return !style()->hasVisualOverflowingEffect() && !style()->hasBorder() && !style()->hasBackground();
     }
 
     // Obtains the nearest enclosing block (including this block) that contributes a first-line style to our inline
     // children.
     virtual RenderBlock* firstLineBlock() const;
 
-    // Called when an object that was floating or positioned becomes a normal flow object
-    // again.  We have to make sure the render tree updates as needed to accommodate the new
-    // normal flow object.
-    void handleDynamicFloatPositionChange();
-
     // RenderObject tree manipulation
     //////////////////////////////////////////
     virtual bool canHaveChildren() const { return virtualChildren(); }
     virtual bool isChildAllowed(RenderObject*, RenderStyle*) const { return true; }
     virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0);
     virtual void removeChild(RenderObject*);
     //////////////////////////////////////////
 
 protected:
     //////////////////////////////////////////
@@ skipping 43 matching lines @@
     virtual bool isRenderBlockFlow() const { return false; }
     virtual bool isRenderParagraph() const { return false; }
     virtual bool isRenderImage() const { return false; }
     virtual bool isRenderInline() const { return false; }
     virtual bool isRenderView() const { return false; }
 
     bool isDocumentElement() const { return document().documentElement() == m_node; }
 
     bool everHadLayout() const { return m_bitfields.everHadLayout(); }
 
-    // FIXME(sky): Remove this concept.
-    bool childrenInline() const { return isRenderParagraph(); }
-    void setChildrenInline(bool b) { m_bitfields.setChildrenInline(b); }
-
     bool alwaysCreateLineBoxesForRenderInline() const
     {
         ASSERT(isRenderInline());
         return m_bitfields.alwaysCreateLineBoxesForRenderInline();
     }
     void setAlwaysCreateLineBoxesForRenderInline(bool alwaysCreateLineBoxes)
     {
         ASSERT(isRenderInline());
         m_bitfields.setAlwaysCreateLineBoxesForRenderInline(alwaysCreateLineBoxes);
     }
@@ skipping 633 matching lines @@
             , m_isBox(false)
             , m_isInline(true)
             , m_isReplaced(false)
             , m_isDragging(false)
             , m_hasLayer(false)
             , m_hasOverflowClip(false)
             , m_hasTransform(false)
             , m_everHadLayout(false)
             , m_ancestorLineBoxDirty(false)
             , m_layoutDidGetCalled(false)
-            , m_childrenInline(false)
             , m_alwaysCreateLineBoxesForRenderInline(false)
             , m_positionedState(IsStaticallyPositioned)
             , m_selectionState(SelectionNone)
             , m_boxDecorationBackgroundState(NoBoxDecorationBackground)
         {
         }
 
         // 32 bits have been used in the first word, and 11 in the second.
         ADD_BOOLEAN_BITFIELD(selfNeedsLayout, SelfNeedsLayout);
         ADD_BOOLEAN_BITFIELD(shouldDoFullPaintInvalidation, ShouldDoFullPaintInvalidation);
@@ skipping 19 matching lines @@
 
         ADD_BOOLEAN_BITFIELD(hasLayer, HasLayer);
         ADD_BOOLEAN_BITFIELD(hasOverflowClip, HasOverflowClip); // Set in the case of overflow:auto/scroll/hidden
         ADD_BOOLEAN_BITFIELD(hasTransform, HasTransform);
 
         ADD_BOOLEAN_BITFIELD(everHadLayout, EverHadLayout);
         ADD_BOOLEAN_BITFIELD(ancestorLineBoxDirty, AncestorLineBoxDirty);
 
         ADD_BOOLEAN_BITFIELD(layoutDidGetCalled, LayoutDidGetCalled);
 
-        // from RenderBlock
-        ADD_BOOLEAN_BITFIELD(childrenInline, ChildrenInline);
-
         // from RenderInline
         ADD_BOOLEAN_BITFIELD(alwaysCreateLineBoxesForRenderInline, AlwaysCreateLineBoxesForRenderInline);
 
     private:
         unsigned m_positionedState : 2; // PositionedState
         unsigned m_selectionState : 3; // SelectionState
         unsigned m_boxDecorationBackgroundState : 2; // BoxDecorationBackgroundState
 
     public:
         bool isOutOfFlowPositioned() const { return m_positionedState == IsOutOfFlowPositioned; }
@@ skipping 161 matching lines @@
 void showTree(const blink::RenderObject*);
 void showLineTree(const blink::RenderObject*);
 void showRenderTree(const blink::RenderObject* object1);
 // We don't make object2 an optional parameter so that showRenderTree
 // can be called from gdb easily.
 void showRenderTree(const blink::RenderObject* object1, const blink::RenderObject* object2);
 
 #endif
 
 #endif  // SKY_ENGINE_CORE_RENDERING_RENDEROBJECT_H_