[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 903e3cd63cc35c3729179a6613085d3463553752
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 29 18:52:06 2004 +0000

    	1. Change the role of links from AXButton to AXLink.
    	2. Add support for list markers using a new role, AXListMarker.
    
            Reviewed by kocienda
    
            * khtml/rendering/render_list.h:
            (khtml::RenderListMarker::text):
            * kwq/KWQAccObject.mm:
            (-[KWQAccObject role]):
            (-[KWQAccObject roleDescription]):
            (-[KWQAccObject value]):
            (-[KWQAccObject accessibilityIsIgnored]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6518 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index bb5a2ad..c871960 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+2004-04-29  David Hyatt  <hyatt at apple.com>
+
+	1. Change the role of links from AXButton to AXLink.
+	2. Add support for list markers using a new role, AXListMarker.
+	
+        Reviewed by kocienda
+
+        * khtml/rendering/render_list.h:
+        (khtml::RenderListMarker::text):
+        * kwq/KWQAccObject.mm:
+        (-[KWQAccObject role]):
+        (-[KWQAccObject roleDescription]):
+        (-[KWQAccObject value]):
+        (-[KWQAccObject accessibilityIsIgnored]):
+
 2004-04-29  Darin Adler  <darin at apple.com>
 
         Reviewed by Ken.
diff --git a/WebCore/khtml/rendering/render_list.h b/WebCore/khtml/rendering/render_list.h
index 87a5205..5f6e713 100644
--- a/WebCore/khtml/rendering/render_list.h
+++ b/WebCore/khtml/rendering/render_list.h
@@ -66,6 +66,8 @@ public:
     RenderListItem* listItem() { return m_listItem; }
     void setListItem(RenderListItem* listItem) { m_listItem = listItem; }
     
+    const QString& text() const { return m_item; }
+
 protected:
     friend class RenderListItem;
     
diff --git a/WebCore/kwq/KWQAccObject.mm b/WebCore/kwq/KWQAccObject.mm
index b4906d9..333cd66 100644
--- a/WebCore/kwq/KWQAccObject.mm
+++ b/WebCore/kwq/KWQAccObject.mm
@@ -40,6 +40,7 @@
 #import "render_canvas.h"
 #import "render_object.h"
 #import "render_replaced.h"
+#import "render_list.h"
 #import "render_style.h"
 #import "render_text.h"
 #import "kjs_html.h"
@@ -60,6 +61,7 @@ using khtml::RenderWidget;
 using khtml::RenderCanvas;
 using khtml::RenderText;
 using khtml::RenderBlock;
+using khtml::RenderListMarker;
 
 // FIXME: This will eventually need to really localize.
 #define UI_STRING(string, comment) ((NSString *)[NSString stringWithUTF8String:(string)])
@@ -194,7 +196,9 @@ using khtml::RenderBlock;
         return NSAccessibilityUnknownRole;
 
     if (m_renderer->element() && m_renderer->element()->hasAnchor())
-        return NSAccessibilityButtonRole;
+        return @"AXLink";
+    if (m_renderer->isListMarker())
+        return @"AXListMarker";
     if (m_renderer->element() && m_renderer->element()->isHTMLElement() &&
         Node(m_renderer->element()).elementId() == ID_BUTTON)
         return NSAccessibilityButtonRole;
@@ -206,7 +210,7 @@ using khtml::RenderBlock;
         return @"AXWebArea";
     if (m_renderer->isBlockFlow())
         return NSAccessibilityGroupRole;
-    
+
     return NSAccessibilityUnknownRole;
 }
 
@@ -235,6 +239,12 @@ using khtml::RenderBlock;
     if ([role isEqualToString:@"AXWebArea"])
         return UI_STRING("web area", "accessibility role description for web area");
     
+    if ([role isEqualToString:@"AXLink"])
+        return UI_STRING("link", "accessibility role description for link");
+    
+    if ([role isEqualToString:@"AXListMarker"])
+        return UI_STRING("list marker", "accessibility role description for list marker");
+    
     return UI_STRING("unknown", "accessibility role description for unknown role");
 }
 
@@ -289,6 +299,9 @@ using khtml::RenderBlock;
     if (m_renderer->isText())
         return [self textUnderElement];
     
+    if (m_renderer->isListMarker())
+        return static_cast<RenderListMarker*>(m_renderer)->text().getNSString();
+
     // FIXME: We might need to implement a value here for more types
     // FIXME: It would be better not to advertise a value at all for the types for which we don't implement one;
     // this would require subclassing or making accessibilityAttributeNames do something other than return a
@@ -372,7 +385,7 @@ static QRect boundingBoxRect(RenderObject* obj)
     if (m_renderer->isBlockFlow() && m_renderer->childrenInline())
         return !static_cast<RenderBlock*>(m_renderer)->firstLineBox();
 
-    return (!m_renderer->isCanvas() && 
+    return (!m_renderer->isListMarker() && !m_renderer->isCanvas() && 
             !m_renderer->isImage() &&
             !(m_renderer->element() && m_renderer->element()->isHTMLElement() &&
               Node(m_renderer->element()).elementId() == ID_BUTTON));

-- 
WebKit Debian packaging