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

Wed Dec 22 14:56:50 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 54ed17a8e755da160b30035cd9f48ccdc5b21254
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 25 22:17:46 2010 +0000

    2010-10-25  Ryosuke Niwa  <rniwa at webkit.org>
    
            Reviewed by Ojan Vafai.
    
            Unformat deletes images
            https://bugs.webkit.org/show_bug.cgi?id=17926
    
            * editing/execCommand/remove-format-image-expected.txt: Added.
            * editing/execCommand/remove-format-image.html: Added.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70493 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 132a9e3..18d320d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-25  Ryosuke Niwa  <rniwa at webkit.org>
+
+        Reviewed by Ojan Vafai.
+
+        Unformat deletes images
+        https://bugs.webkit.org/show_bug.cgi?id=17926
+
+        * editing/execCommand/remove-format-image-expected.txt: Added.
+        * editing/execCommand/remove-format-image.html: Added.
+
 2010-10-25  Dimitri Glazkov  <dglazkov at chromium.org>
 
         [Chromium] Added expectations for r70482.
diff --git a/LayoutTests/editing/execCommand/remove-format-image-expected.txt b/LayoutTests/editing/execCommand/remove-format-image-expected.txt
new file mode 100644
index 0000000..80abfc0
--- /dev/null
+++ b/LayoutTests/editing/execCommand/remove-format-image-expected.txt
@@ -0,0 +1,15 @@
+This tests RemoveFormant command not removing an image.  You should see one image element in each of the test results
+
+An image between text:
+| "<#selection-anchor>hello"
+| " "
+| <img>
+|   src="../resources/abe.png"
+| " world<#selection-focus>"
+
+RemoveFormat on an image followed by JustifyNone and FormatBlock with p.:
+| <p>
+|   <#selection-anchor>
+|   <img>
+|     src="../resources/abe.png"
+|   <#selection-focus>
diff --git a/LayoutTests/editing/execCommand/remove-format-image.html b/LayoutTests/editing/execCommand/remove-format-image.html
new file mode 100644
index 0000000..44e0a40
--- /dev/null
+++ b/LayoutTests/editing/execCommand/remove-format-image.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<body onload="runTests();">
+<script src="../../resources/dump-as-markup.js"></script>
+<div id="test1" contenteditable><strong>hello</strong> <img src="../resources/abe.png"> world</div>
+<div id="test2" contenteditable><img src="../resources/abe.png"></div>
+<script>
+
+function runTests() {
+    Markup.description('This tests RemoveFormant command not removing an image.  You should see one image element in each of the test results');
+    window.getSelection().selectAllChildren(document.getElementById('test1'));
+    document.execCommand('RemoveFormat', false, null);
+    Markup.dump('test1', 'An image between text');
+
+    window.getSelection().selectAllChildren(document.getElementById('test2'));
+    document.execCommand('RemoveFormat', false, null);
+    document.execCommand('JustifyNone', false, null);
+    document.execCommand('FormatBlock', false, 'p');
+    Markup.dump('test2', 'RemoveFormat on an image followed by JustifyNone and FormatBlock with p.');
+
+    Markup.notifyDone();
+}
+
+Markup.waitUntilDone();
+
+</script>
+</body>
+</html>

-- 
WebKit Debian packaging

