Changeset 43920 in webkit

Timestamp:

May 20, 2009 9:59:40 AM (15 years ago)

Author:

xan@webkit.org

Message:

2009-05-20 Xan Lopez <​xlopez@igalia.com>

Reviewed by Gustavo Noronha.

Implement AtkObject::focus-event and
AtkObject::state-changed:focused signal emission.

Adds a new handleFocusedUIElementChangedWithRenderers, only in the
GTK port, called at the same point than
handleFocusedUIElementChanged but with two parameters, the old and
the newly focused RenderObjects. We need this, since the ATK
signals require us to pass the objects involved in the focus
change as arguments.

• accessibility/AXObjectCache.h:
• accessibility/gtk/AXObjectCacheAtk.cpp: (WebCore::AXObjectCache::handleFocusedUIElementChangedWithRenderers):
• dom/Document.cpp: (WebCore::Document::setFocusedNode):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/AXObjectCache.h (modified) (2 diffs)
• accessibility/gtk/AXObjectCacheAtk.cpp (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-05-20  Xan Lopez  <xlopez@igalia.com>
+
+        Reviewed by Gustavo Noronha.
+
+        Implement AtkObject::focus-event and
+        AtkObject::state-changed:focused signal emission.
+
+        Adds a new handleFocusedUIElementChangedWithRenderers, only in the
+        GTK port, called at the same point than
+        handleFocusedUIElementChanged but with two parameters, the old and
+        the newly focused RenderObjects. We need this, since the ATK
+        signals require us to pass the objects involved in the focus
+        change as arguments.
+
+        * accessibility/AXObjectCache.h:
+        * accessibility/gtk/AXObjectCacheAtk.cpp:
+        (WebCore::AXObjectCache::handleFocusedUIElementChangedWithRenderers):
+        * dom/Document.cpp:
+        (WebCore::Document::setFocusedNode):
+
 2009-05-20  Holger Hans Peter Freyther  <zecke@selfish.org>
 

trunk/WebCore/accessibility/AXObjectCache.h

@@ -81 +81 @@
         void handleAriaRoleChanged(RenderObject*);
         void handleFocusedUIElementChanged();
+#if PLATFORM(GTK)
+        void handleFocusedUIElementChangedWithRenderers(RenderObject*, RenderObject*);
+#endif
         static void enableAccessibility() { gAccessibilityEnabled = true; }
         static void enableEnhancedUserInterfaceAccessibility() { gAccessibilityEnhancedUserInterfaceEnabled = true; }
@@ -111 +114 @@
     inline void AXObjectCache::postNotification(RenderObject*, const String&) { }
     inline void AXObjectCache::postNotificationToElement(RenderObject*, const String&) { }
+#if PLATFORM(GTK)
+    inline void AXObjectCache::handleFocusedUIElementChangedWithRenderers(RenderObject*, RenderObject*) { }
+#endif
 #endif
 

trunk/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp

@@ -50 +50 @@
 }
 
+void AXObjectCache::handleFocusedUIElementChangedWithRenderers(RenderObject* oldFocusedRender, RenderObject* newFocusedRender)
+{
+    RefPtr<AccessibilityObject> oldObject = getOrCreate(oldFocusedRender);
+    if (oldObject) {
+        g_signal_emit_by_name(oldObject->wrapper(), "focus-event", false);
+        g_signal_emit_by_name(oldObject->wrapper(), "state-change", "focused", false);
+    }
+    RefPtr<AccessibilityObject> newObject = getOrCreate(newFocusedRender);
+    if (newObject) {
+        g_signal_emit_by_name(newObject->wrapper(), "focus-event", true);
+        g_signal_emit_by_name(newObject->wrapper(), "state-change", "focused", true);
+    }
+}
+
 } // namespace WebCore

trunk/WebCore/dom/Document.cpp

@@ -2595 +2595 @@
     if (!focusChangeBlocked && m_focusedNode && AXObjectCache::accessibilityEnabled())
         axObjectCache()->handleFocusedUIElementChanged();
+#elif PLATFORM(GTK)
+    if (!focusChangeBlocked && m_focusedNode && AXObjectCache::accessibilityEnabled()) {
+        RenderObject* oldFocusedRenderer = 0;
+        RenderObject* newFocusedRenderer = 0;
+
+        if (oldFocusedNode)
+            oldFocusedRenderer = oldFocusedNode.get()->renderer();
+        if (newFocusedNode)
+            newFocusedRenderer = newFocusedNode.get()->renderer();
+
+        axObjectCache()->handleFocusedUIElementChangedWithRenderers(oldFocusedRenderer, newFocusedRenderer);
+    }
 #endif