From eded800b4f71e465a5e62e3d16037c0e3cdc58e8 Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Fri, 23 Jan 2015 11:33:31 +0100 Subject: [PATCH] Backed out changeset 2b79bd646942 (bug 1109968) for b2g ics m9 test failures --- dom/html/HTMLAnchorElement.cpp | 16 +------------ layout/base/tests/bug1109968-1-ref.html | 17 -------------- layout/base/tests/bug1109968-1.html | 23 ------------------- layout/base/tests/bug1109968-2-ref.html | 17 -------------- layout/base/tests/bug1109968-2.html | 23 ------------------- layout/base/tests/mochitest.ini | 4 ---- .../base/tests/test_reftests_with_caret.html | 2 -- 7 files changed, 1 insertion(+), 101 deletions(-) delete mode 100644 layout/base/tests/bug1109968-1-ref.html delete mode 100644 layout/base/tests/bug1109968-1.html delete mode 100644 layout/base/tests/bug1109968-2-ref.html delete mode 100644 layout/base/tests/bug1109968-2.html diff --git a/dom/html/HTMLAnchorElement.cpp b/dom/html/HTMLAnchorElement.cpp index 139ad2e8dfc..0672b45aeaa 100644 --- a/dom/html/HTMLAnchorElement.cpp +++ b/dom/html/HTMLAnchorElement.cpp @@ -193,18 +193,6 @@ HTMLAnchorElement::UnbindFromTree(bool aDeep, bool aNullParent) nsGenericHTMLElement::UnbindFromTree(aDeep, aNullParent); } -static bool -IsNodeInEditableRegion(nsINode* aNode) -{ - while (aNode) { - if (aNode->IsEditable()) { - return true; - } - aNode = aNode->GetParent(); - } - return false; -} - bool HTMLAnchorElement::IsHTMLFocusable(bool aWithMouse, bool *aIsFocusable, int32_t *aTabIndex) @@ -226,9 +214,7 @@ HTMLAnchorElement::IsHTMLFocusable(bool aWithMouse, } } - // Links that are in an editable region should never be focusable, even if - // they are in a contenteditable="false" region. - if (IsNodeInEditableRegion(this)) { + if (IsEditable()) { if (aTabIndex) { *aTabIndex = -1; } diff --git a/layout/base/tests/bug1109968-1-ref.html b/layout/base/tests/bug1109968-1-ref.html deleted file mode 100644 index 28bcf608a73..00000000000 --- a/layout/base/tests/bug1109968-1-ref.html +++ /dev/null @@ -1,17 +0,0 @@ - - -
foo
bar
baz
- - - diff --git a/layout/base/tests/bug1109968-1.html b/layout/base/tests/bug1109968-1.html deleted file mode 100644 index a8d0d216fa8..00000000000 --- a/layout/base/tests/bug1109968-1.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - - -
foo
bar
baz
- - - diff --git a/layout/base/tests/bug1109968-2-ref.html b/layout/base/tests/bug1109968-2-ref.html deleted file mode 100644 index 9638c35b331..00000000000 --- a/layout/base/tests/bug1109968-2-ref.html +++ /dev/null @@ -1,17 +0,0 @@ - - -
foo
bar
- - - diff --git a/layout/base/tests/bug1109968-2.html b/layout/base/tests/bug1109968-2.html deleted file mode 100644 index 159311ad39a..00000000000 --- a/layout/base/tests/bug1109968-2.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - - -
foo
bar
- - - diff --git a/layout/base/tests/mochitest.ini b/layout/base/tests/mochitest.ini index 8538c1a8d13..62e6c04cfbb 100644 --- a/layout/base/tests/mochitest.ini +++ b/layout/base/tests/mochitest.ini @@ -55,10 +55,6 @@ support-files = bug644768.html bug1061468.html bug1061468-ref.html - bug1109968-1-ref.html - bug1109968-1.html - bug1109968-2-ref.html - bug1109968-2.html [test_preserve3d_sorting_hit_testing.html] [test_after_paint_pref.html] diff --git a/layout/base/tests/test_reftests_with_caret.html b/layout/base/tests/test_reftests_with_caret.html index e43042093c7..d3680d1099f 100644 --- a/layout/base/tests/test_reftests_with_caret.html +++ b/layout/base/tests/test_reftests_with_caret.html @@ -109,8 +109,6 @@ var tests = [ [ 'bug613807-1.html' , 'bug613807-1-ref.html' ] , [ 'bug1082486-1.html', 'bug1082486-1-ref.html'] , [ 'bug1082486-2.html', 'bug1082486-2-ref.html'] , - [ 'bug1109968-1.html', 'bug1109968-1-ref.html'] , - [ 'bug1109968-2.html', 'bug1109968-2-ref.html'] , // The following test cases are all involving with one sending // synthesizeKey(), the other without. They ought to be failed // when touch caret preference on. Test them with preference off.