Stop rendering text inside flex boxes.

sky/engine/core/rendering/RenderBlock.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2010. 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
  * License as published by the Free Software Foundation; either
@@ skipping 182 matching lines @@
     return oldStyle->borderLeftWidth() != newStyle->borderLeftWidth()
         || oldStyle->borderRightWidth() != newStyle->borderRightWidth()
         || oldStyle->paddingLeft() != newStyle->paddingLeft()
         || oldStyle->paddingRight() != newStyle->paddingRight();
 }
 
 void RenderBlock::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
 {
     RenderBox::styleDidChange(diff, oldStyle);
 
-    RenderStyle* newStyle = style();
-    propagateStyleToAnonymousChildren(true);
-
     // It's possible for our border/padding to change, but for the overall logical width of the block to
     // end up being the same. We keep track of this change so in layoutBlock, we can know to set relayoutChildren=true.
-    m_hasBorderOrPaddingLogicalWidthChanged = oldStyle && diff.needsFullLayout() && needsLayout() && borderOrPaddingLogicalWidthChanged(oldStyle, newStyle);
-}
-
-void RenderBlock::addChildIgnoringAnonymousColumnBlocks(RenderObject* newChild, RenderObject* beforeChild)
-{
-    if (beforeChild && beforeChild->parent() != this) {
-        RenderObject* beforeChildContainer = beforeChild->parent();
-        ASSERT(beforeChildContainer->parent() == this);
-        ASSERT(beforeChildContainer->isAnonymousBlock());
-        addChild(newChild, beforeChildContainer);
-        return;
-    }
-
-    // TODO(ojan): What should we do in this case? For now we insert an anonymous paragraph.
-    // This only happens if we have a text node directly inside a non-paragraph.
-    if (!isRenderParagraph() && newChild->isInline()) {
-        RenderBlock* newBox = createAnonymousBlock();
-        ASSERT(newBox->isRenderParagraph());
-        RenderBox::addChild(newBox, beforeChild);
-        newBox->addChild(newChild);
-        return;
-    }
-
-    RenderBox::addChild(newChild, beforeChild);
+    m_hasBorderOrPaddingLogicalWidthChanged = oldStyle && diff.needsFullLayout() && needsLayout() && borderOrPaddingLogicalWidthChanged(oldStyle, style());
 }
 
 void RenderBlock::addChild(RenderObject* newChild, RenderObject* beforeChild)
 {
-    addChildIgnoringAnonymousColumnBlocks(newChild, beforeChild);
+    ASSERT(isRenderParagraph() || !newChild->isInline());
+    RenderBox::addChild(newChild, beforeChild);
 }
 
 void RenderBlock::deleteLineBoxTree()
 {
     ASSERT(!m_lineBoxes.firstLineBox());
 }
 
 void RenderBlock::removeChild(RenderObject* oldChild)
 {
     RenderBox::removeChild(oldChild);
@@ skipping 1355 matching lines @@
         return "RenderBlock (inline-block)";
     if (isOutOfFlowPositioned())
         return "RenderBlock (positioned)";
     if (isAnonymousBlock())
         return "RenderBlock (anonymous)";
     if (isAnonymous())
         return "RenderBlock (generated)";
     return "RenderBlock";
 }
 
-// FIXME(sky): Clean up callers now that we no longer use the EDisplay argument.
-RenderBlock* RenderBlock::createAnonymousWithParentRendererAndDisplay(const RenderObject* parent, EDisplay)
-{
-    RenderBlock* newBox = RenderParagraph::createAnonymous(parent->document());
-    RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyleWithDisplay(parent->style(), PARAGRAPH);
-    parent->updateAnonymousChildStyle(newBox, newStyle.get());
-    newBox->setStyle(newStyle.release());
-    return newBox;
-}
-
 static bool recalcNormalFlowChildOverflowIfNeeded(RenderObject* renderer)
 {
     if (renderer->isOutOfFlowPositioned() || !renderer->needsOverflowRecalcAfterStyleChange())
         return false;
 
     ASSERT(renderer->isRenderBlock());
     return toRenderBlock(renderer)->recalcOverflowAfterStyleChange();
 }
 
 bool RenderBlock::recalcChildOverflowAfterStyleChange()
@@ skipping 91 matching lines @@
 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* markedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const RenderObject* obj) const
 {
     showRenderObject();
     for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRootBox())
         root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLabel2, obj, 1);
 }
 
 #endif
 
 } // namespace blink