Refactorings to reduce dependencies in ChromeVox 2.

chrome/browser/resources/chromeos/chromevox/braille/expanding_braille_translator.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview Translates text to braille, optionally with some parts
  * uncontracted.
  */
 
 goog.provide('cvox.ExpandingBrailleTranslator');
 
-goog.require('cvox.BrailleUtil');
 goog.require('cvox.LibLouis');
 goog.require('cvox.Spannable');
+goog.require('cvox.ValueSelectionSpan');
+goog.require('cvox.ValueSpan');
 
 
 /**
  * A wrapper around one or two braille translators that uses contracted
  * braille or not based on the selection start- and end-points (if any) in the
  * translated text.  If only one translator is provided, then that translator
  * is used for all text regardless of selection.  If two translators
  * are provided, then the uncontracted translator is used for some text
  * around the selection end-points and the contracted translator is used
  * for all other text.  When determining what text to use uncontracted
@@ skipping 16 matching lines @@
   /**
    * @type {cvox.LibLouis.Translator}
    * @private
    */
   this.uncontractedTranslator_ = opt_uncontractedTranslator || null;
 };
 
 
 /**
  * What expansion to apply to the part of the translated string marked by the
- * {@code cvox.BrailleUtil.ValueSpan} spannable.
+ * {@code cvox.ValueSpan} spannable.
  * @enum {number}
  */
 cvox.ExpandingBrailleTranslator.ExpansionType = {
   /**
    * Use the default translator all of the value, regardless of any selection.
    * This is typically used when the user is in the middle of typing and the
    * typing started outside of a word.
    */
   NONE: 0,
   /**
@@ skipping 131 matching lines @@
  *     Indicates how the text marked up as the value is expanded.
  * @return {!Array.<cvox.ExpandingBrailleTranslator.Range_>} The calculated
  *     ranges.
  * @private
  */
 cvox.ExpandingBrailleTranslator.prototype.findExpandRanges_ = function(
     text, expansionType) {
   var result = [];
   if (this.uncontractedTranslator_ &&
       expansionType != cvox.ExpandingBrailleTranslator.ExpansionType.NONE) {
-    var value = text.getSpanInstanceOf(cvox.BrailleUtil.ValueSpan);
+    var value = text.getSpanInstanceOf(cvox.ValueSpan);
     if (value) {
       // The below type casts are valid because the ranges must be valid when
       // the span is known to exist.
       var valueStart = /** @type {number} */ (text.getSpanStart(value));
       var valueEnd = /** @type {number} */ (text.getSpanEnd(value));
       switch (expansionType) {
         case cvox.ExpandingBrailleTranslator.ExpansionType.SELECTION:
           this.addRangesForSelection_(text, valueStart, valueEnd, result);
           break;
         case cvox.ExpandingBrailleTranslator.ExpansionType.ALL:
@@ skipping 13 matching lines @@
  * @param {cvox.Spannable} text Text to find ranges in.
  * @param {number} valueStart Start of the value in {@code text}.
  * @param {number} valueEnd End of the value in {@code text}.
  * @param {Array.<cvox.ExpandingBrailleTranslator.Range_>} outRanges
  *     Destination for the expansion ranges.  Untouched if no ranges
  *     are found.  Note that ranges may be coalesced.
  * @private
  */
 cvox.ExpandingBrailleTranslator.prototype.addRangesForSelection_ = function(
     text, valueStart, valueEnd, outRanges) {
-  var selection = text.getSpanInstanceOf(
-      cvox.BrailleUtil.ValueSelectionSpan);
+  var selection = text.getSpanInstanceOf(cvox.ValueSelectionSpan);
   if (!selection) {
     return;
   }
   var selectionStart = text.getSpanStart(selection);
   var selectionEnd = text.getSpanEnd(selection);
   if (selectionStart < valueStart || selectionEnd > valueEnd) {
     return;
   }
   var expandPositions = [];
   if (selectionStart == valueEnd) {
@@ skipping 54 matching lines @@
   };
 };
 
 
 /**
  * A character range with inclusive start and exclusive end positions.
  * @typedef {{start: number, end: number}}
  * @private
  */
 cvox.ExpandingBrailleTranslator.Range_;