[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87

Wed Jan 20 22:19:10 UTC 2010

The following commit has been merged in the debian/unstable branch:
commit 29bb581f5fc590f418ef15f85bcf8fb860afe2ec
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 11 09:20:54 2010 +0000

    2010-01-11  Tony Chang  <tony at chromium.org>
    
            Reviewed by Eric Seidel.
    
            Have "Paste and Match Style" fire the dom paste event.
            https://bugs.webkit.org/show_bug.cgi?id=30639
    
            * editing/execCommand/paste-and-match-style-event.html: Added.
    2010-01-11  Tony Chang  <tony at chromium.org>
    
            Reviewed by Eric Seidel.
    
            Have "Paste and Match Style" fire the dom paste event.
            https://bugs.webkit.org/show_bug.cgi?id=30639
    
            Test: editing/execCommand/paste-and-match-style-event.html
    
            * editing/Editor.cpp:
            (WebCore::Editor::pasteAsPlainText):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53068 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 781b687..0bd2a9a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-11  Tony Chang  <tony at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Have "Paste and Match Style" fire the dom paste event.
+        https://bugs.webkit.org/show_bug.cgi?id=30639
+
+        * editing/execCommand/paste-and-match-style-event.html: Added.
+
 2010-01-10  Daniel Bates  <dbates at webkit.org>
 
         Unreviewed, fix typo.
diff --git a/LayoutTests/editing/execCommand/copy-without-selection-expected.txt b/LayoutTests/editing/execCommand/paste-and-match-style-event-expected.txt
similarity index 100%
copy from LayoutTests/editing/execCommand/copy-without-selection-expected.txt
copy to LayoutTests/editing/execCommand/paste-and-match-style-event-expected.txt
diff --git a/LayoutTests/editing/execCommand/paste-and-match-style-event.html b/LayoutTests/editing/execCommand/paste-and-match-style-event.html
new file mode 100644
index 0000000..d275cab
--- /dev/null
+++ b/LayoutTests/editing/execCommand/paste-and-match-style-event.html
@@ -0,0 +1,22 @@
+<html>
+<script src="../editing.js"></script>
+<script>
+function onpastehandler(event) {
+    var e = document.getElementById('result');
+    e.innerHTML = "SUCCESS";
+}
+
+function test() {
+    execCopyCommand();
+    // Test to make sure that PasteAndMatchStyle fires the onpaste event.
+    execPasteAndMatchStyleCommand();
+    
+    if (window.layoutTestController)
+        layoutTestController.dumpAsText();
+}
+
+</script>
+<body onload='test()' onpaste='onpastehandler(event)'>
+<div id='result'>FAILURE</div>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index de3e8f5..075a233 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-11  Tony Chang  <tony at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Have "Paste and Match Style" fire the dom paste event.
+        https://bugs.webkit.org/show_bug.cgi?id=30639
+
+        Test: editing/execCommand/paste-and-match-style-event.html
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::pasteAsPlainText):
+
 2010-01-10  Oliver Hunt  <oliver at apple.com>
 
         Reviewed by NOBODY (Build fix).
diff --git a/WebCore/editing/Editor.cpp b/WebCore/editing/Editor.cpp
index 0bf0ba1..f581925 100644
--- a/WebCore/editing/Editor.cpp
+++ b/WebCore/editing/Editor.cpp
@@ -1077,6 +1077,8 @@ void Editor::paste()
 
 void Editor::pasteAsPlainText()
 {
+    if (tryDHTMLPaste())
+        return;
     if (!canPaste())
         return;
     pasteAsPlainTextWithPasteboard(Pasteboard::generalPasteboard());

-- 
WebKit Debian packaging

