Changeset 15967 in webkit

Timestamp:

Aug 22, 2006, 10:28:07 AM (18 years ago)

Author:

harrison

Message:

Reviewed by John.

<rdar://problem/4523606> Represent heading elements in AXAttributedStringForTextMarkerRange

• bridge/mac/WebCoreAXObject.mm: (headingLevel): (-[WebCoreAXObject headingLevel]): (-[WebCoreAXObject isHeading]): New. Heading level is per the tag (h1 == 1, h2 == 2, etc.)

(-[WebCoreAXObject role]):
(-[WebCoreAXObject roleDescription]):
Add role and roleDescription for headings.

(-[WebCoreAXObject value]):
Value is the headingLevel.

(AXAttributeStringSetHeadingLevel):
(AXAttributedStringAppendText):
Put text's heading level (if applicable) in the attributes.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bridge/mac/WebCoreAXObject.mm (modified) (6 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-08-22  David Harrison  <harrison@apple.com>
+
+        Reviewed by John.
+
+        <rdar://problem/4523606> Represent heading elements in AXAttributedStringForTextMarkerRange
+
+        * bridge/mac/WebCoreAXObject.mm:
+        (headingLevel):
+        (-[WebCoreAXObject headingLevel]):
+        (-[WebCoreAXObject isHeading]):
+        New. Heading level is per the tag (h1 == 1, h2 == 2, etc.)
+        
+        (-[WebCoreAXObject role]):
+        (-[WebCoreAXObject roleDescription]):
+        Add role and roleDescription for headings.
+        
+        (-[WebCoreAXObject value]):
+        Value is the headingLevel.
+        
+        (AXAttributeStringSetHeadingLevel):
+        (AXAttributedStringAppendText):
+        Put text's heading level (if applicable) in the attributes.
+        
 2006-08-22  David Harrison  <harrison@apple.com>
 

trunk/WebCore/bridge/mac/WebCoreAXObject.mm

@@ -303 +303 @@
 }
 
+static int headingLevel(RenderObject* renderer)
+{
+    if (!renderer->isBlockFlow())
+        return 0;
+        
+    Node* node = renderer->element();
+    if (!node)
+        return 0;
+    
+    if (node->hasTagName(h1Tag))
+        return 1;
+    
+    if (node->hasTagName(h2Tag))
+        return 2;
+    
+    if (node->hasTagName(h3Tag))
+        return 3;
+    
+    if (node->hasTagName(h4Tag))
+        return 4;
+    
+    if (node->hasTagName(h5Tag))
+        return 5;
+    
+    if (node->hasTagName(h6Tag))
+        return 6;
+
+    return 0;
+}
+
+-(int)headingLevel
+{
+    return headingLevel(m_renderer);
+}
+
+-(BOOL)isHeading
+{
+    return [self headingLevel] != 0;
+}
+
 -(NSString*)role
 {
@@ -344 +384 @@
         return NSAccessibilityPopUpButtonRole;
 
+    if ([self isHeading])
+        return @"AXHeading";
+        
     if (m_renderer->isBlockFlow())
         return NSAccessibilityGroupRole;
@@ -409 +452 @@
     if ([role isEqualToString:@"AXImageMap"])
         return UI_STRING("image map", "accessibility role description for image map");
+
+    if ([role isEqualToString:@"AXHeading"])
+        return UI_STRING("heading", "accessibility role description for headings");
     
     return NSAccessibilityRoleDescription(NSAccessibilityUnknownRole, nil);
@@ -495 +541 @@
     if ([self isAttachment])
         return [[self attachmentView] accessibilityAttributeValue:NSAccessibilityValueAttribute];
+
+    if ([self isHeading])
+        return [NSNumber numberWithInt:[self headingLevel]];
 
     if (m_renderer->element() && m_renderer->element()->hasTagName(inputTag)) {
@@ -1283 +1332 @@
 }
 
+static void AXAttributeStringSetHeadingLevel(NSMutableAttributedString* attrString, RenderObject* renderer, NSRange range)
+{
+    int parentHeadingLevel = headingLevel(renderer->parent());
+    
+    if (parentHeadingLevel)
+        [attrString addAttribute:@"AXHeadingLevel" value:[NSNumber numberWithInt:parentHeadingLevel] range:range];
+    else
+        [attrString removeAttribute:@"AXHeadingLevel" range:range];
+}
+
 static void AXAttributeStringSetElement(NSMutableAttributedString* attrString, NSString* attribute, id element, NSRange range)
 {
@@ -1361 +1420 @@
     // set new attributes
     AXAttributeStringSetStyle(attrString, node->renderer(), attrStringRange);
+    AXAttributeStringSetHeadingLevel(attrString, node->renderer(), attrStringRange);
     AXAttributeStringSetElement(attrString, NSAccessibilityLinkTextAttribute, AXLinkElementForNode(node), attrStringRange);