From ca777970e87643cdf0d1e93a6ed3d22b104bcc99 Mon Sep 17 00:00:00 2001 From: Nigel Babu Date: Tue, 22 Dec 2015 14:03:19 +0530 Subject: [PATCH] Backed out changeset b61190bd4069 (bug 1121459) --- dom/events/test/bug648573.html | 106 ++++++++++++++++ dom/events/test/mochitest.ini | 1 + dom/events/test/test_bug648573.html | 117 +++--------------- dom/events/test/test_clickevent_on_input.html | 7 +- editor/reftests/reftest.list | 18 +-- layout/base/tests/bug644768.html | 58 +++++++++ layout/base/tests/mochitest.ini | 3 + layout/base/tests/test_bug1070851.html | 59 +++++++++ layout/base/tests/test_bug558663.html | 5 +- layout/base/tests/test_bug644768.html | 70 +++-------- .../base/tests/test_reftests_with_caret.html | 16 ++- .../tests/test_touchcaret_visibility.html | 97 +++++++++++++++ 12 files changed, 389 insertions(+), 168 deletions(-) create mode 100644 dom/events/test/bug648573.html create mode 100644 layout/base/tests/bug644768.html create mode 100644 layout/base/tests/test_bug1070851.html create mode 100644 layout/base/tests/test_touchcaret_visibility.html diff --git a/dom/events/test/bug648573.html b/dom/events/test/bug648573.html new file mode 100644 index 000000000000..a70642370b0e --- /dev/null +++ b/dom/events/test/bug648573.html @@ -0,0 +1,106 @@ + + + + + Test for Bug 648573 + + + + +Mozilla Bug 648573 +

+ +
+
+
+ + + diff --git a/dom/events/test/mochitest.ini b/dom/events/test/mochitest.ini index 5583b4b6aff6..e23b950136f2 100644 --- a/dom/events/test/mochitest.ini +++ b/dom/events/test/mochitest.ini @@ -5,6 +5,7 @@ support-files = bug299673.js bug322588-popup.html bug426082.html + bug648573.html bug656379-1.html bug418986-3.js error_event_worker.js diff --git a/dom/events/test/test_bug648573.html b/dom/events/test/test_bug648573.html index 0a4a9e7e3708..ac5b2d166479 100644 --- a/dom/events/test/test_bug648573.html +++ b/dom/events/test/test_bug648573.html @@ -4,106 +4,27 @@ - - Test for Bug 648573 - - + Bug 648573 test + - Mozilla Bug 648573 -

- - 
-      
-
+
+ diff --git a/dom/events/test/test_clickevent_on_input.html b/dom/events/test/test_clickevent_on_input.html index 07fe6ade6286..a426f8b1df24 100644 --- a/dom/events/test/test_clickevent_on_input.html +++ b/dom/events/test/test_clickevent_on_input.html @@ -49,10 +49,11 @@ function isEnabledMiddleClickPaste() } } -function isEnabledAccessibleCaret() +function isEnabledTouchCaret() { try { - return SpecialPowers.getBoolPref("layout.accessiblecaret.enabled"); + return SpecialPowers.getBoolPref("touchcaret.enabled") || + SpecialPowers.getBoolPref("layout.accessiblecaret.enabled"); } catch (e) { return false; } @@ -68,7 +69,7 @@ function doTest(aButton) // then, the click event isn't generated. if (aButton != 2 && (aButton != 1 || !isEnabledMiddleClickPaste()) && - (aButton != 0 || !isEnabledAccessibleCaret())) { + (aButton != 0 || !isEnabledTouchCaret())) { gClickCount = 0; // click on border of input synthesizeMouse(input, 5, 5, { button: aButton }); diff --git a/editor/reftests/reftest.list b/editor/reftests/reftest.list index f66c422cb6e3..74a57189ac8e 100644 --- a/editor/reftests/reftest.list +++ b/editor/reftests/reftest.list @@ -57,10 +57,10 @@ skip-if(B2G||Mulet) random-if(Android) needs-focus != spellcheck-textarea-attr-d skip-if(B2G||Mulet) random-if(Android) needs-focus != spellcheck-textarea-attr-dynamic-override-inherit.html spellcheck-textarea-ref.html # Initial mulet triage: parity with B2G/B2G Desktop skip-if(B2G||Mulet) random-if(Android) needs-focus != spellcheck-textarea-property-dynamic-override.html spellcheck-textarea-ref.html # Initial mulet triage: parity with B2G/B2G Desktop skip-if(B2G||Mulet) random-if(Android) needs-focus != spellcheck-textarea-property-dynamic-override-inherit.html spellcheck-textarea-ref.html # Initial mulet triage: parity with B2G/B2G Desktop -needs-focus == caret_on_focus.html caret_on_focus-ref.html +needs-focus pref(touchcaret.enabled,false) == caret_on_focus.html caret_on_focus-ref.html needs-focus != caret_on_textarea_lastline.html caret_on_textarea_lastline-ref.html -needs-focus == input-text-onfocus-reframe.html input-text-onfocus-reframe-ref.html -needs-focus == input-text-notheme-onfocus-reframe.html input-text-notheme-onfocus-reframe-ref.html +needs-focus pref(touchcaret.enabled,false) pref(selectioncaret.enabled,false) == input-text-onfocus-reframe.html input-text-onfocus-reframe-ref.html +needs-focus pref(touchcaret.enabled,false) pref(selectioncaret.enabled,false) == input-text-notheme-onfocus-reframe.html input-text-notheme-onfocus-reframe-ref.html skip-if(B2G||Mulet) needs-focus == caret_after_reframe.html caret_after_reframe-ref.html # B2G timed out waiting for reftest-wait to be removed # Initial mulet triage: parity with B2G/B2G Desktop == nobogusnode-1.html nobogusnode-ref.html == nobogusnode-2.html nobogusnode-ref.html @@ -104,15 +104,15 @@ skip-if(Android||B2G||Mulet) needs-focus == 462758-grabbers-resizers.html 462758 == 388980-1.html 388980-1-ref.html needs-focus == spellcheck-superscript-1.html spellcheck-superscript-1-ref.html skip-if(B2G||Mulet) fails-if(Android) needs-focus != spellcheck-superscript-2.html spellcheck-superscript-2-ref.html # bug 783658 # Initial mulet triage: parity with B2G/B2G Desktop -needs-focus pref(layout.accessiblecaret.enabled,false) == 824080-1.html 824080-1-ref.html -needs-focus pref(layout.accessiblecaret.enabled,false) == 824080-2.html 824080-2-ref.html -needs-focus pref(layout.accessiblecaret.enabled,false) == 824080-3.html 824080-3-ref.html +needs-focus pref(selectioncaret.enabled,false) pref(layout.accessiblecaret.enabled,false) == 824080-1.html 824080-1-ref.html +needs-focus pref(selectioncaret.enabled,false) pref(layout.accessiblecaret.enabled,false) == 824080-2.html 824080-2-ref.html +needs-focus pref(selectioncaret.enabled,false) pref(layout.accessiblecaret.enabled,false) == 824080-3.html 824080-3-ref.html needs-focus != 824080-2.html 824080-3.html -needs-focus pref(layout.accessiblecaret.enabled,false) == 824080-4.html 824080-4-ref.html -needs-focus pref(layout.accessiblecaret.enabled,false) == 824080-5.html 824080-5-ref.html +needs-focus pref(selectioncaret.enabled,false) pref(layout.accessiblecaret.enabled,false) == 824080-4.html 824080-4-ref.html +needs-focus pref(selectioncaret.enabled,false) pref(layout.accessiblecaret.enabled,false) == 824080-5.html 824080-5-ref.html needs-focus != 824080-4.html 824080-5.html needs-focus == 824080-6.html 824080-6-ref.html -needs-focus pref(layout.accessiblecaret.enabled,false) == 824080-7.html 824080-7-ref.html +needs-focus pref(selectioncaret.enabled,false) pref(layout.accessiblecaret.enabled,false) == 824080-7.html 824080-7-ref.html needs-focus != 824080-6.html 824080-7.html # Bug 674927: copy spellcheck-textarea tests to contenteditable == spellcheck-contenteditable-attr.html spellcheck-contenteditable-nofocus-ref.html diff --git a/layout/base/tests/bug644768.html b/layout/base/tests/bug644768.html new file mode 100644 index 000000000000..385739321b7c --- /dev/null +++ b/layout/base/tests/bug644768.html @@ -0,0 +1,58 @@ + + + + + Test for Bug 644768 + + + + + + +Mozilla Bug 644768 +

+
+ + +
+
+
+
+ + diff --git a/layout/base/tests/mochitest.ini b/layout/base/tests/mochitest.ini index a33a7e19d00a..c3de8be102df 100644 --- a/layout/base/tests/mochitest.ini +++ b/layout/base/tests/mochitest.ini @@ -12,6 +12,7 @@ support-files = file_bug842853.html ../../../dom/plugins/test/mochitest/plugin-utils.js bug558663.html + bug644768.html bug956530-1.html bug956530-1-ref.html bug989012-1.html @@ -246,6 +247,7 @@ support-files = bug687297_b.html bug687297_c.html [test_bug990340.html] +[test_bug1070851.html] [test_bug1080360.html] support-files = bug1080360_inner.html [test_bug1078327.html] @@ -253,6 +255,7 @@ support-files = bug1078327_inner.html [test_bug1080361.html] support-files = bug1080361_inner.html [test_frame_reconstruction_for_pseudo_elements.html] +[test_touchcaret_visibility.html] [test_bug1093686.html] support-files = bug1093686_inner.html [test_bug1120705.html] diff --git a/layout/base/tests/test_bug1070851.html b/layout/base/tests/test_bug1070851.html new file mode 100644 index 000000000000..94c0d25f7881 --- /dev/null +++ b/layout/base/tests/test_bug1070851.html @@ -0,0 +1,59 @@ + + + + + + Test for Bug 1070851 + + + + + + + + + + Mozilla Bug 1070851 + + +
test
+ + diff --git a/layout/base/tests/test_bug558663.html b/layout/base/tests/test_bug558663.html index 2e20deec322a..737d32d62845 100644 --- a/layout/base/tests/test_bug558663.html +++ b/layout/base/tests/test_bug558663.html @@ -26,9 +26,10 @@ SimpleTest.expectAssertions(0, 2); } SimpleTest.waitForExplicitFinish(); - // AccessibleCaret's pref is checked only when PresShell is initialized. To turn + // Selection caret's pref is checked only when PresShell is initialized. To turn // off the pref, we test bug 558663 in an iframe. - SpecialPowers.pushPrefEnv({"set": [['layout.accessiblecaret.enabled', false]]}, function() { + SpecialPowers.pushPrefEnv({"set": [['selectioncaret.enabled', false], + ['layout.accessiblecaret.enabled', false]]}, function() { var iframe = document.createElement("iframe"); iframe.src = "bug558663.html"; document.getElementById('container').appendChild(iframe); diff --git a/layout/base/tests/test_bug644768.html b/layout/base/tests/test_bug644768.html index 24f3d29e1a3f..0404551f7c14 100644 --- a/layout/base/tests/test_bug644768.html +++ b/layout/base/tests/test_bug644768.html @@ -4,59 +4,25 @@ - - Test for Bug 644768 - - - - - - - Mozilla Bug 644768 -

-
- - -
- 
-      
-
+ + + +
+ diff --git a/layout/base/tests/test_reftests_with_caret.html b/layout/base/tests/test_reftests_with_caret.html index 1a8f7599afb8..cc617ba24465 100644 --- a/layout/base/tests/test_reftests_with_caret.html +++ b/layout/base/tests/test_reftests_with_caret.html @@ -107,9 +107,11 @@ var tests = [ [ 'bug1082486-1.html', 'bug1082486-1-ref.html'] , [ 'bug1082486-2.html', 'bug1082486-2-ref.html'] , // The following test cases are all involving with one sending - // synthesizeKey(), the other without. They fail when accessiblecaret - // is enabled. Test them with the preference off. - function() {SpecialPowers.pushPrefEnv({'set': [['layout.accessiblecaret.enabled', false]]}, nextTest);} , + // synthesizeKey(), the other without. They fail when the touch + // or selection caret is enabled. Test them with these preferences off. + function() {SpecialPowers.pushPrefEnv({'set': [['touchcaret.enabled', false], + ['selectioncaret.enabled', false], + ['layout.accessiblecaret.enabled', false]]}, nextTest);} , [ 'bug240933-1.html' , 'bug240933-1-ref.html' ] , [ 'bug240933-2.html' , 'bug240933-1-ref.html' ] , [ 'bug389321-1.html' , 'bug389321-1-ref.html' ] , @@ -155,14 +157,18 @@ var tests = [ [ 'bug1123067-2.html' , 'bug1123067-ref.html' ] , [ 'bug1123067-3.html' , 'bug1123067-ref.html' ] , [ 'bug1132768-1.html' , 'bug1132768-1-ref.html'] , - function() {SpecialPowers.pushPrefEnv({'clear': [['layout.accessiblecaret.enabled']]}, nextTest);} , + function() {SpecialPowers.pushPrefEnv({'clear': [['touchcaret.enabled'], + ['selectioncaret.enabled'], + ['layout.accessiblecaret.enabled']]}, nextTest);} , ]; if (navigator.appVersion.indexOf("Android") == -1 && SpecialPowers.Services.appinfo.name != "B2G") { + tests.push(function() {SpecialPowers.pushPrefEnv({'set': [['touchcaret.enabled', false]]}, nextTest);}); tests.push([ 'bug512295-1.html' , 'bug512295-1-ref.html' ]); tests.push([ 'bug512295-2.html' , 'bug512295-2-ref.html' ]); tests.push([ 'bug923376.html' , 'bug923376-ref.html' ]); + tests.push(function() {SpecialPowers.pushPrefEnv({'clear': [['touchcaret.enabled']]}, nextTest);}); tests.push(function() {SpecialPowers.pushPrefEnv({'set': [['layout.css.overflow-clip-box.enabled', true]]}, nextTest);}); tests.push([ 'bug966992-1.html' , 'bug966992-1-ref.html' ]); tests.push([ 'bug966992-2.html' , 'bug966992-2-ref.html' ]); @@ -175,6 +181,7 @@ if (navigator.appVersion.indexOf("Android") == -1 && if (navigator.platform.indexOf("Linux") >= 0 && SpecialPowers.Services.appinfo.name != "B2G") { tests = tests.concat([ + function() {SpecialPowers.pushPrefEnv({'set': [['touchcaret.enabled', false]]}, nextTest);} , // eDirPrevious, Shift+click [ 'multi-range-user-select.html#prev1S_' , 'multi-range-user-select-ref.html#prev1S_' ] , [ 'multi-range-user-select.html#prev2S_' , 'multi-range-user-select-ref.html#prev2S_' ] , @@ -267,6 +274,7 @@ if (navigator.platform.indexOf("Linux") >= 0 && // eDirNext, VK_RIGHT / LEFT [ 'multi-range-script-select.html#next1SR' , 'multi-range-script-select-ref.html#next1SR' ] , [ 'multi-range-script-select.html#next1SL' , 'multi-range-script-select-ref.html#next1SL' ] , + function() {SpecialPowers.pushPrefEnv({'clear': [['touchcaret.enabled']]}, nextTest);} , ]); } diff --git a/layout/base/tests/test_touchcaret_visibility.html b/layout/base/tests/test_touchcaret_visibility.html new file mode 100644 index 000000000000..e363d38f12e9 --- /dev/null +++ b/layout/base/tests/test_touchcaret_visibility.html @@ -0,0 +1,97 @@ + + + + + + Test for Bug 1070851 + + + + + + + + + + + Mozilla Bug 1059165 + + +
+ +