[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

Fri Jan 21 14:39:35 UTC 2011

The following commit has been merged in the debian/experimental branch:
commit b81dc29db74d7f8b25918727576ea92854077bbd
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 24 02:14:28 2010 +0000

    2010-12-23  Ryosuke Niwa  <rniwa at webkit.org>
    
            Reviewed by Darin Adler.
    
            FormatBlock doesn't preserve typing style but it should
            https://bugs.webkit.org/show_bug.cgi?id=51140
    
            Added a test to type text after bolding the typing style and executing a FormatBlock command.
            Because FormatBlock command preserves typing style, the typed text should be in bold.
    
            * editing/execCommand/format-block-typing-style.html: Added.
    2010-12-23  Ryosuke Niwa  <rniwa at webkit.org>
    
            Reviewed by Darin Adler.
    
            FormatBlock doesn't preserve typing style but it should
            https://bugs.webkit.org/show_bug.cgi?id=51140
    
            Fixed the bug by making preserveTypingStyle return true.
    
            Test: editing/execCommand/format-block-typing-style.html
    
            * editing/FormatBlockCommand.h:
            (WebCore::FormatBlockCommand::preservesTypingStyle):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74601 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index aa6c670..491a541 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,17 @@
 2010-12-23  Ryosuke Niwa  <rniwa at webkit.org>
 
+        Reviewed by Darin Adler.
+
+        FormatBlock doesn't preserve typing style but it should
+        https://bugs.webkit.org/show_bug.cgi?id=51140
+
+        Added a test to type text after bolding the typing style and executing a FormatBlock command.
+        Because FormatBlock command preserves typing style, the typed text should be in bold.
+
+        * editing/execCommand/format-block-typing-style.html: Added.
+
+2010-12-23  Ryosuke Niwa  <rniwa at webkit.org>
+
         Unreviewed Qt rebaselines for r74593.
 
         * platform/qt/editing/deleting/delete-3608445-fix-expected.txt:
diff --git a/LayoutTests/editing/execCommand/format-block-typing-style-expected.txt b/LayoutTests/editing/execCommand/format-block-typing-style-expected.txt
new file mode 100644
index 0000000..ab5bd86
--- /dev/null
+++ b/LayoutTests/editing/execCommand/format-block-typing-style-expected.txt
@@ -0,0 +1,6 @@
+This tests ensures FormatBlock preserves the typing style.
+
+"world" should be bolded:
+| "hello"
+| <b>
+|   " world<#selection-caret>"
diff --git a/LayoutTests/editing/execCommand/format-block-typing-style.html b/LayoutTests/editing/execCommand/format-block-typing-style.html
new file mode 100644
index 0000000..4aa2c91
--- /dev/null
+++ b/LayoutTests/editing/execCommand/format-block-typing-style.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<body>
+<div id="test" contenteditable>hello</div>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>
+
+Markup.description("This tests ensures FormatBlock preserves the typing style.");
+
+var test = document.getElementById('test');
+window.getSelection().setPosition(test, 5);
+
+document.execCommand('Bold', false, null);
+document.execCommand('FormatBlock', false, '');
+document.execCommand('InsertText', false, ' world');
+
+Markup.dump(test, '"world" should be bolded');
+
+</script>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 47d9081..0b39b1e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-12-23  Ryosuke Niwa  <rniwa at webkit.org>
+
+        Reviewed by Darin Adler.
+
+        FormatBlock doesn't preserve typing style but it should
+        https://bugs.webkit.org/show_bug.cgi?id=51140
+
+        Fixed the bug by making preserveTypingStyle return true.
+
+        Test: editing/execCommand/format-block-typing-style.html
+
+        * editing/FormatBlockCommand.h:
+        (WebCore::FormatBlockCommand::preservesTypingStyle):
+
 2010-12-23  Jessie Berlin  <jberlin at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/editing/FormatBlockCommand.h b/WebCore/editing/FormatBlockCommand.h
index 352fa23..4be235f 100644
--- a/WebCore/editing/FormatBlockCommand.h
+++ b/WebCore/editing/FormatBlockCommand.h
@@ -37,6 +37,8 @@ public:
     {
         return adoptRef(new FormatBlockCommand(document, tagName));
     }
+    
+    virtual bool preservesTypingStyle() const { return true; }
 
     static Element* elementForFormatBlockCommand(Range*);
     bool didApply() const { return m_didApply; }

-- 
WebKit Debian packaging

