From 893b1db25196741d9014b6de6d2aeed6e91c2247 Mon Sep 17 00:00:00 2001
From: Alexandre Poirot <poirot.alex@gmail.com>
Date: Sat, 22 Mar 2014 09:02:14 +0100
Subject: [PATCH] Bug 977043 - Prevent markupview from breaking selection.
 r=jwalker

---
 browser/devtools/markupview/markup-view.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/browser/devtools/markupview/markup-view.js b/browser/devtools/markupview/markup-view.js
index 05995e142b86..051d9e976542 100644
--- a/browser/devtools/markupview/markup-view.js
+++ b/browser/devtools/markupview/markup-view.js
@@ -299,6 +299,9 @@ MarkupView.prototype = {
           this.markNodeAsSelected(selection.nodeFront);
         }
         done();
+      }, (e) => {
+        console.error(e);
+        done();
       });
     } else {
       this.unmarkSelectedNode();
@@ -863,8 +866,10 @@ MarkupView.prototype = {
       let parent = node.parentNode();
       if (!container.elt.parentNode) {
         let parentContainer = this._containers.get(parent);
-        parentContainer.childrenDirty = true;
-        this._updateChildren(parentContainer, {expand: node});
+        if (parentContainer) {
+          parentContainer.childrenDirty = true;
+          this._updateChildren(parentContainer, {expand: node});
+        }
       }
 
       node = parent;