Bug 1246487 - Remove TouchCaret/SelectionCarets from comments in ActionBarHandler.js. r=capella draft
authorTing-Yu Lin <tlin@mozilla.com>
Tue, 16 Feb 2016 16:55:27 +0800
changeset 331175 85f63c56ec4cb103a2b4159bd4236054af6f0e28
parent 331174 7e206067de462393197ab9ba53da7ba2ce5ae7c2
child 331176 4b59936b52a39783d01532aab69b0712e3f98083
push id10922
push usertlin@mozilla.com
push dateTue, 16 Feb 2016 09:54:54 +0000
reviewerscapella
bugs1246487
milestone47.0a1
Bug 1246487 - Remove TouchCaret/SelectionCarets from comments in ActionBarHandler.js. r=capella MozReview-Commit-ID: 6NesxVl60OF
mobile/android/chrome/content/ActionBarHandler.js
--- a/mobile/android/chrome/content/ActionBarHandler.js
+++ b/mobile/android/chrome/content/ActionBarHandler.js
@@ -6,17 +6,17 @@
 
 XPCOMUtils.defineLazyModuleGetter(this, "Snackbars", "resource://gre/modules/Snackbars.jsm");
 
 const PHONE_REGEX = /^\+?[0-9\s,-.\(\)*#pw]{1,30}$/; // Are we a phone #?
 
 
 /**
  * ActionBarHandler Object and methods. Interface between Gecko Text Selection code
- * (TouchCaret, SelectionCarets, etc) and the Mobile ActionBar UI.
+ * (AccessibleCaret, etc) and the Mobile ActionBar UI.
  */
 var ActionBarHandler = {
   // Error codes returned from _init().
   START_TOUCH_ERROR: {
     NO_CONTENT_WINDOW: "No valid content Window found.",
     NONE: "",
   },
 
@@ -115,17 +115,17 @@ var ActionBarHandler = {
           this._uninit();
         }
         break;
       }
     }
   },
 
   /**
-   * Called when Gecko TouchCaret or SelectionCarets become visible.
+   * Called when Gecko AccessibleCaret becomes visible.
    */
   _init: function() {
     let [element, win] = this._getSelectionTargets();
     if (!win) {
       return this.START_TOUCH_ERROR.NO_CONTENT_WINDOW;
     }
 
     // Hold the ActionBar ID provided by Gecko.
@@ -160,17 +160,17 @@ var ActionBarHandler = {
       return [element, win];
     }
 
     // Focused element can't contain text.
     return [null, win];
   },
 
   /**
-   * Called when Gecko TouchCaret or SelectionCarets become hidden,
+   * Called when Gecko AccessibleCaret becomes hidden,
    * ActionBar is closed by user "close" request, or as a result of object
    * methods such as SELECT_ALL, PASTE, etc.
    */
   _uninit: function(clearSelection = true) {
     // Bail if there's no active selection.
     if (!this._selectionID) {
       return;
     }
@@ -181,17 +181,17 @@ var ActionBarHandler = {
     });
 
     // Clear the selection ID to complete the uninit(), but leave our reference
     // to selectionTargets (_targetElement, _contentWindow) in case we need
     // a final clearSelection().
     this._selectionID = null;
 
     // Clear selection required if triggered by self, or TextSelection icon
-    // actions. If called by Gecko TouchCaret/SelectionCarets state change,
+    // actions. If called by Gecko CaretStateChangedEvent,
     // visibility state is already correct.
     if (clearSelection) {
       this._clearSelection();
     }
   },
 
   /**
    * Final UI cleanup when Actionbar is closed by icon click, or where