merge m-c to fx-team
authorTim Taubert <ttaubert@mozilla.com>
Tue, 30 Apr 2013 10:39:24 +0200
changeset 141180 6a3e2fb5b0f289495688d8dbd2d3fdb965046361
parent 141177 1eb382609c2d685779896f3168ef579907531abe (current diff)
parent 141179 2e489dff994535a79ad1ce046c33688334f2bd07 (diff)
child 141188 60e522be9d0842fbb58017c6ba2ee04bbe4ebe70
child 141358 f76c76faf47496accda7cc5972f23f2b417d4a61
push id2579
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 18:52:47 +0000
treeherdermozilla-beta@b69b7de8a05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone23.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
merge m-c to fx-team
--- a/.gitignore
+++ b/.gitignore
@@ -46,8 +46,12 @@ parser/html/java/javaparser/
 .project
 .cproject
 .settings/
 
 # Python virtualenv artifacts.
 python/psutil/*.so
 python/psutil/*.pyd
 python/psutil/build/
+
+# Ignore chrome.manifest files from the devtools loader
+browser/devtools/chrome.manifest
+toolkit/devtools/chrome.manifest
--- a/.hgignore
+++ b/.hgignore
@@ -49,8 +49,12 @@
 
 # Python stuff installed at build time.
 ^python/psutil/.*\.so
 ^python/psutil/.*\.pyd
 ^python/psutil/build/
 
 # Git repositories
 .git/
+
+# Ignore chrome.manifest files from the devtools loader
+^browser/devtools/chrome.manifest$
+^toolkit/devtools/chrome.manifest$
--- a/browser/devtools/inspector/inspector-panel.js
+++ b/browser/devtools/inspector/inspector-panel.js
@@ -179,28 +179,34 @@ InspectorPanel.prototype = {
   markDirty: function InspectorPanel_markDirty() {
     this.isDirty = true;
   },
 
   /**
    * Hooks the searchbar to show result and auto completion suggestions.
    */
   setupSearchBox: function InspectorPanel_setupSearchBox() {
+    let searchDoc;
+    if (this.target.isLocalTab) {
+      searchDoc = this.browser.contentDocument;
+    } else if (this.target.window) {
+      searchDoc = this.target.window.document;
+    } else {
+      return;
+    }
     // Initiate the selectors search object.
     let setNodeFunction = function(node) {
       this.selection.setNode(node, "selectorsearch");
     }.bind(this);
     if (this.searchSuggestions) {
       this.searchSuggestions.destroy();
       this.searchSuggestions = null;
     }
     this.searchBox = this.panelDoc.getElementById("inspector-searchbox");
-    this.searchSuggestions = new SelectorSearch(this.browser.contentDocument,
-                                                this.searchBox,
-                                                setNodeFunction);
+    this.searchSuggestions = new SelectorSearch(searchDoc, this.searchBox, setNodeFunction);
   },
 
   /**
    * Build the sidebar.
    */
   setupSidebar: function InspectorPanel_setupSidebar() {
     let tabbox = this.panelDoc.querySelector("#inspector-sidebar");
     this.sidebar = new ToolSidebar(tabbox, this);