[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[inferno at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 53872efbc360d7852a216afb023ce025e91b88df
Author: inferno at chromium.org <inferno at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 20 21:58:23 2010 +0000

    2010-12-20  Abhishek Arya  <inferno at chromium.org>
    
            Reviewed by James Robinson.
    
            Pass the correct beforeChild value when adding a child to an anonymous table part.
            https://bugs.webkit.org/show_bug.cgi?id=50932
    
            When a "before" content child was added to an anonymous table part, it was added
            after the last child. This patch fixes the behavior by adding it properly before
            the first child.
    
            Test: fast/css-generated-content/table-before-child-add.html
    
            * rendering/RenderTableRow.cpp:
            (WebCore::RenderTableRow::addChild):
    2010-12-20  Abhishek Arya  <inferno at chromium.org>
    
            Reviewed by James Robinson.
    
            Tests that beforeChild is added to table correctly.
            https://bugs.webkit.org/show_bug.cgi?id=50932
    
            * fast/css-generated-content/table-before-child-add.html: Added.
            * platform/mac/fast/css-generated-content/table-before-child-add-expected.txt: Added.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74364 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index dcb2866..829df3d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-20  Abhishek Arya  <inferno at chromium.org>
+
+        Reviewed by James Robinson.
+
+        Tests that beforeChild is added to table correctly.
+        https://bugs.webkit.org/show_bug.cgi?id=50932
+
+        * fast/css-generated-content/table-before-child-add.html: Added.
+        * platform/mac/fast/css-generated-content/table-before-child-add-expected.txt: Added.
+
 2010-12-20  Cosmin Truta  <ctruta at chromium.org>
 
         Reviewed by James Robinson.
diff --git a/LayoutTests/fast/css-generated-content/table-before-child-add.html b/LayoutTests/fast/css-generated-content/table-before-child-add.html
new file mode 100644
index 0000000..a494b62
--- /dev/null
+++ b/LayoutTests/fast/css-generated-content/table-before-child-add.html
@@ -0,0 +1,15 @@
+<style type="text/css">
+    #target::before { content:"NOT";}
+</style>
+<p>
+    Should say &ldquo;NOT TEST FAILED&rdquo;
+</p>
+<div id="not-target" style="display: table"> 
+    <div>TEST</div>
+</div> FAILED
+<script>
+    document.getElementById("not-target").id = "target";
+    document.body.offsetTop;
+    document.body.style.color = "red";
+</script>
+
diff --git a/LayoutTests/platform/mac/fast/css-generated-content/table-before-child-add-expected.txt b/LayoutTests/platform/mac/fast/css-generated-content/table-before-child-add-expected.txt
new file mode 100644
index 0000000..7f4639c
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/css-generated-content/table-before-child-add-expected.txt
@@ -0,0 +1,23 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584 [color=#FF0000]
+      RenderBlock {P} at (0,0) size 784x18
+        RenderText {#text} at (0,0) size 227x18
+          text run at (0,0) width 227: "Should say \x{201C}NOT TEST FAILED\x{201D}"
+      RenderTable {DIV} at (0,34) size 39x36
+        RenderTableSection (anonymous) at (0,0) size 39x36 [color=#000000]
+          RenderTableRow (anonymous) at (0,0) size 39x36
+            RenderTableCell (anonymous) at (0,0) size 39x36 [r=0 c=0 rs=1 cs=1]
+              RenderBlock (anonymous) at (0,0) size 39x18
+                RenderInline (generated) at (0,0) size 34x18 [color=#FF0000]
+                  RenderText at (0,0) size 34x18
+                    text run at (0,0) width 34: "NOT"
+              RenderBlock {DIV} at (0,18) size 39x18 [color=#FF0000]
+                RenderText {#text} at (0,0) size 39x18
+                  text run at (0,0) width 39: "TEST"
+      RenderBlock (anonymous) at (0,70) size 784x18
+        RenderText {#text} at (0,0) size 58x18
+          text run at (0,0) width 58: "FAILED"
+        RenderText {#text} at (0,0) size 0x0
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 03b3548..841ecda 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-12-20  Abhishek Arya  <inferno at chromium.org>
+
+        Reviewed by James Robinson.
+
+        Pass the correct beforeChild value when adding a child to an anonymous table part.
+        https://bugs.webkit.org/show_bug.cgi?id=50932
+
+        When a "before" content child was added to an anonymous table part, it was added
+        after the last child. This patch fixes the behavior by adding it properly before
+        the first child.
+
+        Test: fast/css-generated-content/table-before-child-add.html
+
+        * rendering/RenderTableRow.cpp:
+        (WebCore::RenderTableRow::addChild):
+
 2010-12-18  Gavin Barraclough  <barraclough at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/WebCore/rendering/RenderTableRow.cpp b/WebCore/rendering/RenderTableRow.cpp
index f0e222d..e5f484b 100644
--- a/WebCore/rendering/RenderTableRow.cpp
+++ b/WebCore/rendering/RenderTableRow.cpp
@@ -73,7 +73,7 @@ void RenderTableRow::addChild(RenderObject* child, RenderObject* beforeChild)
         if (!last)
             last = lastChild();
         if (last && last->isAnonymous() && last->isTableCell()) {
-            last->addChild(child);
+            last->addChild(child, child->isBeforeContent() ? last->firstChild() : 0);
             return;
         }
 

-- 
WebKit Debian packaging