Changeset 35886 in webkit

Timestamp:

Aug 21, 2008 7:20:08 PM (16 years ago)

Author:

mrowe@apple.com

Message:

2008-08-21 Jonas Klink <​klinktech@gmail.com>

Reviewed by Jon Honeycutt.

Fix ​http://bugs.webkit.org/show_bug.cgi?id=20230
Bug 20230: get_accState should be testing state on childObj

Also initializes output parameter action to 0 in get_accDefaultAction.

• AccessibleBase.cpp: (AccessibleBase::get_accState): (AccessibleBase::get_accDefaultAction):

Location:

trunk/WebKit/win

Files:

• AccessibleBase.cpp (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

trunk/WebKit/win/AccessibleBase.cpp

@@ -228 +228 @@
     pvState->lVal = 0;
 
-    if (m_object->isAnchor())
+    if (childObj->isAnchor())
         pvState->lVal |= STATE_SYSTEM_LINKED;
 
-    if (m_object->isHovered())
+    if (childObj->isHovered())
         pvState->lVal |= STATE_SYSTEM_HOTTRACKED;
 
-    if (!m_object->isEnabled())
+    if (!childObj->isEnabled())
         pvState->lVal |= STATE_SYSTEM_UNAVAILABLE;
 
-    if (m_object->isReadOnly())
+    if (childObj->isReadOnly())
         pvState->lVal |= STATE_SYSTEM_READONLY;
 
-    if (m_object->isOffScreen())
+    if (childObj->isOffScreen())
         pvState->lVal |= STATE_SYSTEM_OFFSCREEN;
 
-    if (m_object->isMultiSelect())
+    if (childObj->isMultiSelect())
         pvState->lVal |= STATE_SYSTEM_MULTISELECTABLE;
 
-    if (m_object->isPasswordField())
+    if (childObj->isPasswordField())
         pvState->lVal |= STATE_SYSTEM_PROTECTED;
 
-    if (m_object->isIndeterminate())
+    if (childObj->isIndeterminate())
         pvState->lVal |= STATE_SYSTEM_INDETERMINATE;
 
-    if (m_object->isChecked())
+    if (childObj->isChecked())
         pvState->lVal |= STATE_SYSTEM_CHECKED;
 
-    if (m_object->isPressed())
+    if (childObj->isPressed())
         pvState->lVal |= STATE_SYSTEM_PRESSED;
 
-    if (m_object->isFocused())
+    if (childObj->isFocused())
         pvState->lVal |= STATE_SYSTEM_FOCUSED;
 
-    if (m_object->isVisited())
+    if (childObj->isVisited())
         pvState->lVal |= STATE_SYSTEM_TRAVERSED;
 
-    if (m_object->canSetFocusAttribute())
+    if (childObj->canSetFocusAttribute())
         pvState->lVal |= STATE_SYSTEM_FOCUSABLE;
 
@@ -368 +368 @@
     if (!action)
         return E_POINTER;
+
+    *action = 0;
 
     AccessibilityObject* childObj;

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2008-08-21 Jonas Klink <klinktech@gmail.com>
+
+        Reviewed by Jon Honeycutt.
+
+        Fix http://bugs.webkit.org/show_bug.cgi?id=20230
+        Bug 20230: get_accState should be testing state on childObj
+
+        Also initializes output parameter action to 0 in get_accDefaultAction.
+
+        * AccessibleBase.cpp:
+        (AccessibleBase::get_accState):
+        (AccessibleBase::get_accDefaultAction):
+
 2008-08-20  Maxime Britto  <britto@apple.com>