Changeset 50004 in webkit

Timestamp:

Oct 23, 2009 3:16:33 PM (14 years ago)

Author:

jhoneycutt@apple.com

Message:

MSAA: Name for image elements should use alt attribute text

​https://bugs.webkit.org/show_bug.cgi?id=30727
<rdar://problem/7328291>

Reviewed by Alice Liu.

WebKit/win:

• AccessibleBase.cpp:

(AccessibleBase::createInstance):
If the AccessibilityObject is an image, return an AccessibleImage.

• AccessibleImage.cpp: Added.

(AccessibleImage::AccessibleImage):
Call the base constructor.
(AccessibleImage::name):
If the object is not an AccessibilityRenderObject, return the base's
name(). Look first for an ARIA "labeled-by" attribute, then look for an
alternate text attribute. Fall back to the base's name().

• AccessibleImage.h: Added.

(AccessibleImage::~AccessibleImage):

• WebKit.vcproj/WebKit.vcproj:

Add AccessibleImage to the project.

LayoutTests:

• platform/win/accessibility/img-alt-attribute-expected.txt: Added.
• platform/win/accessibility/img-alt-attribute.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/win/accessibility/img-alt-attribute-expected.txt (added)
• LayoutTests/platform/win/accessibility/img-alt-attribute.html (added)
• WebKit/win/AccessibleBase.cpp (modified) (3 diffs)
• WebKit/win/AccessibleImage.cpp (added)
• WebKit/win/AccessibleImage.h (added)
• WebKit/win/ChangeLog (modified) (1 diff)
• WebKit/win/WebKit.vcproj/WebKit.vcproj (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-10-23  Jon Honeycutt  <jhoneycutt@apple.com>
+
+        MSAA: Name for image elements should use alt attribute text
+
+        https://bugs.webkit.org/show_bug.cgi?id=30727
+        <rdar://problem/7328291>
+
+        Reviewed by Alice Liu.
+
+        * platform/win/accessibility/img-alt-attribute-expected.txt: Added.
+        * platform/win/accessibility/img-alt-attribute.html: Added.
+
 2009-10-23  Sam Weinig  <sam@webkit.org>
 

trunk/WebKit/win/AccessibleBase.cpp

@@ -28 +28 @@
 #include "AccessibleBase.h"
 
-#include <oleacc.h>
+#include "AccessibleImage.h"
+#include "WebView.h"
 #include <WebCore/AccessibilityObject.h>
 #include <WebCore/AXObjectCache.h>
@@ -44 +45 @@
 #include <WebCore/RenderObject.h>
 #include <WebCore/RenderView.h>
-#include "WebView.h"
+#include <oleacc.h>
 #include <wtf/RefPtr.h>
 
@@ -68 +69 @@
 {
     ASSERT_ARG(obj, obj);
+
+    if (obj->isImage())
+        return new AccessibleImage(obj);
 
     return new AccessibleBase(obj);

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2009-10-23  Jon Honeycutt  <jhoneycutt@apple.com>
+
+        MSAA: Name for image elements should use alt attribute text
+
+        https://bugs.webkit.org/show_bug.cgi?id=30727
+        <rdar://problem/7328291>
+
+        Reviewed by Alice Liu.
+
+        * AccessibleBase.cpp:
+        (AccessibleBase::createInstance):
+        If the AccessibilityObject is an image, return an AccessibleImage.
+
+        * AccessibleImage.cpp: Added.
+        (AccessibleImage::AccessibleImage):
+        Call the base constructor.
+        (AccessibleImage::name):
+        If the object is not an AccessibilityRenderObject, return the base's
+        name(). Look first for an ARIA "labeled-by" attribute, then look for an
+        alternate text attribute. Fall back to the base's name().
+
+        * AccessibleImage.h: Added.
+        (AccessibleImage::~AccessibleImage):
+
+        * WebKit.vcproj/WebKit.vcproj:
+        Add AccessibleImage to the project.
+
 2009-10-23  Sam Weinig  <sam@webkit.org>
 

trunk/WebKit/win/WebKit.vcproj/WebKit.vcproj

@@ -527 +527 @@
                         </File>
                         <File
+                                RelativePath="..\AccessibleImage.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\autoversion.h"
                                 >
@@ -840 +844 @@
                         <File
                                 RelativePath="..\AccessibleDocument.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\AccessibleImage.cpp"
                                 >
                         </File>