Bug 1446809 - Remove some b2g leftover in accessible/ r=surkov

MozReview-Commit-ID: KXg0kOCHbwQ

--HG--
extra : rebase_source : 546208b106970d36692cf8f3c7edcc08ff2fa649
extra : histedit_source : a97d2ab4fb4b6a4b47fb856cb9edd1edb970c59b

accessible/jsat/Presentation.jsm

@@ -471,169 +471,6 @@ AndroidPresenter.prototype.noMove =
     };
   };
 
-/**
- * A B2G presenter for Gaia.
- */
-function B2GPresenter() {}
-
-B2GPresenter.prototype = Object.create(Presenter.prototype);
-
-B2GPresenter.prototype.type = "B2G";
-
-B2GPresenter.prototype.keyboardEchoSetting =
-  new PrefCache("accessibility.accessfu.keyboard_echo");
-B2GPresenter.prototype.NO_ECHO = 0;
-B2GPresenter.prototype.CHARACTER_ECHO = 1;
-B2GPresenter.prototype.WORD_ECHO = 2;
-B2GPresenter.prototype.CHARACTER_AND_WORD_ECHO = 3;
-
-/**
- * A pattern used for haptic feedback.
- * @type {Array}
- */
-B2GPresenter.prototype.PIVOT_CHANGE_HAPTIC_PATTERN = [40];
-
-/**
- * Pivot move reasons.
- * @type {Array}
- */
-B2GPresenter.prototype.pivotChangedReasons = ["none", "next", "prev", "first",
-                                              "last", "text", "point"];
-
-B2GPresenter.prototype.pivotChanged =
-  function B2GPresenter_pivotChanged(aContext, aReason, aIsUserInput) {
-    if (!aContext.accessible) {
-      return null;
-    }
-
-    return {
-      type: this.type,
-      details: {
-        eventType: "vc-change",
-        data: UtteranceGenerator.genForContext(aContext),
-        options: {
-          pattern: this.PIVOT_CHANGE_HAPTIC_PATTERN,
-          isKey: Utils.isActivatableOnFingerUp(aContext.accessible),
-          reason: this.pivotChangedReasons[aReason],
-          isUserInput: aIsUserInput,
-          hints: aContext.interactionHints
-        }
-      }
-    };
-  };
-
-B2GPresenter.prototype.nameChanged =
-  function B2GPresenter_nameChanged(aAccessible, aIsPolite = true) {
-    return {
-      type: this.type,
-      details: {
-        eventType: "name-change",
-        data: aAccessible.name,
-        options: {enqueue: aIsPolite}
-      }
-    };
-  };
-
-B2GPresenter.prototype.valueChanged =
-  function B2GPresenter_valueChanged(aAccessible, aIsPolite = true) {
-
-    // the editable value changes are handled in the text changed presenter
-    if (Utils.getState(aAccessible).contains(States.EDITABLE)) {
-      return null;
-    }
-
-    return {
-      type: this.type,
-      details: {
-        eventType: "value-change",
-        data: aAccessible.value,
-        options: {enqueue: aIsPolite}
-      }
-    };
-  };
-
-B2GPresenter.prototype.textChanged = function B2GPresenter_textChanged(
-  aAccessible, aIsInserted, aStart, aLength, aText, aModifiedText) {
-    let echoSetting = this.keyboardEchoSetting.value;
-    let text = "";
-
-    if (echoSetting == this.CHARACTER_ECHO ||
-        echoSetting == this.CHARACTER_AND_WORD_ECHO) {
-      text = aModifiedText;
-    }
-
-    // add word if word boundary is added
-    if ((echoSetting == this.WORD_ECHO ||
-        echoSetting == this.CHARACTER_AND_WORD_ECHO) &&
-        aIsInserted && aLength === 1) {
-      let accText = aAccessible.QueryInterface(Ci.nsIAccessibleText);
-      let startBefore = {}, endBefore = {};
-      let startAfter = {}, endAfter = {};
-      accText.getTextBeforeOffset(aStart,
-        Ci.nsIAccessibleText.BOUNDARY_WORD_END, startBefore, endBefore);
-      let maybeWord = accText.getTextBeforeOffset(aStart + 1,
-        Ci.nsIAccessibleText.BOUNDARY_WORD_END, startAfter, endAfter);
-      if (endBefore.value !== endAfter.value) {
-        text += maybeWord;
-      }
-    }
-
-    return {
-      type: this.type,
-      details: {
-        eventType: "text-change",
-        data: text
-      }
-    };
-
-  };
-
-B2GPresenter.prototype.actionInvoked =
-  function B2GPresenter_actionInvoked(aObject, aActionName) {
-    return {
-      type: this.type,
-      details: {
-        eventType: "action",
-        data: UtteranceGenerator.genForAction(aObject, aActionName)
-      }
-    };
-  };
-
-B2GPresenter.prototype.liveRegion = function B2GPresenter_liveRegion(aContext,
-  aIsPolite, aIsHide, aModifiedText) {
-    return {
-      type: this.type,
-      details: {
-        eventType: "liveregion-change",
-        data: UtteranceGenerator.genForLiveRegion(aContext, aIsHide,
-          aModifiedText),
-        options: {enqueue: aIsPolite}
-      }
-    };
-  };
-
-B2GPresenter.prototype.announce =
-  function B2GPresenter_announce(aAnnouncement) {
-    return {
-      type: this.type,
-      details: {
-        eventType: "announcement",
-        data: aAnnouncement
-      }
-    };
-  };
-
-B2GPresenter.prototype.noMove =
-  function B2GPresenter_noMove(aMoveMethod) {
-    return {
-      type: this.type,
-      details: {
-        eventType: "no-move",
-        data: aMoveMethod
-      }
-    };
-  };
-
 /**
  * A braille presenter
  */
@@ -676,8 +513,7 @@ var Presentation = { // jshint ignore:line
     delete this.presenters;
     let presenterMap = {
       "mobile/android": [VisualPresenter, AndroidPresenter],
-      "b2g": [VisualPresenter, B2GPresenter],
-      "browser": [VisualPresenter, B2GPresenter, AndroidPresenter]
+      "browser": [VisualPresenter, AndroidPresenter]
     };
     this.presenters = presenterMap[Utils.MozBuildApp].map(P => new P());
     return this.presenters;

accessible/jsat/Utils.jsm

@@ -26,8 +26,6 @@ var EXPORTED_SYMBOLS = ["Utils", "Logger", "PivotContext", "PrefCache"]; // jshi
 
 var Utils = { // jshint ignore:line
   _buildAppMap: {
-    "{3c2e2abc-06d4-11e1-ac3b-374f68613e61}": "b2g",
-    "{d1bfe7d9-c01e-4237-998b-7b5f960a4314}": "graphene",
     "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}": "browser",
     "{aa3c5121-dab2-40e2-81ca-7ea25febc110}": "mobile/android",
     "{a23983c0-fd0e-11dc-95ff-0800200c9a66}": "mobile/xul"
@@ -133,8 +131,6 @@ var Utils = { // jshint ignore:line
         return this.win.BrowserApp;
       case "browser":
         return this.win.gBrowser;
-      case "b2g":
-        return this.win.shell;
       default:
         return null;
     }
@@ -144,9 +140,6 @@ var Utils = { // jshint ignore:line
     if (!this.BrowserApp) {
       return null;
     }
-    if (this.MozBuildApp == "b2g") {
-      return this.BrowserApp.contentBrowser;
-    }
     return this.BrowserApp.selectedBrowser;
   },
 
@@ -175,13 +168,6 @@ var Utils = { // jshint ignore:line
     let document = this.CurrentContentDoc;
 
     if (document) {
-      if (document.location.host === "b2g") {
-        // The document is a b2g app chrome (ie. Mulet).
-        let contentBrowser = this.win.content.shell.contentBrowser;
-        messageManagers.add(this.getMessageManager(contentBrowser));
-        document = contentBrowser.contentDocument;
-      }
-
       let remoteframes = document.querySelectorAll("iframe");
 
       for (let i = 0; i < remoteframes.length; ++i) {

accessible/tests/mochitest/hittest/a11y.ini

@@ -5,7 +5,7 @@ support-files = zoom_tree.xul
 
 [test_browser.html]
 [test_canvas_hitregion.html]
-skip-if = (os == "android" || appname == "b2g")
+skip-if = (os == "android")
 [test_general.html]
 [test_menu.xul]
 [test_shadowroot.html]

accessible/tests/mochitest/jsat/jsatcommon.js

@@ -534,11 +534,8 @@ ExpectedMessage.prototype.ignore = function(aMessage) {
   return aMessage.name !== this.name;
 };
 
-function ExpectedPresent(aB2g, aAndroid, aOptions) {
+function ExpectedPresent(aAndroid, aOptions) {
   ExpectedMessage.call(this, "AccessFu:Present", aOptions);
-  if (aB2g) {
-    this.json.b2g = aB2g;
-  }
 
   if (aAndroid) {
     this.json.android = aAndroid;
@@ -550,7 +547,7 @@ ExpectedPresent.prototype = Object.create(ExpectedMessage.prototype);
 ExpectedPresent.prototype.is = function(aReceived, aInfo) {
   var received = this.extract_presenters(aReceived);
 
-  for (var presenter of ["b2g", "android"]) {
+  for (var presenter of ["android"]) {
     if (!this.options["no_" + presenter]) {
       var todo = this.options.todo || this.options[presenter + "_todo"];
       SimpleTest[todo ? "todo" : "ok"].apply(
@@ -605,8 +602,6 @@ function ExpectedCursorTextChange(aSpeech, aStartOffset, aEndOffset, aOptions) {
     toIndex: aEndOffset
   }], aOptions);
 
-  // bug 980509
-  this.options.b2g_todo = true;
 }
 
 ExpectedCursorTextChange.prototype =

accessible/tests/mochitest/jsat/test_content_integration.html

@@ -110,7 +110,7 @@
           // Move from an inner frame to the last element in the parent doc
           [ContentMessages.simpleMoveLast,
             new ExpectedCursorChange(
-              ["slider", "0", {"string": "slider"}], { b2g_todo: true })],
+              ["slider", "0", {"string": "slider"}])],
 
           [ContentMessages.clearCursor, "AccessFu:CursorCleared"],
 
@@ -153,7 +153,7 @@
              {"string": "checkbutton"}, {"string": "listStart"},
              {"string": "list"}, {"string": "listItemsCount", "count": 1}])],
           [ContentMessages.simpleMoveFirst,
-            new ExpectedCursorChange(["Phone status bar"], { b2g_todo: true })],
+            new ExpectedCursorChange(["Phone status bar"])],
 
           // Reset cursors
           [ContentMessages.clearCursor, "AccessFu:CursorCleared"],