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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit c61156dd173fb6bff88fce11e4c51f1c0dfe77bb
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 8 17:08:27 2010 +0000

    2010-10-08  Renata Hodovan  <reni at inf.u-szeged.hu>
    
            Reviewed by Nikolas Zimmermann.
    
            SVG Text assertion on SVGInlineTextBox.
            https://bugs.webkit.org/show_bug.cgi?id=41467
    
            Example: <text><tspan>S</tspan><tspan>O</tspan></text> The old SVG text engine fired an assertion,
            when the glyph 'O' isn't present in the <font>, but only if a <missing-glyph> element is included
            in the SVG <font>. <tspan>SO</tspan> didn't trigger that assertion. Adding a new layout test, to
            make sure we never see the assertion again.
    
            * svg/text/text-assert-expected.txt: Added.
            * svg/text/text-assert.svg: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69410 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a959366..a5376dc 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,20 @@
 2010-10-08  Renata Hodovan  <reni at inf.u-szeged.hu>
 
+        Reviewed by Nikolas Zimmermann.
+
+        SVG Text assertion on SVGInlineTextBox.
+        https://bugs.webkit.org/show_bug.cgi?id=41467
+
+        Example: <text><tspan>S</tspan><tspan>O</tspan></text> The old SVG text engine fired an assertion,
+        when the glyph 'O' isn't present in the <font>, but only if a <missing-glyph> element is included
+        in the SVG <font>. <tspan>SO</tspan> didn't trigger that assertion. Adding a new layout test, to
+        make sure we never see the assertion again.
+
+        * svg/text/text-assert-expected.txt: Added.
+        * svg/text/text-assert.svg: Added.
+
+2010-10-08  Renata Hodovan  <reni at inf.u-szeged.hu>
+
         Reviewed by Andreas Kling.
 
         SVGFEColorMatrixElement doesn't support dynamic invalidation, when attributes change.
diff --git a/LayoutTests/svg/text/text-assert-expected.txt b/LayoutTests/svg/text/text-assert-expected.txt
new file mode 100644
index 0000000..bcfb210
--- /dev/null
+++ b/LayoutTests/svg/text/text-assert-expected.txt
@@ -0,0 +1,2 @@
+So
+If you see "So" the test passed.
diff --git a/LayoutTests/svg/text/text-assert.svg b/LayoutTests/svg/text/text-assert.svg
new file mode 100644
index 0000000..cef26d5
--- /dev/null
+++ b/LayoutTests/svg/text/text-assert.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+<defs>
+    <font>
+        <font-face font-family="Arial"/>
+        <missing-glyph/>
+        <glyph horiz-adv-x="667" unicode="S" d="M40 230z"/>
+    </font>
+</defs>
+
+<!-- 
+    The old SVG text engine fired an assertion, if the <missing-glyph> element is included
+    in the <font> and if a nonexistant glyph is referenced in a different tspan. 
+    Moving the 'o' next to the 'S' doesn't trigger it.
+-->
+<text style="font-family: Helvetica" x="10" y="20"><tspan>S</tspan><tspan>o</tspan></text>
+
+<text y="50">If you see "So" the test passed.</text>
+
+<script>
+    if (window.layoutTestController)
+        layoutTestController.dumpAsText();
+</script>
+
+</svg>

-- 
WebKit Debian packaging