Changeset 95469 in webkit

Timestamp:

Sep 19, 2011, 1:52:37 PM (14 years ago)

Author:

inferno@chromium.org

Message:

Merge 95461 - Child not placed correctly when beforeChild (table part)
has both :before, :after content.
BUG=95520
Review URL: ​http://codereview.chromium.org/7946014

Location:

branches/chromium/874/Source/WebCore/rendering

Files:

• RenderBlock.cpp (modified) (3 diffs)
• RenderObject.cpp (modified) (3 diffs)
• RenderObject.h (modified) (1 diff)
• RenderTable.cpp (modified) (1 diff)
• RenderTableRow.cpp (modified) (1 diff)
• RenderTableSection.cpp (modified) (1 diff)

branches/chromium/874/Source/WebCore/rendering/RenderBlock.cpp

@@ -683 +683 @@
 {
     // Make sure we don't append things after :after-generated content if we have it.
-    if (!beforeChild) {
-        RenderObject* lastRenderer = lastChild();
-        while (lastRenderer && lastRenderer->isAnonymous() && !isAfterContent(lastRenderer))
-            lastRenderer = lastRenderer->lastChild();
-        if (lastRenderer && isAfterContent(lastRenderer))
-            beforeChild = lastRenderer;
-    }
+    if (!beforeChild)
+        beforeChild = findAfterContentRenderer();
 
     // If the requested beforeChild is not one of our children, then this is because
     // there is an anonymous container within this object that contains the beforeChild.
     if (beforeChild && beforeChild->parent() != this) {
-        RenderObject* anonymousChild = beforeChild->parent();
-        ASSERT(anonymousChild);
-
-        while (anonymousChild->parent() != this)
-            anonymousChild = anonymousChild->parent();
-
-        ASSERT(anonymousChild->isAnonymous());
-
-        if (anonymousChild->isAnonymousBlock()) {
+        RenderObject* beforeChildAnonymousContainer = anonymousContainer(beforeChild);
+        ASSERT(beforeChildAnonymousContainer);
+        ASSERT(beforeChildAnonymousContainer->isAnonymous());
+
+        if (beforeChildAnonymousContainer->isAnonymousBlock()) {
             // Insert the child into the anonymous block box instead of here.
             if (newChild->isInline() || beforeChild->parent()->firstChild() != beforeChild)
@@ -711 +702 @@
         }
 
-        ASSERT(anonymousChild->isTable());
+        ASSERT(beforeChildAnonymousContainer->isTable());
         if ((newChild->isTableCol() && newChild->style()->display() == TABLE_COLUMN_GROUP)
                 || (newChild->isRenderBlock() && newChild->style()->display() == TABLE_CAPTION)
@@ -718 +709 @@
                 || newChild->isTableCell()) {
             // Insert into the anonymous table.
-            anonymousChild->addChild(newChild, beforeChild);
+            beforeChildAnonymousContainer->addChild(newChild, beforeChild);
             return;
         }
 
         // Go on to insert before the anonymous table.
-        beforeChild = anonymousChild;
+        beforeChild = beforeChildAnonymousContainer;
     }
 

branches/chromium/874/Source/WebCore/rendering/RenderObject.cpp

@@ -284 +284 @@
         return;
 
+    RenderObject* beforeContent = 0;
+    bool beforeChildHasBeforeAndAfterContent = false;
+    if (beforeChild && (beforeChild->isTable() || beforeChild->isTableSection() || beforeChild->isTableRow())) {
+        beforeContent = beforeChild->findBeforeContentRenderer();
+        RenderObject* afterContent = beforeChild->findAfterContentRenderer();
+        if (beforeContent && afterContent) {
+            beforeChildHasBeforeAndAfterContent = true;
+            beforeContent->destroy();
+        }
+    }
+
     bool needsTable = false;
 
@@ -322 +333 @@
         children->insertChildNode(this, newChild, beforeChild);
     }
+
     if (newChild->isText() && newChild->style()->textTransform() == CAPITALIZE) {
         RefPtr<StringImpl> textToTransform = toRenderText(newChild)->originalText();
@@ -327 +339 @@
             toRenderText(newChild)->setText(textToTransform.release(), true);
     }
+
+    if (beforeChildHasBeforeAndAfterContent)
+        children->updateBeforeAfterContent(this, BEFORE);
 }
 

branches/chromium/874/Source/WebCore/rendering/RenderObject.h

@@ -337 +337 @@
     static inline bool isAfterContent(const RenderObject* obj) { return obj && obj->isAfterContent(); }
     static inline bool isBeforeOrAfterContent(const RenderObject* obj) { return obj && obj->isBeforeOrAfterContent(); }
+
+    inline RenderObject* findBeforeContentRenderer() const
+    {
+        RenderObject* renderer = beforePseudoElementRenderer();
+        return isBeforeContent(renderer) ? renderer : 0;
+    }
+
+    inline RenderObject* findAfterContentRenderer() const
+    {
+        RenderObject* renderer = afterPseudoElementRenderer();
+        return isAfterContent(renderer) ? renderer : 0;
+    }
+
+    inline RenderObject* anonymousContainer(RenderObject* child)
+    {
+         RenderObject* container = child;
+         while (container->parent() != this)
+             container = container->parent();
+
+         ASSERT(container->isAnonymous());
+         return container;
+    }
 
     bool childrenInline() const { return m_childrenInline; }

branches/chromium/874/Source/WebCore/rendering/RenderTable.cpp

@@ -108 +108 @@
 {
     // Make sure we don't append things after :after-generated content if we have it.
-    if (!beforeChild && isAfterContent(lastChild()))
-        beforeChild = lastChild();
+    if (!beforeChild) {
+        if (RenderObject* afterContentRenderer = findAfterContentRenderer())
+            beforeChild = anonymousContainer(afterContentRenderer);
+    }
 
     bool wrapInAnonymousSection = !child->isPositioned();

branches/chromium/874/Source/WebCore/rendering/RenderTableRow.cpp

@@ -84 +84 @@
 {
     // Make sure we don't append things after :after-generated content if we have it.
-    if (!beforeChild && isAfterContent(lastChild()))
-        beforeChild = lastChild();
+    if (!beforeChild) {
+        if (RenderObject* afterContentRenderer = findAfterContentRenderer())
+            beforeChild = anonymousContainer(afterContentRenderer);
+    }
 
     if (!child->isTableCell()) {

branches/chromium/874/Source/WebCore/rendering/RenderTableSection.cpp

@@ -99 +99 @@
 {
     // Make sure we don't append things after :after-generated content if we have it.
-    if (!beforeChild && isAfterContent(lastChild()))
-        beforeChild = lastChild();
+    if (!beforeChild) {
+        if (RenderObject* afterContentRenderer = findAfterContentRenderer())
+            beforeChild = anonymousContainer(afterContentRenderer);
+    }
 
     if (!child->isTableRow()) {