Merge "DevTools: Do not scroll the console to show the prompt when we select the console tab." to M…

third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js

 /*
  * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 328 matching lines @@
     {
         this._viewport.refresh();
         if (!this._prompt.isCaretInsidePrompt())
             this._prompt.moveCaretToEndOfPrompt();
     },
 
     focus: function()
     {
         if (this._promptElement === WebInspector.currentFocusElement())
             return;
+        // Set caret position before setting focus in order to avoid scrolling
+        // by focus().
+        this._prompt.moveCaretToEndOfPrompt();
         WebInspector.setCurrentFocusElement(this._promptElement);
-        this._prompt.moveCaretToEndOfPrompt();
     },
 
     restoreScrollPositions: function()
     {
         if (this._viewport.scrolledToBottom())
             this._immediatelyScrollToBottom();
         else
             WebInspector.Widget.prototype.restoreScrollPositions.call(this);
     },
 
@@ skipping 959 matching lines @@
             return true;
         }
         return false;
     }
 }
 
 /**
 * @typedef {{messageIndex: number, matchIndex: number}}
 */
 WebInspector.ConsoleView.RegexMatchRange;