DevTools: Merge highlightPosition and revealLine methods on SourceFrame.

Source/devtools/front_end/SourceFrame.js

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 107 matching lines @@
      */
     _isEditorShowing: function()
     {
         return this.isShowing() && this._editorAttached;
     },
 
     willHide: function()
     {
         WebInspector.View.prototype.willHide.call(this);
 
-        this._clearPositionHighlight();
-        this._clearLineToReveal();
+        this._clearPositionToReveal();
     },
 
     /**
      * @return {?Element}
      */
     statusBarText: function()
     {
         return this._sourcePosition.element;
     },
 
@@ skipping 66 matching lines @@
     canHighlightPosition: function()
     {
         return true;
     },
 
     /**
      * @override
      */
     highlightPosition: function(line, column)
     {
-        this._clearLineToReveal();
+        this.revealPosition(line, column, true);
+    },
+
+    /**
+     * @param {number} line
+     * @param {number=} column
+     * @param {boolean=} shouldHighlight
+     */
+    revealPosition: function(line, column, shouldHighlight)
+    {
         this._clearLineToScrollTo();
         this._clearSelectionToSet();
-        this._positionToHighlight = { line: line, column: column };
-        this._innerHighlightPositionIfNeeded();
+        this._positionToReveal = { line: line, column: column, shouldHighlight: shouldHighlight };
+        this._innerRevealPositionIfNeeded();
     },
 
-    _innerHighlightPositionIfNeeded: function()
+    _innerRevealPositionIfNeeded: function()
     {
-        if (!this._positionToHighlight)
+        if (!this._positionToReveal)
             return;
 
         if (!this.loaded || !this._isEditorShowing())
             return;
 
-        this._textEditor.highlightPosition(this._positionToHighlight.line, this._positionToHighlight.column);
-        delete this._positionToHighlight;
+        this._textEditor.revealPosition(this._positionToReveal.line, this._positionToReveal.column, this._positionToReveal.shouldHighlight);
+        delete this._positionToReveal;
     },
 
-    _clearPositionHighlight: function()
+    _clearPositionToReveal: function()
     {
         this._textEditor.clearPositionHighlight();
-        delete this._positionToHighlight;
+        delete this._positionToReveal;
     },
 
     /**
-     * @param {number} line
-     */
-    revealLine: function(line)
-    {
-        this._clearPositionHighlight();
-        this._clearLineToScrollTo();
-        this._clearSelectionToSet();
-        this._lineToReveal = line;
-        this._innerRevealLineIfNeeded();
-    },
-
-    _innerRevealLineIfNeeded: function()
-    {
-        if (typeof this._lineToReveal === "number") {
-            if (this.loaded && this._isEditorShowing()) {
-                this._textEditor.revealLine(this._lineToReveal);
-                delete this._lineToReveal;
-            }
-        }
-    },
-
-    _clearLineToReveal: function()
-    {
-        delete this._lineToReveal;
-    },
-
-    /**
      * @param {number} line
      */
     scrollToLine: function(line)
     {
-        this._clearPositionHighlight();
-        this._clearLineToReveal();
+        this._clearPositionToReveal();
         this._lineToScrollTo = line;
         this._innerScrollToLineIfNeeded();
     },
 
     _innerScrollToLineIfNeeded: function()
     {
         if (typeof this._lineToScrollTo === "number") {
             if (this.loaded && this._isEditorShowing()) {
                 this._textEditor.scrollToLine(this._lineToScrollTo);
                 delete this._lineToScrollTo;
@@ skipping 31 matching lines @@
         }
     },
 
     _clearSelectionToSet: function()
     {
         delete this._selectionToSet;
     },
 
     _wasShownOrLoaded: function()
     {
-        this._innerHighlightPositionIfNeeded();
-        this._innerRevealLineIfNeeded();
+        this._innerRevealPositionIfNeeded();
         this._innerSetSelectionIfNeeded();
         this._innerScrollToLineIfNeeded();
     },
 
     onTextChanged: function(oldRange, newRange)
     {
         if (this._searchResultsChangedCallback && !this._isReplacing)
             this._searchResultsChangedCallback();
         this.clearMessages();
     },
@@ skipping 538 matching lines @@
 
     /**
      * @param {?WebInspector.TextRange} from
      * @param {?WebInspector.TextRange} to
      */
     onJumpToPosition: function(from, to)
     {
         this._sourceFrame.onJumpToPosition(from, to);
     }
 }