Changeset 112851 in webkit

Timestamp:

Apr 2, 2012 3:28:26 AM (12 years ago)

Author:

mario@webkit.org

Message:

in page anchor and keyboard navigation
​https://bugs.webkit.org/show_bug.cgi?id=17450

Reviewed by Chris Fleizach.

Source/WebCore:

Ensure that the position of the caret and the focused element
get updated when following an anchor link.

The implementation is moved from platform specific files out to
AXObjectCache.cpp since it should be a cross-platform valid
solution. However, the new code is currently activated for the Mac
and GTK ports only, since the windows and chromium ports provide
their own specific code, and removing it now might break things.

Test: accessibility/anchor-link-selection-and-focus.html

• accessibility/AXObjectCache.cpp:

(WebCore):
(WebCore::AXObjectCache::handleScrolledToAnchor): Cross-platform
implementation of the fix, only activated for Mac and GTK for now.

• accessibility/gtk/AXObjectCacheAtk.cpp: Removed the GTK-specific

implementation of WebCore::AXObjectCache::handleScrolledToAnchor.

• accessibility/mac/AXObjectCacheMac.mm: Removed the Mac-specific

implementation of WebCore::AXObjectCache::handleScrolledToAnchor.

LayoutTests:

Added new test and expectations.

• accessibility/anchor-link-selection-and-focus-expected.txt: Added.
• accessibility/anchor-link-selection-and-focus.html: Added.
• platform/gtk/accessibility/anchor-link-selection-and-focus-expected.txt: Added.
• platform/chromium/test_expectations.txt: Skipped test for chromium.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/anchor-link-selection-and-focus-expected.txt (added)
• LayoutTests/accessibility/anchor-link-selection-and-focus.html (added)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• LayoutTests/platform/gtk/accessibility/anchor-link-selection-and-focus-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AXObjectCache.cpp (modified) (3 diffs)
• Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp (modified) (1 diff)
• Source/WebCore/accessibility/mac/AXObjectCacheMac.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-04-02  Mario Sanchez Prada  <msanchez@igalia.com>
+
+        in page anchor and keyboard navigation
+        https://bugs.webkit.org/show_bug.cgi?id=17450
+
+        Reviewed by Chris Fleizach.
+
+        Added new test and expectations.
+
+        * accessibility/anchor-link-selection-and-focus-expected.txt: Added.
+        * accessibility/anchor-link-selection-and-focus.html: Added.
+        * platform/gtk/accessibility/anchor-link-selection-and-focus-expected.txt: Added.
+        * platform/chromium/test_expectations.txt: Skipped test for chromium.
+
 2012-04-02  Philippe Normand  <pnormand@igalia.com>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -1276 +1276 @@
 BUGCR10322 SKIP : platform/mac/accessibility = PASS FAIL
 BUGCR10322 SKIP : platform/win/accessibility = PASS FAIL
+BUGCR10322 SKIP : accessibility/anchor-link-selection-and-focus.html = TEXT
 BUGCR10322 SKIP : accessibility/aria-activedescendant-crash.html = TEXT
 BUGCR10322 SKIP : accessibility/aria-combobox.html = TEXT

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-02  Mario Sanchez Prada  <msanchez@igalia.com>
+
+        in page anchor and keyboard navigation
+        https://bugs.webkit.org/show_bug.cgi?id=17450
+
+        Reviewed by Chris Fleizach.
+
+        Ensure that the position of the caret and the focused element
+        get updated when following an anchor link.
+
+        The implementation is moved from platform specific files out to
+        AXObjectCache.cpp since it should be a cross-platform valid
+        solution. However, the new code is currently activated for the Mac
+        and GTK ports only, since the windows and chromium ports provide
+        their own specific code, and removing it now might break things.
+
+        Test: accessibility/anchor-link-selection-and-focus.html
+
+        * accessibility/AXObjectCache.cpp:
+        (WebCore):
+        (WebCore::AXObjectCache::handleScrolledToAnchor): Cross-platform
+        implementation of the fix, only activated for Mac and GTK for now.
+        * accessibility/gtk/AXObjectCacheAtk.cpp: Removed the GTK-specific
+        implementation of WebCore::AXObjectCache::handleScrolledToAnchor.
+        * accessibility/mac/AXObjectCacheMac.mm: Removed the Mac-specific
+        implementation of WebCore::AXObjectCache::handleScrolledToAnchor.
+
 2012-04-02  Hayato Ito  <hayato@chromium.org>
 

trunk/Source/WebCore/accessibility/AXObjectCache.cpp

@@ -55 +55 @@
 #include "FocusController.h"
 #include "Frame.h"
+#include "FrameSelection.h"
 #include "HTMLAreaElement.h"
 #include "HTMLImageElement.h"
@@ -72 +73 @@
 #include "RenderView.h"
 #include "ScrollView.h"
-
+#include "TextAffinity.h"
+#include "htmlediting.h"
 #include <wtf/PassRefPtr.h>
 
@@ -156 +158 @@
     return obj;
 }
+
+#if HAVE(ACCESSIBILITY) && (PLATFORM(MAC) || PLATFORM(GTK))
+void AXObjectCache::handleScrolledToAnchor(const Node* node)
+{
+    ASSERT(node);
+
+    Document* document = node->document();
+    if (!document)
+        return;
+
+    RefPtr<Node> refNode = const_cast<Node*>(node);
+    document->setFocusedNode(refNode);
+
+    Frame* frame = document->frame();
+    if (!frame)
+        return;
+
+    FrameSelection* selection = frame->selection();
+    if (!selection)
+        return;
+
+    Position targetPosition = firstPositionInOrBeforeNode(refNode.get());
+    selection->moveTo(targetPosition, DOWNSTREAM);
+}
+#endif
 
 AccessibilityObject* AXObjectCache::get(Widget* widget)

trunk/Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp

@@ -232 +232 @@
 }
 
-void AXObjectCache::handleScrolledToAnchor(const Node*)
-{
-}
-
 } // namespace WebCore

trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm

@@ -145 +145 @@
 }
 
-void AXObjectCache::handleScrolledToAnchor(const Node*)
-{
-}
-
 }