projects / profile / ivi / webkit-efl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 68d8df6)
Unreviewed, rolling out r112851.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 2 Apr 2012 18:15:33 +0000 (18:15 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 2 Apr 2012 18:15:33 +0000 (18:15 +0000)
http://trac.webkit.org/changeset/112851
https://bugs.webkit.org/show_bug.cgi?id=82915

Broke 3 Mac accessibility tests (Requested by enrica on
#webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-04-02

Source/WebCore:

* accessibility/AXObjectCache.cpp:
* accessibility/gtk/AXObjectCacheAtk.cpp:
(WebCore::AXObjectCache::handleScrolledToAnchor):
(WebCore):
* accessibility/mac/AXObjectCacheMac.mm:
(WebCore::AXObjectCache::handleScrolledToAnchor):
(WebCore):

LayoutTests:

* accessibility/anchor-link-selection-and-focus-expected.txt: Removed.
* accessibility/anchor-link-selection-and-focus.html: Removed.
* platform/chromium/test_expectations.txt:
* platform/gtk/accessibility/anchor-link-selection-and-focus-expected.txt: Removed.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@112911 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog patch | blob | history
LayoutTests/accessibility/anchor-link-selection-and-focus-expected.txt [deleted file] patch | blob | history
LayoutTests/accessibility/anchor-link-selection-and-focus.html [deleted file] patch | blob | history
LayoutTests/platform/chromium/test_expectations.txt patch | blob | history
LayoutTests/platform/gtk/accessibility/anchor-link-selection-and-focus-expected.txt [deleted file] patch | blob | history
Source/WebCore/ChangeLog patch | blob | history
Source/WebCore/accessibility/AXObjectCache.cpp patch | blob | history
Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp patch | blob | history
Source/WebCore/accessibility/mac/AXObjectCacheMac.mm patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9f308c2..97ee9f7 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2012-04-02  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r112851.
+        http://trac.webkit.org/changeset/112851
+        https://bugs.webkit.org/show_bug.cgi?id=82915
+
+        Broke 3 Mac accessibility tests (Requested by enrica on
+        #webkit).
+
+        * accessibility/anchor-link-selection-and-focus-expected.txt: Removed.
+        * accessibility/anchor-link-selection-and-focus.html: Removed.
+        * platform/chromium/test_expectations.txt:
+        * platform/gtk/accessibility/anchor-link-selection-and-focus-expected.txt: Removed.
+
 2012-04-02  Stephen Chenney  <schenney@chromium.org>
 
         <img style='width: 100%' src='foo.svg'> gets pixellated when stretched
diff --git a/LayoutTests/accessibility/anchor-link-selection-and-focus-expected.txt b/LayoutTests/accessibility/anchor-link-selection-and-focus-expected.txt
deleted file mode 100644 (file)
index fc52077..0000000
--- a/LayoutTests/accessibility/anchor-link-selection-and-focus-expected.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-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".
-
-
-axLink.role is: 'AXRole: AXLink'
-axAnchor.role is: 'AXRole: AXLink'
-PASS axLink.isFocused is true
-PASS axAnchor.isFocused is false
-PASS getSelection().anchorNode.nodeValue is 'The Anchor'
-PASS axLink.isFocused is false
-PASS axAnchor.isFocused is true
-
diff --git a/LayoutTests/accessibility/anchor-link-selection-and-focus.html b/LayoutTests/accessibility/anchor-link-selection-and-focus.html
deleted file mode 100644 (file)
index 7703464..0000000
--- a/LayoutTests/accessibility/anchor-link-selection-and-focus.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!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" href="">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");
-
-        // Get needed objects.
-        link.focus();
-        var axLink = accessibilityController.focusedElement;
-        debug("axLink.role is: '" + axLink.role + "'");
-        anchor.focus();
-        var axAnchor = accessibilityController.focusedElement;
-        debug("axAnchor.role is: '" + axAnchor.role + "'");
-
-        // Focus on the link and check initial state.
-        link.focus();
-        shouldBe("axLink.isFocused", "true");
-        shouldBe("axAnchor.isFocused", "false");
-
-        // Execute action and check state.
-        axLink.press()
-
-        // Check final state.
-        shouldBe("getSelection().anchorNode.nodeValue", "'The Anchor'");
-        shouldBe("axLink.isFocused", "false");
-        shouldBe("axAnchor.isFocused", "true");
-    }
-}
-
-successfullyParsed = true;
-</script>
-<script src="../../../fast/js/resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index ace5690..94766d8 100644 (file)
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -1279,7 +1279,6 @@ BUGCR45747 : svg/text/text-fill-opacity.svg = PASS FAIL
 
 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
 BUGCR10322 SKIP : accessibility/aria-controls-with-tabs.html = TEXT
diff --git a/LayoutTests/platform/gtk/accessibility/anchor-link-selection-and-focus-expected.txt b/LayoutTests/platform/gtk/accessibility/anchor-link-selection-and-focus-expected.txt
deleted file mode 100644 (file)
index d8566ab..0000000
--- a/LayoutTests/platform/gtk/accessibility/anchor-link-selection-and-focus-expected.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-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".
-
-
-axLink.role is: 'AXRole: link'
-axAnchor.role is: 'AXRole: link'
-PASS axLink.isFocused is true
-PASS axAnchor.isFocused is false
-PASS getSelection().anchorNode.nodeValue is 'The Anchor'
-PASS axLink.isFocused is false
-PASS axAnchor.isFocused is true
-
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index cef5e6e..4c85068 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2012-04-02  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r112851.
+        http://trac.webkit.org/changeset/112851
+        https://bugs.webkit.org/show_bug.cgi?id=82915
+
+        Broke 3 Mac accessibility tests (Requested by enrica on
+        #webkit).
+
+        * accessibility/AXObjectCache.cpp:
+        * accessibility/gtk/AXObjectCacheAtk.cpp:
+        (WebCore::AXObjectCache::handleScrolledToAnchor):
+        (WebCore):
+        * accessibility/mac/AXObjectCacheMac.mm:
+        (WebCore::AXObjectCache::handleScrolledToAnchor):
+        (WebCore):
+
 2012-04-02  Michael Saboff  <msaboff@apple.com>
 
         WebKit should throttle memory pressure notifications in proportion to handler time
diff --git a/Source/WebCore/accessibility/AXObjectCache.cpp b/Source/WebCore/accessibility/AXObjectCache.cpp
index cfe6d8e..02d5bfb 100644 (file)
--- a/Source/WebCore/accessibility/AXObjectCache.cpp
+++ b/Source/WebCore/accessibility/AXObjectCache.cpp
@@ -54,7 +54,6 @@
 #include "Document.h"
 #include "FocusController.h"
 #include "Frame.h"
-#include "FrameSelection.h"
 #include "HTMLAreaElement.h"
 #include "HTMLImageElement.h"
 #include "HTMLInputElement.h"
@@ -72,8 +71,7 @@
 #include "RenderTableRow.h"
 #include "RenderView.h"
 #include "ScrollView.h"
-#include "TextAffinity.h"
-#include "htmlediting.h"
+
 #include <wtf/PassRefPtr.h>
 
 namespace WebCore {
@@ -158,31 +156,6 @@ AccessibilityObject* AXObjectCache::focusedUIElementForPage(const Page* page)
     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)
 {
     if (!widget)
diff --git a/Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp b/Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp
index 153967d..9b46b38 100644 (file)
--- a/Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp
+++ b/Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp
@@ -231,4 +231,8 @@ void AXObjectCache::handleFocusedUIElementChanged(RenderObject* oldFocusedRender
     }
 }
 
+void AXObjectCache::handleScrolledToAnchor(const Node*)
+{
+}
+
 } // namespace WebCore
diff --git a/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm b/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm
index d352623..acbc25f 100644 (file)
--- a/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm
+++ b/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm
@@ -144,6 +144,10 @@ void AXObjectCache::handleFocusedUIElementChanged(RenderObject*, RenderObject*)
     wkAccessibilityHandleFocusChanged();
 }
 
+void AXObjectCache::handleScrolledToAnchor(const Node*)
+{
+}
+
 }
 
 #endif // HAVE(ACCESSIBILITY)
Domain: Web Framework / Uncategorized;