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

[cfleizach at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 271495a40d45534b67f5b2efe9118ae4e28aaf0d
Author: cfleizach at apple.com <cfleizach at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 13 23:05:20 2010 +0000

    2010-12-13  Chris Fleizach  <cfleizach at apple.com>
    
            Reviewed by Beth Dakin.
    
            AX: lists and list boxes need different attributes
            https://bugs.webkit.org/show_bug.cgi?id=50978
    
            Separate out the attributes being returned for lists (<ul>) and listboxes (<select multiple>).
    
            * accessibility/mac/AccessibilityObjectWrapper.mm:
            (-[AccessibilityObjectWrapper accessibilityAttributeNames]):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73971 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/platform/mac/accessibility/lists-expected.txt b/LayoutTests/platform/mac/accessibility/lists-expected.txt
index b84fbec..98520f1 100644
--- a/LayoutTests/platform/mac/accessibility/lists-expected.txt
+++ b/LayoutTests/platform/mac/accessibility/lists-expected.txt
@@ -36,8 +36,6 @@ AXSelectedChildren: (null)
 AXVisibleChildren: <array of size 2>
 AXOrientation: AXVerticalOrientation
 AXTitleUIElement: (null)
-AXAccessKey: (null)
-AXRequired: 0
 
 ------------
 AXRole: AXList
@@ -65,8 +63,6 @@ AXSelectedChildren: (null)
 AXVisibleChildren: <array of size 2>
 AXOrientation: AXVerticalOrientation
 AXTitleUIElement: (null)
-AXAccessKey: (null)
-AXRequired: 0
 
 ------------
 AXRole: AXList
@@ -94,8 +90,6 @@ AXSelectedChildren: (null)
 AXVisibleChildren: <array of size 5>
 AXOrientation: AXVerticalOrientation
 AXTitleUIElement: (null)
-AXAccessKey: (null)
-AXRequired: 0
 
 ------------
 AXRole: AXGroup
diff --git a/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm b/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm
index 9a5d133..cbfefac 100644
--- a/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm
+++ b/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm
@@ -679,6 +679,7 @@ static WebCoreTextMarkerRange* textMarkerRangeFromVisiblePositions(AXObjectCache
     static NSArray* anchorAttrs = nil;
     static NSArray* webAreaAttrs = nil;
     static NSArray* textAttrs = nil;
+    static NSArray* listAttrs = nil;
     static NSArray* listBoxAttrs = nil;
     static NSArray* rangeAttrs = nil;
     static NSArray* commonMenuAttrs = nil;
@@ -766,12 +767,17 @@ static WebCoreTextMarkerRange* textMarkerRangeFromVisiblePositions(AXObjectCache
         textAttrs = [[NSArray alloc] initWithArray:tempArray];
         [tempArray release];
     }
-    if (listBoxAttrs == nil) {
+    if (listAttrs == nil) {
         tempArray = [[NSMutableArray alloc] initWithArray:attributes];
         [tempArray addObject:NSAccessibilitySelectedChildrenAttribute];
         [tempArray addObject:NSAccessibilityVisibleChildrenAttribute];
         [tempArray addObject:NSAccessibilityOrientationAttribute];
         [tempArray addObject:NSAccessibilityTitleUIElementAttribute];
+        listAttrs = [[NSArray alloc] initWithArray:tempArray];
+        [tempArray release];
+    }
+    if (listBoxAttrs == nil) {
+        tempArray = [[NSMutableArray alloc] initWithArray:listAttrs];    
         [tempArray addObject:NSAccessibilityAccessKeyAttribute];
         [tempArray addObject:NSAccessibilityRequiredAttribute];
         listBoxAttrs = [[NSArray alloc] initWithArray:tempArray];
@@ -964,9 +970,11 @@ static WebCoreTextMarkerRange* textMarkerRangeFromVisiblePositions(AXObjectCache
     else if (m_object->isTreeItem())
         objectAttributes = outlineRowAttrs;
     
-    else if (m_object->isListBox() || m_object->isList())
+    else if (m_object->isListBox())
         objectAttributes = listBoxAttrs;
-
+    else if (m_object->isList())
+        objectAttributes = listAttrs;
+    
     else if (m_object->isComboBox())
         objectAttributes = comboBoxAttrs;
     

-- 
WebKit Debian packaging