DevTools: Merge highlightPosition and revealLine methods on SourceFrame.

Source/devtools/front_end/CodeMirrorTextEditor.js

 /*
  * Copyright (C) 2012 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 321 matching lines @@
      * @param {?WebInspector.TextRange} range
      */
     highlightSearchResults: function(regex, range)
     {
         /**
          * @this {WebInspector.CodeMirrorTextEditor}
          */
         function innerHighlightRegex()
         {
             if (range) {
-                this.revealLine(range.startLine);
+                this._revealLine(range.startLine);
                 if (range.endColumn > WebInspector.CodeMirrorTextEditor.maxHighlightLength)
                     this.setSelection(range);
                 else
                     this.setSelection(WebInspector.TextRange.createFromLocation(range.startLine, range.startColumn));
             } else {
                 // Collapse selection to end on search start so that we jump to next occurence on the first enter press.
                 this.setSelection(this.selection().collapseToEnd());
             }
             this._tokenHighlighter.highlightSearchResults(regex, range);
         }
@@ skipping 325 matching lines @@
 
     endUpdates: function()
     {
         if (!--this._nestedUpdatesCounter)
             this._codeMirror.refresh();
     },
 
     /**
      * @param {number} lineNumber
      */
-    revealLine: function(lineNumber)
+    _revealLine: function(lineNumber)
     {
         this._innerRevealLine(lineNumber, this._codeMirror.getScrollInfo());
     },
 
     /**
      * @param {number} lineNumber
      * @param {!{left: number, top: number, width: number, height: number, clientWidth: number, clientHeight: number}} scrollInfo
      */
     _innerRevealLine: function(lineNumber, scrollInfo)
     {
@@ skipping 88 matching lines @@
     removeDecoration: function(lineNumber, element)
     {
         var widget = this._elementToWidget.remove(element);
         if (widget)
             this._codeMirror.removeLineWidget(widget);
     },
 
     /**
      * @param {number} lineNumber
      * @param {number=} columnNumber
+     * @param {boolean=} shouldHighlight
      */
-    highlightPosition: function(lineNumber, columnNumber)
+    revealPosition: function(lineNumber, columnNumber, shouldHighlight)
     {
         lineNumber = Number.constrain(lineNumber, 0, this._codeMirror.lineCount() - 1);
         if (typeof columnNumber !== "number")
             columnNumber = 0;
         columnNumber = Number.constrain(columnNumber, 0, this._codeMirror.getLine(lineNumber).length);
 
         this.clearPositionHighlight();
         this._highlightedLine = this._codeMirror.getLineHandle(lineNumber);
         if (!this._highlightedLine)
           return;
-        this.revealLine(lineNumber);
-        this._codeMirror.addLineClass(this._highlightedLine, null, "cm-highlight");
-        this._clearHighlightTimeout = setTimeout(this.clearPositionHighlight.bind(this), 2000);
+        this._revealLine(lineNumber);
+        if (shouldHighlight) {
+            this._codeMirror.addLineClass(this._highlightedLine, null, "cm-highlight");
+            this._clearHighlightTimeout = setTimeout(this.clearPositionHighlight.bind(this), 2000);
+        }
         this.setSelection(WebInspector.TextRange.createFromLocation(lineNumber, columnNumber));
     },
 
     clearPositionHighlight: function()
     {
         if (this._clearHighlightTimeout)
             clearTimeout(this._clearHighlightTimeout);
         delete this._clearHighlightTimeout;
 
          if (this._highlightedLine)
@@ skipping 894 matching lines @@
     var backgroundColorRule = backgroundColor ? ".CodeMirror .CodeMirror-selected { background-color: " + backgroundColor + ";}" : "";
     var foregroundColor = InspectorFrontendHost.getSelectionForegroundColor();
     var foregroundColorRule = foregroundColor ? ".CodeMirror .CodeMirror-selectedtext:not(.CodeMirror-persist-highlight) { color: " + foregroundColor + "!important;}" : "";
     if (!foregroundColorRule && !backgroundColorRule)
         return;
 
     var style = document.createElement("style");
     style.textContent = backgroundColorRule + foregroundColorRule;
     document.head.appendChild(style);
 })();