[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[mitz at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 18e5eafc0b9aa1c3603876d020ceb60a568b9418
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 24 20:51:10 2010 +0000

    <rdar://problem/7682827> Text with :first-letter lingers after being removed
    
    Reviewed by Simon Fraser.
    
    WebCore:
    
    Test: fast/css/first-letter-set-text.html
    
    * rendering/RenderTextFragment.cpp:
    (WebCore::RenderTextFragment::setTextInternal): Set this back as the
    text node’s renderer, as removing the first letter has resets the node’s
    renderer.
    
    LayoutTests:
    
    * fast/css/first-letter-set-text-expected.checksum: Added.
    * fast/css/first-letter-set-text-expected.png: Added.
    * fast/css/first-letter-set-text-expected.txt: Added.
    * fast/css/first-letter-set-text.html: Added.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55196 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e5122c8..614295e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-24  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Simon Fraser.
+
+        <rdar://problem/7682827> Text with :first-letter lingers after being removed
+
+        * fast/css/first-letter-set-text-expected.checksum: Added.
+        * fast/css/first-letter-set-text-expected.png: Added.
+        * fast/css/first-letter-set-text-expected.txt: Added.
+        * fast/css/first-letter-set-text.html: Added.
+
 2010-02-24  Philippe Normand  <pnormand at igalia.com>
 
         Rubber-stamped by Xan Lopez.
diff --git a/LayoutTests/platform/mac/fast/block/float/float-on-zero-height-line-expected.checksum b/LayoutTests/fast/css/first-letter-set-text-expected.checksum
similarity index 100%
copy from LayoutTests/platform/mac/fast/block/float/float-on-zero-height-line-expected.checksum
copy to LayoutTests/fast/css/first-letter-set-text-expected.checksum
diff --git a/LayoutTests/fast/css/first-letter-set-text-expected.png b/LayoutTests/fast/css/first-letter-set-text-expected.png
new file mode 100644
index 0000000..0cf9035
Binary files /dev/null and b/LayoutTests/fast/css/first-letter-set-text-expected.png differ
diff --git a/LayoutTests/fast/css/first-letter-set-text-expected.txt b/LayoutTests/fast/css/first-letter-set-text-expected.txt
new file mode 100644
index 0000000..cfb1a25
--- /dev/null
+++ b/LayoutTests/fast/css/first-letter-set-text-expected.txt
@@ -0,0 +1,6 @@
+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
+      RenderBlock {DIV} at (0,0) size 50x50 [bgcolor=#008000]
diff --git a/LayoutTests/fast/css/first-letter-set-text.html b/LayoutTests/fast/css/first-letter-set-text.html
new file mode 100644
index 0000000..dac1d42
--- /dev/null
+++ b/LayoutTests/fast/css/first-letter-set-text.html
@@ -0,0 +1,12 @@
+<style>
+    #target { font-family: ahem; font-size: 50px; background-color: green; height: 50px; width: 50px; }
+    #target:first-letter { color: red; }
+</style>
+<div id="target">Lorem</div>
+<script>
+    var target = document.getElementById("target");
+    target.offsetTop;
+    var text = target.firstChild;
+    target.innerHTML = "ipsum";
+    target.removeChild(target.firstChild);
+</script>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3dd41ce..750cec3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-24  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Simon Fraser.
+
+        <rdar://problem/7682827> Text with :first-letter lingers after being removed
+
+        Test: fast/css/first-letter-set-text.html
+
+        * rendering/RenderTextFragment.cpp:
+        (WebCore::RenderTextFragment::setTextInternal): Set this back as the
+        text node’s renderer, as removing the first letter has resets the node’s
+        renderer.
+
 2010-02-24  Ariya Hidayat  <ariya.hidayat at gmail.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/rendering/RenderTextFragment.cpp b/WebCore/rendering/RenderTextFragment.cpp
index 9ff1106..f3398a3 100644
--- a/WebCore/rendering/RenderTextFragment.cpp
+++ b/WebCore/rendering/RenderTextFragment.cpp
@@ -69,6 +69,10 @@ void RenderTextFragment::setTextInternal(PassRefPtr<StringImpl> text)
         m_firstLetter = 0;
         m_start = 0;
         m_end = textLength();
+        if (Node* t = node()) {
+            ASSERT(!t->renderer());
+            t->setRenderer(this);
+        }
     }
 }
 

-- 
WebKit Debian packaging