WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/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 Apple 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
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 987 matching lines @@
             handled = true;
             
             // Remove the old child.
             RenderBox* next = blockRunIn->nextSiblingBox();
             children()->removeChildNode(this, blockRunIn);
 
             // Create an inline.
             RenderInline* inlineRunIn = new (renderArena()) RenderInline(blockRunIn->node());
             inlineRunIn->setStyle(blockRunIn->style());
 
-            // Move the nodes from the old child to the new child.
-            for (RenderObject* runInChild = blockRunIn->firstChild(); runInChild; runInChild = runInChild->nextSibling())
-                moveChild(inlineRunIn, inlineRunIn->children(), blockRunIn, blockRunIn->children(), runInChild);
+            // Move the nodes from the old child to the new child, but skip any :before/:after content.  It has already
+            // been regenerated by the new inline.
+            for (RenderObject* runInChild = blockRunIn->firstChild(); runInChild; runInChild = runInChild->nextSibling()) {
+                if (runInChild->style()->styleType() != BEFORE && runInChild->style()->styleType() != AFTER) {
+                    blockRunIn->children()->removeChildNode(blockRunIn, runInChild, false);
+                    inlineRunIn->addChild(runInChild); // Use addChild instead of appendChildNode since it handles correct placement of the children relative to :after-generated content.
+                }
+            }
 
             // Now insert the new child under |currBlock|.
             currBlock->children()->insertChildNode(currBlock, inlineRunIn, currBlock->firstChild());
             
             // If the run-in had an element, we need to set the new renderer.
             if (blockRunIn->element())
                 blockRunIn->element()->setRenderer(inlineRunIn);
             
             // Destroy the block run-in.
             blockRunIn->destroy();
@@ skipping 2890 matching lines @@
     return current;
 }
 
 static int getBPMWidth(int childValue, Length cssUnit)
 {
     if (cssUnit.type() != Auto)
         return (cssUnit.isFixed() ? cssUnit.value() : childValue);
     return 0;
 }
 
-static int getBorderPaddingMargin(const RenderBox* child, bool endOfInline)
+static int getBorderPaddingMargin(const RenderBoxModelObject* child, bool endOfInline)
 {
     RenderStyle* cstyle = child->style();
     int result = 0;
     bool leftSide = (cstyle->direction() == LTR) ? !endOfInline : endOfInline;
     result += getBPMWidth((leftSide ? child->marginLeft() : child->marginRight()),
                           (leftSide ? cstyle->marginLeft() :
                                       cstyle->marginRight()));
     result += getBPMWidth((leftSide ? child->paddingLeft() : child->paddingRight()),
                           (leftSide ? cstyle->paddingLeft() :
                                       cstyle->paddingRight()));
@@ skipping 82 matching lines @@
             // (unless we end in whitespace).
             RenderStyle* cstyle = child->style();
             int childMin = 0;
             int childMax = 0;
 
             if (!child->isText()) {
                 // Case (1) and (2).  Inline replaced and inline flow elements.
                 if (child->isRenderInline()) {
                     // Add in padding/border/margin from the appropriate side of
                     // the element.
-                    int bpm = getBorderPaddingMargin(static_cast<RenderBox*>(child), childIterator.endOfInline);
+                    int bpm = getBorderPaddingMargin(toRenderInline(child), childIterator.endOfInline);
                     childMin += bpm;
                     childMax += bpm;
 
                     inlineMin += childMin;
                     inlineMax += childMax;
                     
                     child->setPrefWidthsDirty(false);
                 } else {
                     // Inline replaced elts add in their margins to their min/max values.
                     int margins = 0;
@@ skipping 974 matching lines @@
         return "RenderBlock (generated)";
     if (isRelPositioned())
         return "RenderBlock (relative positioned)";
     if (isRunIn())
         return "RenderBlock (run-in)";
     return "RenderBlock";
 }
 
 } // namespace WebCore