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

Wed Dec 22 17:48:12 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit d93f63141ae58d8206f50f2e47d26886485076aa
Author: mario at webkit.org <mario at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 30 18:17:19 2010 +0000

    2010-11-30  Mario Sanchez Prada  <msanchez at igalia.com>
    
            Reviewed by Chris Fleizach.
    
            ASSERT failing for combo boxes when selection changes
            https://bugs.webkit.org/show_bug.cgi?id=50062
    
            * fast/forms/select-option-accesskey-crash-expected.txt: Added.
            * fast/forms/select-option-accesskey-crash.html: Added
    2010-11-30  Mario Sanchez Prada  <msanchez at igalia.com>
    
            Reviewed by Chris Fleizach.
    
            ASSERT failing for combo boxes when selection changes
            https://bugs.webkit.org/show_bug.cgi?id=50062
    
            Don't call listBoxOnChange for elements using menu lists.
    
            Test: fast/forms/select-option-accesskey-crash.html
    
            * dom/SelectElement.cpp:
            (WebCore::SelectElement::accessKeySetSelectedIndex): Extra check
            to decide whether to call menuListOnChange() or listBoxOnChange()
            instead of always calling listBoxOnChange().
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72927 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c5ffa80..7fa5906 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-30  Mario Sanchez Prada  <msanchez at igalia.com>
+
+        Reviewed by Chris Fleizach.
+
+        ASSERT failing for combo boxes when selection changes
+        https://bugs.webkit.org/show_bug.cgi?id=50062
+
+        * fast/forms/select-option-accesskey-crash-expected.txt: Added.
+        * fast/forms/select-option-accesskey-crash.html: Added
+
 2010-11-30  Satish Sampath  <satish at chromium.org>
 
         Unreviewed, updating a speech input pixel test expectations with new baselines.
diff --git a/LayoutTests/fast/forms/select-option-accesskey-crash-expected.txt b/LayoutTests/fast/forms/select-option-accesskey-crash-expected.txt
new file mode 100644
index 0000000..d6fc193
--- /dev/null
+++ b/LayoutTests/fast/forms/select-option-accesskey-crash-expected.txt
@@ -0,0 +1,11 @@
+
+This test is to ensure that we do not crash when selecting an item from a menu list in a list box through an access key.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS Did not crash
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/fast/forms/select-option-accesskey-crash.html b/LayoutTests/fast/forms/select-option-accesskey-crash.html
new file mode 100644
index 0000000..18c272c
--- /dev/null
+++ b/LayoutTests/fast/forms/select-option-accesskey-crash.html
@@ -0,0 +1,42 @@
+<!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>
+<script>
+var successfullyParsed = false;
+</script>
+</head>
+<body>
+<form>
+<select id="target">
+<option accesskey="x">foo</option>
+</select>
+</form>
+<p id="description"></p>
+<div id="console"></div>
+<script>
+description('This test is to ensure that we do not crash when selecting an item from a menu list in a list box through an access key.')
+
+if (window.layoutTestController) {
+    layoutTestController.dumpAsText();
+
+    var selectElement = document.getElementById("target");
+    selectElement.focus();
+    if (window.eventSender) {
+        var modifiers;
+        if (navigator.userAgent.search(/\bMac OS X\b/) != -1)
+            modifiers = ['ctrlKey', 'altKey'];
+        else
+            modifiers = ['altKey'];
+
+        eventSender.keyDown('x', modifiers);
+        testPassed("Did not crash");
+    }
+}
+
+successfullyParsed = true;
+</script>
+<script src="../js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 10a74d8..0f9c3da 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-11-30  Mario Sanchez Prada  <msanchez at igalia.com>
+
+        Reviewed by Chris Fleizach.
+
+        ASSERT failing for combo boxes when selection changes
+        https://bugs.webkit.org/show_bug.cgi?id=50062
+
+        Don't call listBoxOnChange for elements using menu lists.
+
+        Test: fast/forms/select-option-accesskey-crash.html
+
+        * dom/SelectElement.cpp:
+        (WebCore::SelectElement::accessKeySetSelectedIndex): Extra check
+        to decide whether to call menuListOnChange() or listBoxOnChange()
+        instead of always calling listBoxOnChange().
+
 2010-11-30  Andreas Kling  <kling at webkit.org>
 
         Reviewed by Dirk Schulze.
diff --git a/WebCore/dom/SelectElement.cpp b/WebCore/dom/SelectElement.cpp
index 34a4961..d236c96 100644
--- a/WebCore/dom/SelectElement.cpp
+++ b/WebCore/dom/SelectElement.cpp
@@ -949,8 +949,12 @@ void SelectElement::accessKeySetSelectedIndex(SelectElementData& data, Element*
         else
             setSelectedIndex(data, element, index, false, true);
     }
- 
-    listBoxOnChange(data, element);
+
+    if (data.usesMenuList())
+        menuListOnChange(data, element);
+    else
+        listBoxOnChange(data, element);
+
     scrollToSelection(data, element);
 }
 

-- 
WebKit Debian packaging

