From 010788e170ca444b6a2fbacd5b46607f0a8d05ca Mon Sep 17 00:00:00 2001
From: Michael Ratcliffe <mratcliffe@mozilla.com>
Date: Mon, 14 Apr 2014 15:33:06 +0100
Subject: [PATCH] Bug 988102 - Opening inspector scrolls the content page all
 the way to the top;r=bgrins

---
 browser/devtools/markupview/markup-view.js    | 4 +---
 toolkit/devtools/server/actors/highlighter.js | 5 -----
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/browser/devtools/markupview/markup-view.js b/browser/devtools/markupview/markup-view.js
index 051d9e976542..58543ffc3999 100644
--- a/browser/devtools/markupview/markup-view.js
+++ b/browser/devtools/markupview/markup-view.js
@@ -289,9 +289,7 @@ MarkupView.prototype = {
     let done = this._inspector.updating("markup-view");
     if (selection.isNode()) {
       if (this._shouldNewSelectionBeHighlighted()) {
-        this._brieflyShowBoxModel(selection.nodeFront, {
-          scrollIntoView: true
-        });
+        this._brieflyShowBoxModel(selection.nodeFront, {});
       }
 
       this.showNode(selection.nodeFront, true).then(() => {
diff --git a/toolkit/devtools/server/actors/highlighter.js b/toolkit/devtools/server/actors/highlighter.js
index 9a3ca26e0001..2719ba8a0a2d 100644
--- a/toolkit/devtools/server/actors/highlighter.js
+++ b/toolkit/devtools/server/actors/highlighter.js
@@ -107,7 +107,6 @@ let HighlighterActor = protocol.ActorClass({
   }, {
     request: {
       node: Arg(0, "domnode"),
-      scrollIntoView: Option(1),
       region: Option(1)
     }
   }),
@@ -475,10 +474,6 @@ BoxModelHighlighter.prototype = {
     this._attachPageListeners();
     this._update();
     this._trackMutations();
-
-    if (options.scrollIntoView) {
-      this.chromeLayoutHelper.scrollIntoViewIfNeeded(node);
-    }
   },
 
   _trackMutations: function() {