[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

Fri Feb 26 22:15:35 UTC 2010

The following commit has been merged in the webkit-1.1 branch:
commit c02e5f0f492636366766dcdea31a0dbd08581dbd
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 9 08:52:05 2010 +0000

    2010-02-09  Avi Drissman  <avi at chromium.org>
    
            Reviewed by David Levin.
    
            Chromium Mac: Control-A shouldn't select all/Control-C shouldn't copy
            https://bugs.webkit.org/show_bug.cgi?id=34615
    
            * fast/events/attempt-select-all-with-wrong-modifier-expected.txt: Added.
            * fast/events/attempt-select-all-with-wrong-modifier.html: Added.
    2010-02-09  Avi Drissman  <avi at chromium.org>
    
            Reviewed by David Levin.
    
            Chromium Mac: Control-A shouldn't select all/Control-C shouldn't copy
            https://bugs.webkit.org/show_bug.cgi?id=34615
    
            * src/WebViewImpl.cpp:
            (WebKit::WebViewImpl::keyEventDefault):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54535 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 226655b..0a1cddd 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-09  Avi Drissman  <avi at chromium.org>
+
+        Reviewed by David Levin.
+
+        Chromium Mac: Control-A shouldn't select all/Control-C shouldn't copy
+        https://bugs.webkit.org/show_bug.cgi?id=34615
+
+        * fast/events/attempt-select-all-with-wrong-modifier-expected.txt: Added.
+        * fast/events/attempt-select-all-with-wrong-modifier.html: Added.
+
 2010-02-09  Shinichiro Hamaji  <hamaji at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/LayoutTests/fast/events/attempt-select-all-with-wrong-modifier-expected.txt b/LayoutTests/fast/events/attempt-select-all-with-wrong-modifier-expected.txt
new file mode 100644
index 0000000..cc959ed
--- /dev/null
+++ b/LayoutTests/fast/events/attempt-select-all-with-wrong-modifier-expected.txt
@@ -0,0 +1,3 @@
+Test for bug 34615. Trying to do a keyboard "select all" using the wrong modifier (e.g. Control on the Mac) should not do anything.
+
+PASS
diff --git a/LayoutTests/fast/events/attempt-select-all-with-wrong-modifier.html b/LayoutTests/fast/events/attempt-select-all-with-wrong-modifier.html
new file mode 100644
index 0000000..95a540d
--- /dev/null
+++ b/LayoutTests/fast/events/attempt-select-all-with-wrong-modifier.html
@@ -0,0 +1,34 @@
+<html><head>
+<script>
+function test()
+{
+    if (!window.eventSender)
+        return;
+
+    var onMacPlatform = false;
+    if (navigator.userAgent.search(/\bMac OS X\b/) != -1)
+        onMacPlatform = true;
+
+    if (window.layoutTestController) {
+        layoutTestController.dumpAsText();
+    }
+
+    document.body.focus();
+
+    if (onMacPlatform)
+        eventSender.keyDown('a', ["ctrlKey"]);
+    else
+        eventSender.keyDown('a', ["metaKey"]);
+
+    document.getElementById("console").innerHTML = getSelection().baseNode ? "FAIL" : "PASS";
+}
+
+</script>
+</head>
+<body onload="test();">
+<p>Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=34615">bug 34615</a>. Trying to do a keyboard "select all" using the wrong modifier (e.g. Control on the Mac) should not do anything.
+<div id="console">
+NOT DONE YET
+</div>
+</body>
+</html>
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 6c34f7e..97d1902 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-09  Avi Drissman  <avi at chromium.org>
+
+        Reviewed by David Levin.
+
+        Chromium Mac: Control-A shouldn't select all/Control-C shouldn't copy
+        https://bugs.webkit.org/show_bug.cgi?id=34615
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::keyEventDefault):
+
 2010-02-08  Evan Martin  <evan at chromium.org>
 
         dlopen() knows how to search the library search path, so just rely on
diff --git a/WebKit/chromium/src/WebViewImpl.cpp b/WebKit/chromium/src/WebViewImpl.cpp
index 5a98bc2..32b3f2c 100644
--- a/WebKit/chromium/src/WebViewImpl.cpp
+++ b/WebKit/chromium/src/WebViewImpl.cpp
@@ -697,6 +697,7 @@ bool WebViewImpl::keyEventDefault(const WebKeyboardEvent& event)
     case WebInputEvent::RawKeyDown:
         if (event.modifiers == WebInputEvent::ControlKey) {
             switch (event.windowsKeyCode) {
+#if !OS(DARWIN)
             case 'A':
                 focusedFrame()->executeCommand(WebString::fromUTF8("SelectAll"));
                 return true;
@@ -704,6 +705,7 @@ bool WebViewImpl::keyEventDefault(const WebKeyboardEvent& event)
             case 'C':
                 focusedFrame()->executeCommand(WebString::fromUTF8("Copy"));
                 return true;
+#endif
             // Match FF behavior in the sense that Ctrl+home/end are the only Ctrl
             // key combinations which affect scrolling. Safari is buggy in the
             // sense that it scrolls the page for all Ctrl+scrolling key

-- 
WebKit Debian packaging

