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

Wed Dec 22 13:18:49 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit a2e556a329cdc8738b5d35c9003365d41f082021
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 10 22:26:44 2010 +0000

    2010-09-10  Ryosuke Niwa  <rniwa at webkit.org>
    
            Reviewed by Eric Seidel.
    
            execCommand("fontsize") on certain selected html generates too many SPAN tags.
            https://bugs.webkit.org/show_bug.cgi?id=28968
    
            Added a test to ensure only one font element is added when applying font-size
            to multiple inline nodes.
    
            * editing/style/apply-font-size-to-multiple-nodes-expected.txt: Added.
            * editing/style/apply-font-size-to-multiple-nodes.html: Added.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67243 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 724bdd7..3df2609 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-10  Ryosuke Niwa  <rniwa at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        execCommand("fontsize") on certain selected html generates too many SPAN tags.
+        https://bugs.webkit.org/show_bug.cgi?id=28968
+
+        Added a test to ensure only one font element is added when applying font-size
+        to multiple inline nodes.
+
+        * editing/style/apply-font-size-to-multiple-nodes-expected.txt: Added.
+        * editing/style/apply-font-size-to-multiple-nodes.html: Added.
+
 2010-09-10  Simon Fraser  <simon.fraser at apple.com>
 
         Re-enable some Windows compositing tests that no longer assert.
diff --git a/LayoutTests/editing/style/apply-font-size-to-multiple-nodes-expected.txt b/LayoutTests/editing/style/apply-font-size-to-multiple-nodes-expected.txt
new file mode 100644
index 0000000..1a14cfe
--- /dev/null
+++ b/LayoutTests/editing/style/apply-font-size-to-multiple-nodes-expected.txt
@@ -0,0 +1,19 @@
+Test that WebKit does not add multiple span or font elements when applying font-size to multiple nodes.
+
+You should see exactly one font element with size="7" and exactly one span:
+| <font>
+|   class="Apple-style-span"
+|   size="7"
+|   "
+<#selection-anchor>A man with 2
+"
+|   <span>
+|     style="font-family: Courier New, Courier"
+|     "font faces"
+|   <br>
+|   "
+Death comes in all
+"
+|   "font sizes<#selection-focus>"
+| "
+"
diff --git a/LayoutTests/editing/style/apply-font-size-to-multiple-nodes.html b/LayoutTests/editing/style/apply-font-size-to-multiple-nodes.html
new file mode 100644
index 0000000..defd611
--- /dev/null
+++ b/LayoutTests/editing/style/apply-font-size-to-multiple-nodes.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/dump-as-markup.js"></script>
+</head>
+<body>
+<div id="test" contenteditable>
+A man with 2
+<span style="font-family: Courier New, Courier">font faces</span><br>
+Death comes in all
+<span style="font-size: large">font sizes</span>
+</div>
+<script>
+
+var test = document.getElementById('test');
+document.getSelection().selectAllChildren(test);
+document.execCommand('fontSize', false, 7);
+Markup.description('Test that WebKit does not add multiple span or font elements when applying font-size to multiple nodes.')
+Markup.dump(test, 'You should see exactly one font element with size="7" and exactly one span');
+
+</script>
+</body>
+</html>

-- 
WebKit Debian packaging

