Rolling out r185881
authordbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 26 Jun 2015 22:18:49 +0000 (22:18 +0000)
committerdbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 26 Jun 2015 22:18:49 +0000 (22:18 +0000)
https://bugs.webkit.org/show_bug.cgi?id=146243
And
r185828
https://bugs.webkit.org/show_bug.cgi?id=145241

Reverting r185881 and r185828 because the latter caused a regression.

Source/WebCore:

* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::accessibilityTextFieldDecorationHitTest): Deleted.
(WebCore::AccessibilityRenderObject::accessibilityHitTest): Deleted.
* accessibility/AccessibilityRenderObject.h:

LayoutTests:

* accessibility/hit-test-input-auto-fill-button-expected.txt: Removed.
* accessibility/hit-test-input-auto-fill-button.html: Removed.
* accessibility/hit-test-input-search-cancel-button-expected.txt: Removed.
* accessibility/hit-test-input-search-cancel-button.html: Removed.
* accessibility/input-search-cancel-button-expected.txt: Removed.
* accessibility/input-search-cancel-button.html: Removed.
* accessibility/resources/shouldBeAccessibleByCursor.js: Removed.
* platform/win/TestExpectations:
* platform/wk2/TestExpectations:

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

13 files changed:
LayoutTests/ChangeLog
LayoutTests/accessibility/hit-test-input-auto-fill-button-expected.txt [deleted file]
LayoutTests/accessibility/hit-test-input-auto-fill-button.html [deleted file]
LayoutTests/accessibility/hit-test-input-search-cancel-button-expected.txt [deleted file]
LayoutTests/accessibility/hit-test-input-search-cancel-button.html [deleted file]
LayoutTests/accessibility/input-search-cancel-button-expected.txt [deleted file]
LayoutTests/accessibility/input-search-cancel-button.html [deleted file]
LayoutTests/accessibility/resources/shouldBeAccessibleByCursor.js [deleted file]
LayoutTests/platform/win/TestExpectations
LayoutTests/platform/wk2/TestExpectations
Source/WebCore/ChangeLog
Source/WebCore/accessibility/AccessibilityRenderObject.cpp
Source/WebCore/accessibility/AccessibilityRenderObject.h

index a45b275..58870ff 100644 (file)
@@ -1,3 +1,23 @@
+2015-06-26  Daniel Bates  <dabates@apple.com>
+
+        Rolling out r185881
+        https://bugs.webkit.org/show_bug.cgi?id=146243
+        And
+        r185828
+        https://bugs.webkit.org/show_bug.cgi?id=145241
+
+        Reverting r185881 and r185828 because the latter caused a regression.
+
+        * accessibility/hit-test-input-auto-fill-button-expected.txt: Removed.
+        * accessibility/hit-test-input-auto-fill-button.html: Removed.
+        * accessibility/hit-test-input-search-cancel-button-expected.txt: Removed.
+        * accessibility/hit-test-input-search-cancel-button.html: Removed.
+        * accessibility/input-search-cancel-button-expected.txt: Removed.
+        * accessibility/input-search-cancel-button.html: Removed.
+        * accessibility/resources/shouldBeAccessibleByCursor.js: Removed.
+        * platform/win/TestExpectations:
+        * platform/wk2/TestExpectations:
+
 2015-06-26  Dean Jackson  <dino@apple.com>
 
         No audio on animated page with the attached fixed layout epub
diff --git a/LayoutTests/accessibility/hit-test-input-auto-fill-button-expected.txt b/LayoutTests/accessibility/hit-test-input-auto-fill-button-expected.txt
deleted file mode 100644 (file)
index 0182675..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-This tests that the AutoFill button is hit testable.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS AutoFill button can be hit.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/accessibility/hit-test-input-auto-fill-button.html b/LayoutTests/accessibility/hit-test-input-auto-fill-button.html
deleted file mode 100644 (file)
index 1b17545..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src="../resources/js-test-pre.js"></script>
-<script src="resources/shouldBeAccessibleByCursor.js"></script>
-</head>
-<body>
-<div id="description"></div>
-<input type="password" id="password">
-<div id="console"></div>
-<script>
-description("This tests that the AutoFill button is hit testable.");
-
-if (!window.internals || !window.accessibilityController)
-    testFailed("You must run this test in the test tool and have implemented window.internals and window.accessibilityController.");
-else {
-    internals.setShowAutoFillButton(document.getElementById("password"), true);
-
-    shouldBeAccessibleByCursor(accessibilityController.accessibleElementById("password").childAtIndex(0), "AutoFill button");
-}
-</script>
-<script src="../resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/accessibility/hit-test-input-search-cancel-button-expected.txt b/LayoutTests/accessibility/hit-test-input-search-cancel-button-expected.txt
deleted file mode 100644 (file)
index a9d2a8e..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-This tests that the search cancel button is hit testable.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS search cancel button can be hit.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/accessibility/hit-test-input-search-cancel-button.html b/LayoutTests/accessibility/hit-test-input-search-cancel-button.html
deleted file mode 100644 (file)
index dbade54..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src="../resources/js-test-pre.js"></script>
-<script src="resources/shouldBeAccessibleByCursor.js"></script>
-</head>
-<body>
-<div id="description"></div>
-<input type="search" id="search" value="d" autofocus>
-<div id="console"></div>
-<script>
-description("This tests that the search cancel button is hit testable.");
-
-if (!window.internals || !window.accessibilityController)
-    testFailed("You must run this test in the test tool and have implemented window.internals and window.accessibilityController.");
-else {
-    shouldBeAccessibleByCursor(accessibilityController.accessibleElementById("search").childAtIndex(1), "search cancel button");
-}
-</script>
-<script src="../resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/accessibility/input-search-cancel-button-expected.txt b/LayoutTests/accessibility/input-search-cancel-button-expected.txt
deleted file mode 100644 (file)
index 53239aa..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-This tests that there exists an accessibility element for the search cancel button.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS accessibilityController.accessibleElementById("search").childAtIndex(1).description is "AXDescription: cancel"
-PASS accessibilityController.accessibleElementById("search").childAtIndex(1).role is "AXRole: AXButton"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/accessibility/input-search-cancel-button.html b/LayoutTests/accessibility/input-search-cancel-button.html
deleted file mode 100644 (file)
index c85f4f7..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src="../resources/js-test-pre.js"></script>
-</head>
-<body>
-<div id="description"></div>
-<input type="search" id="search" value="d" autofocus>
-<div id="console"></div>
-<script>
-description("This tests that there exists an accessibility element for the search cancel button.");
-
-if (!window.internals || !window.accessibilityController)
-    testFailed("You must run this test in the test tool and have implemented window.internals and window.accessibilityController.");
-else {
-    shouldBeEqualToString('accessibilityController.accessibleElementById("search").childAtIndex(1).description', "AXDescription: cancel");
-    shouldBeEqualToString('accessibilityController.accessibleElementById("search").childAtIndex(1).role', "AXRole: AXButton");
-}
-</script>
-<script src="../resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/accessibility/resources/shouldBeAccessibleByCursor.js b/LayoutTests/accessibility/resources/shouldBeAccessibleByCursor.js
deleted file mode 100644 (file)
index 1894605..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-function shouldBeAccessibleByCursor(accessibilityElement, displayName)
-{
-    console.assert(window.accessibilityController);
-    var x = accessibilityElement.x + accessibilityElement.width / 2;
-    var y = accessibilityElement.y + accessibilityElement.height / 2;
-    var hitElement = accessibilityController.elementAtPoint(x, y);
-    if (accessibilityElement.isEqual(hitElement))
-        testPassed(displayName + " can be hit.");
-    else {
-        testFailed("should have hit " + displayName + " at (" + x + ", " + y + "). Hit element " + hitElement + ":");
-        if (hitElement)
-            debug(hitElement.allAttributes());
-    }
-}
index b961876..df8b8ea 100644 (file)
@@ -1321,6 +1321,8 @@ webkit.org/b/140798 [ Release ] accessibility/html-html-element-is-ignored.html
 webkit.org/b/140798 [ Debug ] accessibility/html-html-element-is-ignored.html [ Skip ] # Debug assertion
 webkit.org/b/140798 [ Release ] accessibility/inline-block-assertion.html [ Failure ]
 webkit.org/b/140798 [ Debug ] accessibility/inline-block-assertion.html [ Skip ] # Debug assertion
+webkit.org/b/140798 [ Release ] accessibility/input-auto-fill-button.html [ Failure ]
+webkit.org/b/140798 [ Debug ] accessibility/input-auto-fill-button.html [ Failure ]
 webkit.org/b/140798 [ Release ] accessibility/input-type-hidden-in-aria-hidden-false.html [ Failure ]
 webkit.org/b/140798 [ Debug ] accessibility/input-type-hidden-in-aria-hidden-false.html [ Skip ] # Debug assertion
 webkit.org/b/140798 [ Release ] accessibility/legend-children-are-visible.html [ Failure ]
@@ -1414,11 +1416,6 @@ webkit.org/b/140798 [ Debug ] accessibility/aria-switch-checked.html [ Skip ]
 webkit.org/b/140798 [ Release ] accessibility/aria-switch-text.html [ Skip ]
 webkit.org/b/140798 [ Debug ] accessibility/aria-switch-text.html [ Skip ]
 
-webkit.org/b/146243 accessibility/hit-test-input-auto-fill-button.html [ Failure ]
-webkit.org/b/146243 accessibility/hit-test-input-search-cancel-button.html [ Failure ]
-webkit.org/b/140798 accessibility/input-auto-fill-button.html [ Failure ]
-webkit.org/b/146243 accessibility/input-search-cancel-button.html [ Failure ]
-
 # The following timeouts are caused by the same problem: [ Failure ]
 webkit.org/b/126066 accessibility/loading-iframe-updates-axtree.html [ Skip ]
 webkit.org/b/140798 accessibility/aria-hidden-false-works-in-subtrees.html [ Skip ]
index 4ed44c3..bd69cf9 100644 (file)
@@ -46,8 +46,6 @@
 webkit.org/b/101773 fast/repaint/body-background-image.html [ ImageOnlyFailure Pass ]
 
 # AX tests that require hit testing do not work in WK2.
-webkit.org/b/71298 accessibility/hit-test-input-auto-fill-button.html
-webkit.org/b/71298 accessibility/hit-test-input-search-cancel-button.html
 webkit.org/b/71298 accessibility/loading-iframe-updates-axtree.html
 webkit.org/b/71298 platform/mac/accessibility/html-slider-indicator.html
 webkit.org/b/71298 platform/mac/accessibility/listbox-hit-test.html
index 547a91f..549e381 100644 (file)
@@ -1,3 +1,18 @@
+2015-06-26  Daniel Bates  <dabates@apple.com>
+
+        Rolling out r185881
+        https://bugs.webkit.org/show_bug.cgi?id=146243
+        And
+        r185828
+        https://bugs.webkit.org/show_bug.cgi?id=145241
+
+        Reverting r185881 and r185828 because the latter caused a regression.
+
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::accessibilityTextFieldDecorationHitTest): Deleted.
+        (WebCore::AccessibilityRenderObject::accessibilityHitTest): Deleted.
+        * accessibility/AccessibilityRenderObject.h:
+
 2015-06-26  Dean Jackson  <dino@apple.com>
 
         No audio on animated page with the attached fixed layout epub
index ae4fb09..908d677 100644 (file)
@@ -2207,16 +2207,6 @@ AccessibilityObject* AccessibilityRenderObject::accessibilityImageMapHitTest(HTM
     return nullptr;
 }
 
-AccessibilityObject* AccessibilityRenderObject::accessibilityTextFieldDecorationHitTest(const HTMLInputElement& inputElement, const Node& decoration) const
-{
-    if (inputElement.autoFillButtonElement() == &decoration || inputElement.cancelButtonElement() == &decoration) {
-        AccessibilityObject* object = axObjectCache()->getOrCreate(decoration.renderer());
-        if (object && !object->accessibilityIsIgnored())
-            return object;
-    }
-    return nullptr;
-}
-
 AccessibilityObject* AccessibilityRenderObject::remoteSVGElementHitTest(const IntPoint& point) const
 {
     AccessibilityObject* remote = remoteSVGRootElement();
@@ -2252,11 +2242,6 @@ AccessibilityObject* AccessibilityRenderObject::accessibilityHitTest(const IntPo
     Node* node = hitTestResult.innerNode()->deprecatedShadowAncestorNode();
     ASSERT(node);
 
-    if (is<HTMLInputElement>(*node)) {
-        if (AccessibilityObject* object = accessibilityTextFieldDecorationHitTest(downcast<HTMLInputElement>(*node), *hitTestResult.innerNode()))
-            return object;
-    }
-
     if (is<HTMLAreaElement>(*node))
         return accessibilityImageMapHitTest(downcast<HTMLAreaElement>(node), point);
     
index a88bae1..e181867 100644 (file)
@@ -242,7 +242,6 @@ private:
     void addRadioButtonGroupMembers(AccessibilityChildrenVector& linkedUIElements) const;
     AccessibilityObject* internalLinkElement() const;
     AccessibilityObject* accessibilityImageMapHitTest(HTMLAreaElement*, const IntPoint&) const;
-    AccessibilityObject* accessibilityTextFieldDecorationHitTest(const HTMLInputElement&, const Node&) const;
     AccessibilityObject* accessibilityParentForImageMap(HTMLMapElement*) const;
     virtual AccessibilityObject* elementAccessibilityHitTest(const IntPoint&) const override;