From f40c4d3ca90e600eab4366ea76712976d43205b4 Mon Sep 17 00:00:00 2001
From: Ting-Yu Lin <tlin@mozilla.com>
Date: Mon, 27 Jul 2015 11:56:04 +0800
Subject: [PATCH] Bug 1172382 - Disable AccessibleCaret on some tests. r=roc

All the tests disabled for AccessibleCaret had already being disabled
for either TouchCaret or SelectionCarets.
---
 dom/events/test/test_clickevent_on_input.html   |  3 ++-
 editor/reftests/reftest.list                    |  4 ++--
 layout/base/tests/test_bug558663.html           |  3 ++-
 layout/base/tests/test_reftests_with_caret.html | 10 ++++++----
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/dom/events/test/test_clickevent_on_input.html b/dom/events/test/test_clickevent_on_input.html
index 86737329f93..a426f8b1df2 100644
--- a/dom/events/test/test_clickevent_on_input.html
+++ b/dom/events/test/test_clickevent_on_input.html
@@ -52,7 +52,8 @@ function isEnabledMiddleClickPaste()
 function isEnabledTouchCaret()
 {
   try {
-    return SpecialPowers.getBoolPref("touchcaret.enabled");
+    return SpecialPowers.getBoolPref("touchcaret.enabled") ||
+           SpecialPowers.getBoolPref("layout.accessiblecaret.enabled");
   } catch (e) {
     return false;
   }
diff --git a/editor/reftests/reftest.list b/editor/reftests/reftest.list
index 5b11dcd387a..0e9c48140a5 100644
--- a/editor/reftests/reftest.list
+++ b/editor/reftests/reftest.list
@@ -104,11 +104,11 @@ 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(selectioncaret.enabled,false) == 824080-1.html 824080-1-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) == 824080-2.html 824080-2-ref.html
 needs-focus pref(selectioncaret.enabled,false) == 824080-3.html 824080-3-ref.html
 needs-focus != 824080-2.html 824080-3.html
-needs-focus pref(selectioncaret.enabled,false) == 824080-4.html 824080-4-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) == 824080-5.html 824080-5-ref.html
 needs-focus != 824080-4.html 824080-5.html
 needs-focus == 824080-6.html 824080-6-ref.html
diff --git a/layout/base/tests/test_bug558663.html b/layout/base/tests/test_bug558663.html
index 21543360f50..737d32d6284 100644
--- a/layout/base/tests/test_bug558663.html
+++ b/layout/base/tests/test_bug558663.html
@@ -28,7 +28,8 @@
   SimpleTest.waitForExplicitFinish();
   // 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": [['selectioncaret.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_reftests_with_caret.html b/layout/base/tests/test_reftests_with_caret.html
index 452cd77ca28..cc617ba2446 100644
--- a/layout/base/tests/test_reftests_with_caret.html
+++ b/layout/base/tests/test_reftests_with_caret.html
@@ -109,8 +109,9 @@ var tests = [
     // The following test cases are all involving with one sending
     // 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]]}, nextTest);} ,
-    function() {SpecialPowers.pushPrefEnv({'set': [['selectioncaret.enabled', false]]}, nextTest);} ,
+    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' ] ,
@@ -156,8 +157,9 @@ 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': [['touchcaret.enabled']]}, nextTest);} ,
-    function() {SpecialPowers.pushPrefEnv({'clear': [['selectioncaret.enabled']]}, nextTest);} ,
+    function() {SpecialPowers.pushPrefEnv({'clear': [['touchcaret.enabled'],
+                                                     ['selectioncaret.enabled'],
+                                                     ['layout.accessiblecaret.enabled']]}, nextTest);} ,
 ];
 
 if (navigator.appVersion.indexOf("Android") == -1 &&