Attachment #129465 for bug #17450

View Details Raw Unified Return to Bug 17450

| Differences between



2012-02-29  Mario Sanchez Prada  <msanchez@igalia.com>

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

        Reviewed by NOBODY (OOPS!).

        * accessibility/anchor-link-selection-and-focus-expected.txt: Added.
        * accessibility/anchor-link-selection-and-focus.html: Added.

2012-02-28  Adam Klein  <adamk@chromium.org>

        Remove suppressions of SVG crash flakiness on cr-mac



A link pointing to an anchor at the end of the document

A paragraph with a some text in the middle

The Anchor

This tests that the caret position is properly updated when following anchor links.

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".


PASS axLink.isFocused is true
PASS axLink.isFocused is false
PASS getSelection().anchorNode.nodeValue is 'The Anchor'




<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
<link rel="stylesheet" href="../fast/js/resources/js-test-style.css">
<script>
var successfullyParsed = false;
</script>
<script src="../fast/js/resources/js-test-pre.js"></script>
</head>
<body id="body">
<p><a id="link" href="#anchor">A link pointing to an anchor at the end of the document</a></p>
<p>A paragraph with a some text in the middle</p>
<p><a id="anchor" name="anchor">The Anchor</a></p>
<p id="description"></p>
<div id="console"></div>
<script>
description("This tests that the caret position is properly updated when following anchor links.");

if (window.layoutTestController) {
    layoutTestController.dumpAsText();

    if (window.accessibilityController) {
        var link = document.getElementById("link");
        var anchor = document.getElementById("anchor");
        var textAfterAnchor = document.getElementById("text");

        // Focus on the link and check state
        link.focus();
        var axLink = accessibilityController.focusedElement;
        shouldBe("axLink.isFocused", "true");

        // Execute action and check state.
        axLink.press()
        shouldBe("axLink.isFocused", "false");
        shouldBe("getSelection().anchorNode.nodeValue", "'The Anchor'");
    }
}

successfullyParsed = true;
</script>
<script src="../../../fast/js/resources/js-test-post.js"></script>
</body>
</html>



2012-02-29  Mario Sanchez Prada  <msanchez@igalia.com>

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

        Reviewed by NOBODY (OOPS!).

        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-02-28  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r108834.



#include "Document.h"
#include "FocusController.h"
#include "Frame.h"
#include "FrameSelection.h"
#include "HTMLAreaElement.h"
#include "HTMLImageElement.h"
#include "HTMLInputElement.h"

#include "RenderTableRow.h"
#include "RenderView.h"
#include "ScrollView.h"
#include "TextAffinity.h"
#include "htmlediting.h"
#include <wtf/PassRefPtr.h>

namespace WebCore {

    return obj;
}

#if HAVE(ACCESSIBILITY) && (PLATFORM(MAC) || PLATFORM(GTK))
void AXObjectCache::handleScrolledToAnchor(const Node* node)
{
    Document* document = node->document();
    if (!document)
        return;

    Frame* frame = document->frame();
    if (!frame)
        return;

    FrameSelection* selection = frame->selection();
    if (!selection)
        return;

    RefPtr<Node> refNode = const_cast<Node*>(node);
    document->setFocusedNode(refNode);

    Position targetPosition = firstPositionInOrBeforeNode(const_cast<Node*>(node));
    selection->moveTo(targetPosition, DOWNSTREAM);
}
#endif

AccessibilityObject* AXObjectCache::get(Widget* widget)
{
    if (!widget)



    }
}

void AXObjectCache::handleScrolledToAnchor(const Node*)
{
}

} // namespace WebCore



    wkAccessibilityHandleFocusChanged();
}

void AXObjectCache::handleScrolledToAnchor(const Node*)
{
}

}

#endif // HAVE(ACCESSIBILITY)
- 

Return to Bug 17450

Lines 54-59 a/Source/WebCore/accessibility/AXObjectCache.cpp_sec1
- a/Source/WebCore/accessibility/AXObjectCache.cpp -1 / +26 lines
54	#include "Document.h"	54	#include "Document.h"
55	#include "FocusController.h"	55	#include "FocusController.h"
56	#include "Frame.h"	56	#include "Frame.h"
		57	#include "FrameSelection.h"
57	#include "HTMLAreaElement.h"	58	#include "HTMLAreaElement.h"
58	#include "HTMLImageElement.h"	59	#include "HTMLImageElement.h"
59	#include "HTMLInputElement.h"	60	#include "HTMLInputElement.h"
Lines 71-77 a/Source/WebCore/accessibility/AXObjectCache.cpp_sec2
71	#include "RenderTableRow.h"	72	#include "RenderTableRow.h"
72	#include "RenderView.h"	73	#include "RenderView.h"
73	#include "ScrollView.h"	74	#include "ScrollView.h"
74		75	#include "TextAffinity.h"
		76	#include "htmlediting.h"
75	#include <wtf/PassRefPtr.h>	77	#include <wtf/PassRefPtr.h>
76		78
77	namespace WebCore {	79	namespace WebCore {
Lines 156-161 AccessibilityObject* AXObjectCache::focusedUIElementForPage(const Page* page) a/Source/WebCore/accessibility/AXObjectCache.cpp_sec3
156	return obj;	158	return obj;
157	}	159	}
158		160
		161	#if HAVE(ACCESSIBILITY) && (PLATFORM(MAC) \|\| PLATFORM(GTK))
		162	void AXObjectCache::handleScrolledToAnchor(const Node* node)
		163	{
		164	Document* document = node->document();
		165	if (!document)
		166	return;
		167
		168	Frame* frame = document->frame();
		169	if (!frame)
		170	return;
		171
		172	FrameSelection* selection = frame->selection();
		173	if (!selection)
		174	return;
		175
		176	RefPtr<Node> refNode = const_cast<Node*>(node);
		177	document->setFocusedNode(refNode);
		178
		179	Position targetPosition = firstPositionInOrBeforeNode(const_cast<Node*>(node));
		180	selection->moveTo(targetPosition, DOWNSTREAM);
		181	}
		182	#endif
		183
159	AccessibilityObject* AXObjectCache::get(Widget* widget)	184	AccessibilityObject* AXObjectCache::get(Widget* widget)
160	{	185	{
161	if (!widget)	186	if (!widget)

Lines 231-238 void AXObjectCache::handleFocusedUIElementChanged(RenderObject* oldFocusedRender a/Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp_sec1
- a/Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp -4 lines
231	}	231	}
232	}	232	}
233		233
234	void AXObjectCache::handleScrolledToAnchor(const Node*)
235	{
236	}
237
238	} // namespace WebCore	234	} // namespace WebCore

Lines 141-150 void AXObjectCache::handleFocusedUIElementChanged(RenderObject, RenderObject) a/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm_sec1
- a/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm -5 lines
141	wkAccessibilityHandleFocusChanged();	141	wkAccessibilityHandleFocusChanged();
142	}	142	}
143		143
144	void AXObjectCache::handleScrolledToAnchor(const Node*)
145	{
146	}
147
148	}	144	}
149		145
150	#endif // HAVE(ACCESSIBILITY)	146	#endif // HAVE(ACCESSIBILITY)
151	-

Lines 1-3 a/LayoutTests/ChangeLog_sec1
- a/LayoutTests/ChangeLog +10 lines
		1	2012-02-29 Mario Sanchez Prada <msanchez@igalia.com>
		2
		3	in page anchor and keyboard navigation
		4	https://bugs.webkit.org/show_bug.cgi?id=17450
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* accessibility/anchor-link-selection-and-focus-expected.txt: Added.
		9	* accessibility/anchor-link-selection-and-focus.html: Added.
		10
1	2012-02-28 Adam Klein <adamk@chromium.org>	11	2012-02-28 Adam Klein <adamk@chromium.org>
2		12
3	Remove suppressions of SVG crash flakiness on cr-mac	13	Remove suppressions of SVG crash flakiness on cr-mac

Line 0 a/LayoutTests/accessibility/anchor-link-selection-and-focus-expected.txt_sec1
- a/LayoutTests/accessibility/anchor-link-selection-and-focus-expected.txt +15 lines
	1	A link pointing to an anchor at the end of the document
	2
	3	A paragraph with a some text in the middle
	4
	5	The Anchor
	6
	7	This tests that the caret position is properly updated when following anchor links.
	8
	9	On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
	10
	11
	12	PASS axLink.isFocused is true
	13	PASS axLink.isFocused is false
	14	PASS getSelection().anchorNode.nodeValue is 'The Anchor'
	15

Line 0 a/LayoutTests/accessibility/anchor-link-selection-and-focus.html_sec1
- a/LayoutTests/accessibility/anchor-link-selection-and-focus.html +43 lines
	1	<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
	2	<html>
	3	<head>
	4	<link rel="stylesheet" href="../fast/js/resources/js-test-style.css">
	5	<script>
	6	var successfullyParsed = false;
	7	</script>
	8	<script src="../fast/js/resources/js-test-pre.js"></script>
	9	</head>
	10	<body id="body">
	11	<p><a id="link" href="#anchor">A link pointing to an anchor at the end of the document</a></p>
	12	<p>A paragraph with a some text in the middle</p>
	13	<p><a id="anchor" name="anchor">The Anchor</a></p>
	14	<p id="description"></p>
	15	<div id="console"></div>
	16	<script>
	17	description("This tests that the caret position is properly updated when following anchor links.");
	18
	19	if (window.layoutTestController) {
	20	layoutTestController.dumpAsText();
	21
	22	if (window.accessibilityController) {
	23	var link = document.getElementById("link");
	24	var anchor = document.getElementById("anchor");
	25	var textAfterAnchor = document.getElementById("text");
	26
	27	// Focus on the link and check state
	28	link.focus();
	29	var axLink = accessibilityController.focusedElement;
	30	shouldBe("axLink.isFocused", "true");
	31
	32	// Execute action and check state.
	33	axLink.press()
	34	shouldBe("axLink.isFocused", "false");
	35	shouldBe("getSelection().anchorNode.nodeValue", "'The Anchor'");
	36	}
	37	}
	38
	39	successfullyParsed = true;
	40	</script>
	41	<script src="../../../fast/js/resources/js-test-post.js"></script>
	42	</body>
	43	</html>

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +27 lines
		1	2012-02-29 Mario Sanchez Prada <msanchez@igalia.com>
		2
		3	in page anchor and keyboard navigation
		4	https://bugs.webkit.org/show_bug.cgi?id=17450
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Ensure that the position of the caret and the focused element
		9	get updated when following an anchor link.
		10
		11	The implementation is moved from platform specific files out to
		12	AXObjectCache.cpp since it should be a cross-platform valid
		13	solution. However, the new code is currently activated for the Mac
		14	and GTK ports only, since the windows and chromium ports provide
		15	their own specific code, and removing it now might break things.
		16
		17	Test: accessibility/anchor-link-selection-and-focus.html
		18
		19	* accessibility/AXObjectCache.cpp:
		20	(WebCore):
		21	(WebCore::AXObjectCache::handleScrolledToAnchor): Cross-platform
		22	implementation of the fix, only activated for Mac and GTK for now.
		23	* accessibility/gtk/AXObjectCacheAtk.cpp: Removed the GTK-specific
		24	implementation of WebCore::AXObjectCache::handleScrolledToAnchor.
		25	* accessibility/mac/AXObjectCacheMac.mm: Removed the Mac-specific
		26	implementation of WebCore::AXObjectCache::handleScrolledToAnchor.
		27
1	2012-02-28 Sheriff Bot <webkit.review.bot@gmail.com>	28	2012-02-28 Sheriff Bot <webkit.review.bot@gmail.com>
2		29
3	Unreviewed, rolling out r108834.	30	Unreviewed, rolling out r108834.