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

mario at webkit.org mario at webkit.org
Wed Dec 22 17:47:31 UTC 2010


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

    2010-11-30  Mario Sanchez Prada  <msanchez at igalia.com>
    
            Unreviewed, rolling out r72902.
            http://trac.webkit.org/changeset/72902
            https://bugs.webkit.org/show_bug.cgi?id=50062
    
            This change is causing layout test failures on the Tests bots
            for the mac platform.
    
            * accessibility/select-menulist-crash-expected.txt: Removed.
            * accessibility/select-menulist-crash.html: Removed.
    2010-11-30  Mario Sanchez Prada  <msanchez at igalia.com>
    
            Unreviewed, rolling out r72902.
            http://trac.webkit.org/changeset/72902
            https://bugs.webkit.org/show_bug.cgi?id=50062
    
            This change is causing layout test failures on the Tests bots
            for the mac platform.
    
            * dom/SelectElement.cpp:
            (WebCore::SelectElement::accessKeySetSelectedIndex):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72905 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 206e847..7a143f4 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,17 @@
 2010-11-30  Mario Sanchez Prada  <msanchez at igalia.com>
 
+        Unreviewed, rolling out r72902.
+        http://trac.webkit.org/changeset/72902
+        https://bugs.webkit.org/show_bug.cgi?id=50062
+
+        This change is causing layout test failures on the Tests bots
+        for the mac platform.
+
+        * accessibility/select-menulist-crash-expected.txt: Removed.
+        * accessibility/select-menulist-crash.html: Removed.
+
+2010-11-30  Mario Sanchez Prada  <msanchez at igalia.com>
+
         Reviewed by Darin Adler.
 
         ASSERT failing for combo boxes when selection changes
diff --git a/LayoutTests/accessibility/select-menulist-crash-expected.txt b/LayoutTests/accessibility/select-menulist-crash-expected.txt
deleted file mode 100644
index fc702a1..0000000
--- a/LayoutTests/accessibility/select-menulist-crash-expected.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-
-This test is to ensure that we do not crash when selecting an item from a menu list in a list box through the accessibility API.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS selectElement.role is 'AXRole: combo box'
-PASS menuList.role is 'AXRole: menu'
-PASS item1.role is 'AXRole: menu item'
-PASS item2.role is 'AXRole: menu item'
-PASS Did not crash
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/accessibility/select-menulist-crash.html b/LayoutTests/accessibility/select-menulist-crash.html
deleted file mode 100644
index ba22a63..0000000
--- a/LayoutTests/accessibility/select-menulist-crash.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href="../fast/js/resources/js-test-style.css">
-<script src="../fast/js/resources/js-test-pre.js"></script>
-<script>
-var successfullyParsed = false;
-</script>
-</head>
-<body>
-<form>
-<select id="target">
-<option selected>foo</option>
-<option>bar</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 the accessibility API.')
-
-if (window.layoutTestController) {
-  layoutTestController.dumpAsText();
-
-  if (window.accessibilityController) {
-    document.getElementById("target").focus();
-    var selectElement = accessibilityController.focusedElement;
-    var menuList = selectElement.childAtIndex(0);
-    var item1 = menuList.childAtIndex(0);
-    var item2 = menuList.childAtIndex(1);
-
-    // Check roles.
-    shouldBe("selectElement.role", "'AXRole: combo box'");
-    shouldBe("menuList.role", "'AXRole: menu'");
-    shouldBe("item1.role", "'AXRole: menu item'");
-    shouldBe("item2.role", "'AXRole: menu item'");
-
-    // Execute the press() method for every item in the menu list.
-    item1.press();
-    item2.press()
-
-    testPassed("Did not crash");
-  }
-}
-
-successfullyParsed = true;
-</script>
-<script src="../fast/js/resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7eb533c..c9606f6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-30  Mario Sanchez Prada  <msanchez at igalia.com>
+
+        Unreviewed, rolling out r72902.
+        http://trac.webkit.org/changeset/72902
+        https://bugs.webkit.org/show_bug.cgi?id=50062
+
+        This change is causing layout test failures on the Tests bots
+        for the mac platform.
+
+        * dom/SelectElement.cpp:
+        (WebCore::SelectElement::accessKeySetSelectedIndex):
+
 2010-11-30  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r72764.
diff --git a/WebCore/dom/SelectElement.cpp b/WebCore/dom/SelectElement.cpp
index d236c96..34a4961 100644
--- a/WebCore/dom/SelectElement.cpp
+++ b/WebCore/dom/SelectElement.cpp
@@ -949,12 +949,8 @@ void SelectElement::accessKeySetSelectedIndex(SelectElementData& data, Element*
         else
             setSelectedIndex(data, element, index, false, true);
     }
-
-    if (data.usesMenuList())
-        menuListOnChange(data, element);
-    else
-        listBoxOnChange(data, element);
-
+ 
+    listBoxOnChange(data, element);
     scrollToSelection(data, element);
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list