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

Wed Dec 22 11:49:48 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit f875340def0bc50c4bd5a5360dd8f12185c0e0a0
Author: morrita at google.com <morrita at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 9 04:29:38 2010 +0000

    2010-08-05  MORITA Hajime  <morrita at google.com>
    
            Reviewed by Tony Chang.
    
            Should have test: textInput should not fired when preceding key events are cancelled.
            https://bugs.webkit.org/show_bug.cgi?id=43601
    
            * fast/events/inputText-never-fired-on-keydown-cancel-expected.txt: Added.
            * fast/events/inputText-never-fired-on-keydown-cancel.html: Added.
            * fast/events/script-tests/inputText-never-fired-on-keydown-cancel.js: Added.
            (handleTextInput):
            (mayCancel):
            (setup):
            (test):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64962 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 13b4a8c..1431668 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-05  MORITA Hajime  <morrita at google.com>
+
+        Reviewed by Tony Chang.
+
+        Should have test: textInput should not fired when preceding key events are cancelled.
+        https://bugs.webkit.org/show_bug.cgi?id=43601
+
+        * fast/events/inputText-never-fired-on-keydown-cancel-expected.txt: Added.
+        * fast/events/inputText-never-fired-on-keydown-cancel.html: Added.
+        * fast/events/script-tests/inputText-never-fired-on-keydown-cancel.js: Added.
+        (handleTextInput):
+        (mayCancel):
+        (setup):
+        (test):
+
 2010-08-08  Kent Tamura  <tkent at chromium.org>
 
         Unreviewed, test expectation update
diff --git a/LayoutTests/fast/events/inputText-never-fired-on-keydown-cancel-expected.txt b/LayoutTests/fast/events/inputText-never-fired-on-keydown-cancel-expected.txt
new file mode 100644
index 0000000..614f6c5
--- /dev/null
+++ b/LayoutTests/fast/events/inputText-never-fired-on-keydown-cancel-expected.txt
@@ -0,0 +1,15 @@
+Test that ensure textInput events should not fired when preceding key events are cancelled
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS window.targetNode is receivedEventTarget
+PASS null is receivedEventTarget
+PASS window.targetNode is receivedEventTarget
+PASS null is receivedEventTarget
+PASS window.targetNode is receivedEventTarget
+PASS null is receivedEventTarget
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/fast/events/inputText-never-fired-on-keydown-cancel.html b/LayoutTests/fast/events/inputText-never-fired-on-keydown-cancel.html
new file mode 100644
index 0000000..d7bb0fa
--- /dev/null
+++ b/LayoutTests/fast/events/inputText-never-fired-on-keydown-cancel.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<link rel="stylesheet" href="../js/resources/js-test-style.css">
+<script src="../js/resources/js-test-pre.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<script src="script-tests/inputText-never-fired-on-keydown-cancel.js"></script>
+<script src="../js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/LayoutTests/fast/events/script-tests/inputText-never-fired-on-keydown-cancel.js b/LayoutTests/fast/events/script-tests/inputText-never-fired-on-keydown-cancel.js
new file mode 100644
index 0000000..94be1a6
--- /dev/null
+++ b/LayoutTests/fast/events/script-tests/inputText-never-fired-on-keydown-cancel.js
@@ -0,0 +1,63 @@
+description('Test that ensure textInput events should not fired when preceding key events are cancelled');
+
+var targetRoot = document.createElement("div");
+targetRoot.innerHTML += "<input type='text' id='targetInput' />";
+targetRoot.innerHTML += "<textarea id='targetTextarea'></textarea>";
+targetRoot.innerHTML += "<div id='targetEditable' contentEditable></div>";
+document.body.appendChild(targetRoot);
+
+var targetInput = document.getElementById("targetInput");
+var targetTextarea = document.getElementById("targetTextarea");
+var targetEditable = document.getElementById("targetEditable");
+
+var receivedEventTarget = null;
+
+function handleTextInput(evt)
+{
+    receivedEventTarget = evt.target;
+}
+
+var shouldCancel = false;
+
+function mayCancel(evt)
+{
+    if (shouldCancel)
+        evt.preventDefault();
+}
+
+targetInput.addEventListener("textInput", handleTextInput);
+targetInput.addEventListener("keydown", mayCancel);
+targetTextarea.addEventListener("textInput", handleTextInput);
+targetTextarea.addEventListener("keydown", mayCancel);
+targetEditable.addEventListener("textInput", handleTextInput);
+targetEditable.addEventListener("keydown", mayCancel);
+
+function setup(tocancel)
+{
+    receivedEventTarget = null;
+    shouldCancel = tocancel;
+}
+
+function test(targetNode)
+{
+    window.targetNode = targetNode;
+    setup(false);
+    eventSender.keyDown("a");
+    shouldBe("window.targetNode", "receivedEventTarget");
+    setup(true);
+    eventSender.keyDown("a");
+    shouldBe("null", "receivedEventTarget");
+}
+
+targetInput.focus();
+test(targetInput);
+
+targetTextarea.focus();
+test(targetTextarea);
+
+window.getSelection().setBaseAndExtent(targetEditable, 0, targetEditable, 0);
+test(targetEditable);
+
+targetRoot.style.display = "none";
+var successfullyParsed = true;
+

-- 
WebKit Debian packaging

