Changeset 35904 in webkit

Timestamp:

Aug 24, 2008 5:59:03 AM (16 years ago)

Author:

jhoneycutt@apple.com

Message:

2008-08-24 Jon Honeycutt <​jhoneycutt@apple.com>

Cannot get the focused accessible object from the root object.

AccessibleBase::get_AccFocus() checks whether the focused object is a
child of the current object, but
​http://msdn.microsoft.com/en-us/library/ms696150(VS.85).aspx states that
the result is the object itself, if it has focus, or a child object of
the active window, not a child of the object.

Reviewed by Sam Weinig.

• AccessibleBase.cpp: (AccessibleBase::get_accFocus): Don't check whether the focused object is our child.

Location:

trunk/WebKit/win

Files:

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

trunk/WebKit/win/AccessibleBase.cpp

@@ -350 +350 @@
         return S_FALSE;
 
-    // Only return the focused child if it's us or a child of us. Otherwise,
-    // report VT_EMPTY.
     if (focusedObj == m_object) {
         V_VT(pvFocusedChild) = VT_I4;
         V_I4(pvFocusedChild) = CHILDID_SELF;
-    } else if (focusedObj->parentObject() == m_object) {
-        V_VT(pvFocusedChild) = VT_DISPATCH;
-        V_DISPATCH(pvFocusedChild) = wrapper(focusedObj);
-        V_DISPATCH(pvFocusedChild)->AddRef();
-    }
-
+        return S_OK;
+    }
+
+    V_VT(pvFocusedChild) = VT_DISPATCH;
+    V_DISPATCH(pvFocusedChild) = wrapper(focusedObj);
+    V_DISPATCH(pvFocusedChild)->AddRef();
     return S_OK;
 }

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2008-08-24  Jon Honeycutt  <jhoneycutt@apple.com>
+
+        Cannot get the focused accessible object from the root object.
+
+        AccessibleBase::get_AccFocus() checks whether the focused object is a
+        child of the current object, but 
+        http://msdn.microsoft.com/en-us/library/ms696150(VS.85).aspx states that
+        the result is the object itself, if it has focus, or a child object of
+        the active window, not a child of the object.
+
+        Reviewed by Sam Weinig.
+
+        * AccessibleBase.cpp:
+        (AccessibleBase::get_accFocus): Don't check whether the focused object
+        is our child.
+
 2008-08-18  Jon Honeycutt  <jhoneycutt@apple.com>