Changeset 60695 in webkit

Timestamp:

Jun 4, 2010 12:13:41 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-06-04 Jay Civelli <​jcivelli@chromium.org>

Reviewed by Dimitri Glazkov.

Accessibility focus change notifications are now sent from
ChromeClientImpl::focusedNodeChanged().
​https://bugs.webkit.org/show_bug.cgi?id=39792

• src/ChromeClientImpl.cpp: (WebKit::ChromeClientImpl::focus): (WebKit::ChromeClientImpl::focusedNodeChanged):

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/ChromeClientImpl.cpp (modified) (2 diffs)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-06-04  Jay Civelli  <jcivelli@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Accessibility focus change notifications are now sent from
+        ChromeClientImpl::focusedNodeChanged().
+        https://bugs.webkit.org/show_bug.cgi?id=39792
+
+        * src/ChromeClientImpl.cpp:
+        (WebKit::ChromeClientImpl::focus):
+        (WebKit::ChromeClientImpl::focusedNodeChanged):
+
 2010-06-04  Jay Civelli  <jcivelli@chromium.org>
 

trunk/WebKit/chromium/src/ChromeClientImpl.cpp

@@ -160 +160 @@
 void ChromeClientImpl::focus()
 {
-    if (!m_webView->client())
-        return;
-
-    m_webView->client()->didFocus();
-
-    // If accessibility is enabled, we should notify assistive technology that
-    // the active AccessibilityObject changed.
-    const Frame* frame = m_webView->focusedWebCoreFrame();
-    if (!frame)
-        return;
-
-    Document* doc = frame->document();
-
-    if (doc && doc->axObjectCache()->accessibilityEnabled()) {
-        Node* focusedNode = m_webView->focusedWebCoreNode();
-
-        if (!focusedNode) {
-            // Could not retrieve focused Node.
-            return;
-        }
-
-        // Retrieve the focused AccessibilityObject.
-        AccessibilityObject* focusedAccObj =
-            doc->axObjectCache()->getOrCreate(focusedNode->renderer());
-
-        // Alert assistive technology that focus changed.
-        if (focusedAccObj)
-            m_webView->client()->focusAccessibilityObject(WebAccessibilityObject(focusedAccObj));
-    }
+    if (m_webView->client())
+        m_webView->client()->didFocus();
 }
 
@@ -218 +191 @@
     m_webView->client()->focusedNodeChanged(WebNode(node));
 
-    WebURL focus_url;
+    WebURL focusURL;
     if (node && node->isLink()) {
         // This HitTestResult hack is the easiest way to get a link URL out of a
         // WebCore::Node.
-        HitTestResult hit_test(IntPoint(0, 0));
+        HitTestResult hitTest(IntPoint(0, 0));
         // This cast must be valid because of the isLink() check.
-        hit_test.setURLElement(reinterpret_cast<Element*>(node));
-        if (hit_test.isLiveLink())
-            focus_url = hit_test.absoluteLinkURL();
-    }
-    m_webView->client()->setKeyboardFocusURL(focus_url);
+        hitTest.setURLElement(static_cast<Element*>(node));
+        if (hitTest.isLiveLink())
+            focusURL = hitTest.absoluteLinkURL();
+    }
+    m_webView->client()->setKeyboardFocusURL(focusURL);
+    
+    if (!node)
+        return;
+
+    // If accessibility is enabled, we should notify assistive technology that
+    // the active AccessibilityObject changed.
+    Document* document = node->document();
+    if (!document) {
+        ASSERT_NOT_REACHED();
+        return;
+    } 
+    if (document && document->axObjectCache()->accessibilityEnabled()) {
+        // Retrieve the focused AccessibilityObject.
+        AccessibilityObject* focusedAccObj =
+            document->axObjectCache()->getOrCreate(node->renderer());
+
+        // Alert assistive technology that focus changed.
+        if (focusedAccObj)
+            m_webView->client()->focusAccessibilityObject(WebAccessibilityObject(focusedAccObj));
+    }
 }