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

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit 9cbe97db3ec5bdff345525fd1cf4fef8df581258
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 22 22:30:01 2003 +0000

            - fixed <rdar://problem/3508798>: ACCESSIBILITY: role/description/value strings not defined
    
            Reviewed by Darin.
    
            * kwq/KWQAccObject.mm:
            (-[KWQAccObject roleDescription]):
            provide not-yet-localized strings for all the role descriptions that this class uses.
            (-[KWQAccObject value]):
            return nil string rather than dummy string for the cases where we don't have a value attribute.
            (-[KWQAccObject accessibilityActionDescription:]):
            changed comment passed to UI_STRING bogus macro so it won't have to change if/when macro
            loses its bogosity
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5847 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 28d41bb..a53cd8b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,20 @@
 2003-12-22  John Sullivan  <sullivan at apple.com>
 
+        - fixed <rdar://problem/3508798>: ACCESSIBILITY: role/description/value strings not defined
+
+        Reviewed by Darin.
+
+        * kwq/KWQAccObject.mm:
+        (-[KWQAccObject roleDescription]):
+        provide not-yet-localized strings for all the role descriptions that this class uses.
+        (-[KWQAccObject value]):
+        return nil string rather than dummy string for the cases where we don't have a value attribute.
+        (-[KWQAccObject accessibilityActionDescription:]):
+        changed comment passed to UI_STRING bogus macro so it won't have to change if/when macro
+        loses its bogosity
+
+2003-12-22  John Sullivan  <sullivan at apple.com>
+
 	- WebCore part of fix for <rdar://problem/3515706>: 
 	REGRESSION (100-118): Web Kit printing does not honor Page Setup scale factor
 
diff --git a/WebCore/kwq/KWQAccObject.mm b/WebCore/kwq/KWQAccObject.mm
index 27ee5f0..0dbf48d 100644
--- a/WebCore/kwq/KWQAccObject.mm
+++ b/WebCore/kwq/KWQAccObject.mm
@@ -199,8 +199,29 @@ using khtml::RenderCanvas;
 {
     if (!m_renderer)
         return nil;
-
-    return UI_STRING("Testing role description", "not real yet");
+    
+    // FIXME 3517227: These need to be localized (UI_STRING here is a dummy macro)
+    // FIXME 3447564: It would be better to call some AppKit API to get these strings
+    // (which would be the best way to localize them)
+    
+    NSString *role = [self role];
+    if ([role isEqualToString:NSAccessibilityButtonRole]) {
+        return UI_STRING("button", "accessibility role description for button");
+    }
+    
+    if ([role isEqualToString:NSAccessibilityStaticTextRole]) {
+        return UI_STRING("text", "accessibility role description for static text");
+    }
+    
+    if ([role isEqualToString:NSAccessibilityImageRole]) {
+        return UI_STRING("image", "accessibility role description for image");
+    }
+    
+    if ([role isEqualToString:NSAccessibilityGroupRole]) {
+        return UI_STRING("group", "accessibility role description for group");
+    }
+    
+    return UI_STRING("unknown", "accessibility role description for unknown role");
 }
 
 -(NSString*)helpText
@@ -254,7 +275,11 @@ using khtml::RenderCanvas;
     if (m_renderer->isText())
         return [self textUnderElement];
     
-    return UI_STRING("Value not implemented yet.", "not real yet");
+    // 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
+    // single static array.
+    return nil;
 }
 
 -(NSString*)title
@@ -368,7 +393,7 @@ static QRect boundingBoxRect(RenderObject* obj)
 - (NSString *)accessibilityActionDescription:(NSString *)action
 {
     // We only have the one action (press).
-    return UI_STRING("press link", "not real string value yet");
+    return UI_STRING("press link", "accessibility action description");
 }
 
 - (void)accessibilityPerformAction:(NSString *)action

-- 
WebKit Debian packaging