From 85055ecb5c15cf8780136a314ad0a7a43c808cc1 Mon Sep 17 00:00:00 2001
From: Mihai Sucan <mihai.sucan@gmail.com>
Date: Tue, 12 Apr 2011 21:18:37 +0300
Subject: [PATCH 01/20] Bug 632275 - Web Console: Error message when click on
 an object to create an inspect window; f=rcampbell r=dcamp,sdwilsh

---
 .../console/hudservice/PropertyPanel.jsm      | 42 ++++++++++++--
 .../hudservice/tests/browser/Makefile.in      |  2 +
 ...nsole_bug_632275_getters_document_width.js | 58 +++++++++++++++++++
 .../browser/test-bug-632275-getters.html      | 19 ++++++
 4 files changed, 115 insertions(+), 6 deletions(-)
 create mode 100644 toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632275_getters_document_width.js
 create mode 100644 toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html

diff --git a/toolkit/components/console/hudservice/PropertyPanel.jsm b/toolkit/components/console/hudservice/PropertyPanel.jsm
index 3ebad1877a18..9cff654e376d 100644
--- a/toolkit/components/console/hudservice/PropertyPanel.jsm
+++ b/toolkit/components/console/hudservice/PropertyPanel.jsm
@@ -134,6 +134,20 @@ function presentableValueFor(aObject)
   }
 }
 
+/**
+ * Tells if the given function is native or not.
+ *
+ * @param function aFunction
+ *        The function you want to check if it is native or not.
+ *
+ * @return boolean
+ *         True if the given function is native, false otherwise.
+ */
+function isNativeFunction(aFunction)
+{
+  return typeof aFunction == "function" && !("prototype" in aFunction);
+}
+
 /**
  * Get an array of property name value pairs for the tree.
  *
@@ -145,17 +159,33 @@ function presentableValueFor(aObject)
 function namesAndValuesOf(aObject)
 {
   let pairs = [];
-  let value, presentable;
+  let value, presentable, getter;
+
+  let isDOMDocument = aObject instanceof Ci.nsIDOMDocument;
 
   for (var propName in aObject) {
-    try {
-      value = aObject[propName];
-      presentable = presentableValueFor(value);
-    }
-    catch (ex) {
+    // See bug 632275: skip deprecated width and height properties.
+    if (isDOMDocument && (propName == "width" || propName == "height")) {
       continue;
     }
 
+    // Also skip non-native getters.
+    // TODO: implement a safer way to skip non-native getters. See bug 647235.
+    getter = aObject.__lookupGetter__(propName);
+    if (getter && !isNativeFunction(getter)) {
+      value = ""; // Value is never displayed.
+      presentable = {type: TYPE_OTHER, display: "Getter"};
+    }
+    else {
+      try {
+        value = aObject[propName];
+        presentable = presentableValueFor(value);
+      }
+      catch (ex) {
+        continue;
+      }
+    }
+
     let pair = {};
     pair.name = propName;
     pair.display = propName + ": " + presentable.display;
diff --git a/toolkit/components/console/hudservice/tests/browser/Makefile.in b/toolkit/components/console/hudservice/tests/browser/Makefile.in
index 87dd39e2d23a..b33842e3070e 100644
--- a/toolkit/components/console/hudservice/tests/browser/Makefile.in
+++ b/toolkit/components/console/hudservice/tests/browser/Makefile.in
@@ -131,6 +131,7 @@ _BROWSER_TEST_FILES = \
 	browser_webconsole_bug_632347_iterators_generators.js \
 	browser_webconsole_bug_642108_refForOutputNode.js \
 	browser_webconsole_bug_642108_pruneTest.js \
+	browser_webconsole_bug_632275_getters_document_width.js \
 	head.js \
 	$(NULL)
 
@@ -199,6 +200,7 @@ _BROWSER_TEST_PAGES = \
 	test-bug-630733-response-redirect-headers.sjs \
 	test-bug-621644-jsterm-dollar.html \
 	test-bug-632347-iterators-generators.html \
+	test-bug-632275-getters.html \
 	$(NULL)
 
 libs:: $(_BROWSER_TEST_FILES)
diff --git a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632275_getters_document_width.js b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632275_getters_document_width.js
new file mode 100644
index 000000000000..08b34e22ef7b
--- /dev/null
+++ b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632275_getters_document_width.js
@@ -0,0 +1,58 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html";
+
+function test() {
+  addTab(TEST_URI);
+  browser.addEventListener("load", tabLoaded, true);
+}
+
+function tabLoaded() {
+  browser.removeEventListener("load", tabLoaded, true);
+  openConsole();
+
+  let hudId = HUDService.getHudIdByWindow(content);
+  let HUD = HUDService.hudReferences[hudId];
+  let jsterm = HUD.jsterm;
+
+  let doc = content.wrappedJSObject.document;
+
+  let panel = jsterm.openPropertyPanel("Test1", doc);
+
+  let rows = panel.treeView._rows;
+  let find = function(regex) {
+    return rows.some(function(row) {
+      return regex.test(row.display);
+    });
+  };
+
+  ok(!find(/^(width|height):/), "no document.width/height");
+
+  panel.destroy();
+
+  let getterValue = doc.foobar._val;
+
+  panel = jsterm.openPropertyPanel("Test2", doc.foobar);
+  rows = panel.treeView._rows;
+
+  is(getterValue, doc.foobar._val, "getter did not execute");
+  is(getterValue+1, doc.foobar.val, "getter executed");
+  is(getterValue+1, doc.foobar._val, "getter executed (recheck)");
+
+  ok(find(/^val: Getter$/),
+     "getter is properly displayed");
+
+  ok(find(new RegExp("^_val: " + getterValue + "$")),
+     "getter _val is properly displayed");
+
+  panel.destroy();
+
+  executeSoon(function() {
+    let textContent = HUD.outputNode.textContent;
+    is(textContent.indexOf("document.body.client"), -1,
+       "no document.width/height warning displayed");
+
+    finishTest();
+  });
+}
diff --git a/toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html b/toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html
new file mode 100644
index 000000000000..fbe4c7bf678a
--- /dev/null
+++ b/toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>Web Console test for bug 632275 - getters</title>
+    <!-- Any copyright is dedicated to the Public Domain.
+         http://creativecommons.org/publicdomain/zero/1.0/ -->
+
+<script type="application/javascript;version=1.8">
+  document.foobar = {
+    _val: 5,
+    get val() { return ++this._val; }
+  };
+</script>
+
+  </head>
+  <body>
+    <p>Web Console test for bug 632275 - getters.</p>
+  </body>
+</html>

From 1efb09873157dc0017b66237b4aa1c5280cc70f7 Mon Sep 17 00:00:00 2001
From: Mihai Sucan <mihai.sucan@gmail.com>
Date: Tue, 12 Apr 2011 17:00:29 -0300
Subject: [PATCH 02/20] Bug 620832 - Web console attempts to remove its
 observers multiple times; f=ddahl,rcampbell r=sdwilsh,rcampbell

---
 toolkit/components/console/hudservice/HUDService.jsm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolkit/components/console/hudservice/HUDService.jsm b/toolkit/components/console/hudservice/HUDService.jsm
index 6537de01233e..15491379f7ee 100644
--- a/toolkit/components/console/hudservice/HUDService.jsm
+++ b/toolkit/components/console/hudservice/HUDService.jsm
@@ -3527,7 +3527,7 @@ let ConsoleAPIObserver = {
       HUDService.logConsoleAPIMessage(hudId, aMessage.level, aMessage.arguments);
     }
     else if (aTopic == "quit-application-granted") {
-      this.shutdown();
+      HUDService.shutdown();
     }
   },
 
@@ -5845,7 +5845,7 @@ HUDWindowObserver = {
   uninit: function HWO_uninit()
   {
     Services.obs.removeObserver(this, "content-document-global-created");
-    HUDService.shutdown();
+    Services.obs.removeObserver(this, "xpcom-shutdown");
     this.initialConsoleCreated = false;
   },
 

From 3f79db3c8cd904da455da09340a55fa0298d329d Mon Sep 17 00:00:00 2001
From: Rob Campbell <rcampbell@mozilla.com>
Date: Tue, 12 Apr 2011 20:54:14 -0300
Subject: [PATCH 03/20] backout bug 632275 and bug 620832, a=rcampbell,orange

---
 .../console/hudservice/HUDService.jsm         |  4 +-
 .../console/hudservice/PropertyPanel.jsm      | 42 ++------------
 .../hudservice/tests/browser/Makefile.in      |  2 -
 ...nsole_bug_632275_getters_document_width.js | 58 -------------------
 .../browser/test-bug-632275-getters.html      | 19 ------
 5 files changed, 8 insertions(+), 117 deletions(-)
 delete mode 100644 toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632275_getters_document_width.js
 delete mode 100644 toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html

diff --git a/toolkit/components/console/hudservice/HUDService.jsm b/toolkit/components/console/hudservice/HUDService.jsm
index 15491379f7ee..6537de01233e 100644
--- a/toolkit/components/console/hudservice/HUDService.jsm
+++ b/toolkit/components/console/hudservice/HUDService.jsm
@@ -3527,7 +3527,7 @@ let ConsoleAPIObserver = {
       HUDService.logConsoleAPIMessage(hudId, aMessage.level, aMessage.arguments);
     }
     else if (aTopic == "quit-application-granted") {
-      HUDService.shutdown();
+      this.shutdown();
     }
   },
 
@@ -5845,7 +5845,7 @@ HUDWindowObserver = {
   uninit: function HWO_uninit()
   {
     Services.obs.removeObserver(this, "content-document-global-created");
-    Services.obs.removeObserver(this, "xpcom-shutdown");
+    HUDService.shutdown();
     this.initialConsoleCreated = false;
   },
 
diff --git a/toolkit/components/console/hudservice/PropertyPanel.jsm b/toolkit/components/console/hudservice/PropertyPanel.jsm
index 9cff654e376d..3ebad1877a18 100644
--- a/toolkit/components/console/hudservice/PropertyPanel.jsm
+++ b/toolkit/components/console/hudservice/PropertyPanel.jsm
@@ -134,20 +134,6 @@ function presentableValueFor(aObject)
   }
 }
 
-/**
- * Tells if the given function is native or not.
- *
- * @param function aFunction
- *        The function you want to check if it is native or not.
- *
- * @return boolean
- *         True if the given function is native, false otherwise.
- */
-function isNativeFunction(aFunction)
-{
-  return typeof aFunction == "function" && !("prototype" in aFunction);
-}
-
 /**
  * Get an array of property name value pairs for the tree.
  *
@@ -159,33 +145,17 @@ function isNativeFunction(aFunction)
 function namesAndValuesOf(aObject)
 {
   let pairs = [];
-  let value, presentable, getter;
-
-  let isDOMDocument = aObject instanceof Ci.nsIDOMDocument;
+  let value, presentable;
 
   for (var propName in aObject) {
-    // See bug 632275: skip deprecated width and height properties.
-    if (isDOMDocument && (propName == "width" || propName == "height")) {
+    try {
+      value = aObject[propName];
+      presentable = presentableValueFor(value);
+    }
+    catch (ex) {
       continue;
     }
 
-    // Also skip non-native getters.
-    // TODO: implement a safer way to skip non-native getters. See bug 647235.
-    getter = aObject.__lookupGetter__(propName);
-    if (getter && !isNativeFunction(getter)) {
-      value = ""; // Value is never displayed.
-      presentable = {type: TYPE_OTHER, display: "Getter"};
-    }
-    else {
-      try {
-        value = aObject[propName];
-        presentable = presentableValueFor(value);
-      }
-      catch (ex) {
-        continue;
-      }
-    }
-
     let pair = {};
     pair.name = propName;
     pair.display = propName + ": " + presentable.display;
diff --git a/toolkit/components/console/hudservice/tests/browser/Makefile.in b/toolkit/components/console/hudservice/tests/browser/Makefile.in
index b33842e3070e..87dd39e2d23a 100644
--- a/toolkit/components/console/hudservice/tests/browser/Makefile.in
+++ b/toolkit/components/console/hudservice/tests/browser/Makefile.in
@@ -131,7 +131,6 @@ _BROWSER_TEST_FILES = \
 	browser_webconsole_bug_632347_iterators_generators.js \
 	browser_webconsole_bug_642108_refForOutputNode.js \
 	browser_webconsole_bug_642108_pruneTest.js \
-	browser_webconsole_bug_632275_getters_document_width.js \
 	head.js \
 	$(NULL)
 
@@ -200,7 +199,6 @@ _BROWSER_TEST_PAGES = \
 	test-bug-630733-response-redirect-headers.sjs \
 	test-bug-621644-jsterm-dollar.html \
 	test-bug-632347-iterators-generators.html \
-	test-bug-632275-getters.html \
 	$(NULL)
 
 libs:: $(_BROWSER_TEST_FILES)
diff --git a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632275_getters_document_width.js b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632275_getters_document_width.js
deleted file mode 100644
index 08b34e22ef7b..000000000000
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632275_getters_document_width.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html";
-
-function test() {
-  addTab(TEST_URI);
-  browser.addEventListener("load", tabLoaded, true);
-}
-
-function tabLoaded() {
-  browser.removeEventListener("load", tabLoaded, true);
-  openConsole();
-
-  let hudId = HUDService.getHudIdByWindow(content);
-  let HUD = HUDService.hudReferences[hudId];
-  let jsterm = HUD.jsterm;
-
-  let doc = content.wrappedJSObject.document;
-
-  let panel = jsterm.openPropertyPanel("Test1", doc);
-
-  let rows = panel.treeView._rows;
-  let find = function(regex) {
-    return rows.some(function(row) {
-      return regex.test(row.display);
-    });
-  };
-
-  ok(!find(/^(width|height):/), "no document.width/height");
-
-  panel.destroy();
-
-  let getterValue = doc.foobar._val;
-
-  panel = jsterm.openPropertyPanel("Test2", doc.foobar);
-  rows = panel.treeView._rows;
-
-  is(getterValue, doc.foobar._val, "getter did not execute");
-  is(getterValue+1, doc.foobar.val, "getter executed");
-  is(getterValue+1, doc.foobar._val, "getter executed (recheck)");
-
-  ok(find(/^val: Getter$/),
-     "getter is properly displayed");
-
-  ok(find(new RegExp("^_val: " + getterValue + "$")),
-     "getter _val is properly displayed");
-
-  panel.destroy();
-
-  executeSoon(function() {
-    let textContent = HUD.outputNode.textContent;
-    is(textContent.indexOf("document.body.client"), -1,
-       "no document.width/height warning displayed");
-
-    finishTest();
-  });
-}
diff --git a/toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html b/toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html
deleted file mode 100644
index fbe4c7bf678a..000000000000
--- a/toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <title>Web Console test for bug 632275 - getters</title>
-    <!-- Any copyright is dedicated to the Public Domain.
-         http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<script type="application/javascript;version=1.8">
-  document.foobar = {
-    _val: 5,
-    get val() { return ++this._val; }
-  };
-</script>
-
-  </head>
-  <body>
-    <p>Web Console test for bug 632275 - getters.</p>
-  </body>
-</html>

From 5e1f6515a2f9cb42c70915e35fd1fe62f20fb8a1 Mon Sep 17 00:00:00 2001
From: Mihai Sucan <mihai.sucan@gmail.com>
Date: Wed, 13 Apr 2011 19:04:12 +0300
Subject: [PATCH 04/20] Bug 620832 - Web console attempts to remove its
 observers multiple times; f=ddahl,rcampbell r=sdwilsh,rcampbell

---
 toolkit/components/console/hudservice/HUDService.jsm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolkit/components/console/hudservice/HUDService.jsm b/toolkit/components/console/hudservice/HUDService.jsm
index 20d87ca6a188..1c573e7f5d00 100644
--- a/toolkit/components/console/hudservice/HUDService.jsm
+++ b/toolkit/components/console/hudservice/HUDService.jsm
@@ -3527,7 +3527,7 @@ let ConsoleAPIObserver = {
       HUDService.logConsoleAPIMessage(hudId, aMessage.level, aMessage.arguments);
     }
     else if (aTopic == "quit-application-granted") {
-      this.shutdown();
+      HUDService.shutdown();
     }
   },
 
@@ -5845,7 +5845,7 @@ HUDWindowObserver = {
   uninit: function HWO_uninit()
   {
     Services.obs.removeObserver(this, "content-document-global-created");
-    HUDService.shutdown();
+    Services.obs.removeObserver(this, "xpcom-shutdown");
     this.initialConsoleCreated = false;
   },
 

From 77fc545081e3624f8ed479e31062c8223fb3ca01 Mon Sep 17 00:00:00 2001
From: Mihai Sucan <mihai.sucan@gmail.com>
Date: Mon, 11 Apr 2011 20:48:15 +0300
Subject: [PATCH 05/20] Bug 585956 - Implement console.trace() in web console;
 f=ddahl r=rcampbell,jonas

---
 dom/base/ConsoleAPI.js                        | 33 +++++++-
 dom/tests/browser/browser_ConsoleAPITests.js  | 34 +++++++-
 dom/tests/browser/test-console-api.html       | 14 ++++
 .../mochitest/general/test_consoleAPI.html    |  1 +
 .../console/hudservice/HUDService.jsm         | 84 ++++++++++++++++++-
 .../hudservice/tests/browser/Makefile.in      |  2 +
 ...ser_webconsole_bug_585956_console_trace.js | 76 +++++++++++++++++
 .../test-bug-585956-console-trace.html        | 27 ++++++
 .../tests/browser/test-console-extras.html    |  1 -
 .../chrome/global/headsUpDisplay.properties   | 11 +++
 10 files changed, 274 insertions(+), 9 deletions(-)
 create mode 100644 toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_585956_console_trace.js
 create mode 100644 toolkit/components/console/hudservice/tests/browser/test-bug-585956-console-trace.html

diff --git a/dom/base/ConsoleAPI.js b/dom/base/ConsoleAPI.js
index 1a383f7d37a2..194595ee4690 100644
--- a/dom/base/ConsoleAPI.js
+++ b/dom/base/ConsoleAPI.js
@@ -21,6 +21,7 @@
  *  David Dahl <ddahl@mozilla.com>  (Original Author)
  *  Ryan Flint <rflint@mozilla.com>
  *  Rob Campbell <rcampbell@mozilla.com>
+ *  Mihai Sucan <mihai.sucan@gmail.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -79,12 +80,16 @@ ConsoleAPI.prototype = {
       debug: function CA_debug() {
         self.notifyObservers(id, "log", arguments);
       },
+      trace: function CA_trace() {
+        self.notifyObservers(id, "trace", self.getStackTrace());
+      },
       __exposedProps__: {
         log: "r",
         info: "r",
         warn: "r",
         error: "r",
         debug: "r",
+        trace: "r",
       }
     };
 
@@ -100,6 +105,7 @@ ConsoleAPI.prototype = {
             warn: bind.call(x.warn, x),\
             error: bind.call(x.error, x),\
             debug: bind.call(x.debug, x),\
+            trace: bind.call(x.trace, x),\
             __noSuchMethod__: function() {}\
           };\
           Object.defineProperty(obj, '__mozillaConsole__', { value: true });\
@@ -126,7 +132,32 @@ ConsoleAPI.prototype = {
 
     Services.obs.notifyObservers(consoleEvent,
                                  "console-api-log-event", aID);
-  }
+  },
+
+  /**
+   * Build the stacktrace array for the console.trace() call.
+   *
+   * @return array
+   *         Each element is a stack frame that holds the following properties:
+   *         filename, lineNumber, functionName and language.
+   **/
+  getStackTrace: function CA_getStackTrace() {
+    let stack = [];
+    let frame = Components.stack.caller;
+    while (frame = frame.caller) {
+      if (frame.language == Ci.nsIProgrammingLanguage.JAVASCRIPT ||
+          frame.language == Ci.nsIProgrammingLanguage.JAVASCRIPT2) {
+        stack.push({
+          filename: frame.filename,
+          lineNumber: frame.lineNumber,
+          functionName: frame.name,
+          language: frame.language,
+        });
+      }
+    }
+
+    return stack;
+  },
 };
 
 let NSGetFactory = XPCOMUtils.generateNSGetFactory([ConsoleAPI]);
diff --git a/dom/tests/browser/browser_ConsoleAPITests.js b/dom/tests/browser/browser_ConsoleAPITests.js
index aa82a285809b..4c086a85ae26 100644
--- a/dom/tests/browser/browser_ConsoleAPITests.js
+++ b/dom/tests/browser/browser_ConsoleAPITests.js
@@ -21,6 +21,7 @@
  * Contributor(s):
  *  David Dahl <ddahl@mozilla.com>
  *  Rob Campbell <rcampbell@mozilla.com>
+ *  Mihai Sucan <mihai.sucan@gmail.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -73,15 +74,39 @@ function testConsoleData(aMessageObject) {
   is(aMessageObject.level, gLevel, "expected level received");
   ok(aMessageObject.arguments, "we have arguments");
   is(aMessageObject.arguments.length, gArgs.length, "arguments.length matches");
-  gArgs.forEach(function (a, i) {
-    is(aMessageObject.arguments[i], a, "correct arg " + i);
-  });
 
-  if (aMessageObject.level == "error") {
+  if (gLevel == "trace") {
+    is(aMessageObject.arguments.toSource(), gArgs.toSource(),
+       "stack trace is correct");
+
     // Test finished
     ConsoleObserver.destroy();
     finish();
   }
+  else {
+    gArgs.forEach(function (a, i) {
+      is(aMessageObject.arguments[i], a, "correct arg " + i);
+    });
+  }
+
+  if (aMessageObject.level == "error") {
+    // Now test console.trace()
+    startTraceTest();
+  }
+}
+
+function startTraceTest() {
+  gLevel = "trace";
+  gArgs = [
+    {filename: TEST_URI, lineNumber: 6, functionName: null, language: 2},
+    {filename: TEST_URI, lineNumber: 11, functionName: "foobar585956b", language: 2},
+    {filename: TEST_URI, lineNumber: 15, functionName: "foobar585956a", language: 2},
+    {filename: TEST_URI, lineNumber: 1, functionName: "onclick", language: 2}
+  ];
+
+  let button = gWindow.document.getElementById("test-trace");
+  ok(button, "found #test-trace button");
+  EventUtils.synthesizeMouse(button, 2, 2, {}, gWindow);
 }
 
 var gLevel, gArgs;
@@ -114,6 +139,7 @@ function consoleAPISanityTest() {
   ok(win.console.info, "console.info is here");
   ok(win.console.warn, "console.warn is here");
   ok(win.console.error, "console.error is here");
+  ok(win.console.trace, "console.trace is here");
 }
 
 var ConsoleObserver = {
diff --git a/dom/tests/browser/test-console-api.html b/dom/tests/browser/test-console-api.html
index 235275b430e3..ea58306f420f 100644
--- a/dom/tests/browser/test-console-api.html
+++ b/dom/tests/browser/test-console-api.html
@@ -2,6 +2,19 @@
 <html dir="ltr" xml:lang="en-US" lang="en-US"><head>
     <title>Console API test page</title>
     <script type="text/javascript">
+      window.foobar585956c = function(a) {
+        console.trace();
+        return a+"c";
+      };
+
+      function foobar585956b(a) {
+        return foobar585956c(a+"b");
+      }
+
+      function foobar585956a(omg) {
+        return foobar585956b(omg + "a");
+      }
+
       function test() {
         var str = "Test Message."
         console.foobar(str); // if this throws, we don't execute following funcs
@@ -15,5 +28,6 @@
   <body>
     <h1>Console API Test Page</h1>
     <button onclick="test();">Log stuff</button>
+    <button id="test-trace" onclick="foobar585956a('omg');">Test trace</button>
   </body>
 </html>
diff --git a/dom/tests/mochitest/general/test_consoleAPI.html b/dom/tests/mochitest/general/test_consoleAPI.html
index c99867446c29..f12077e851e5 100644
--- a/dom/tests/mochitest/general/test_consoleAPI.html
+++ b/dom/tests/mochitest/general/test_consoleAPI.html
@@ -26,6 +26,7 @@ function doTest() {
     "warn": "function",
     "error": "function",
     "debug": "function",
+    "trace": "function",
     "__noSuchMethod__": "function"
   };
 
diff --git a/toolkit/components/console/hudservice/HUDService.jsm b/toolkit/components/console/hudservice/HUDService.jsm
index 1c573e7f5d00..6936a76810c8 100644
--- a/toolkit/components/console/hudservice/HUDService.jsm
+++ b/toolkit/components/console/hudservice/HUDService.jsm
@@ -145,6 +145,7 @@ const LEVELS = {
   warn: SEVERITY_WARNING,
   info: SEVERITY_INFO,
   log: SEVERITY_LOG,
+  trace: SEVERITY_LOG,
 };
 
 // The lowest HTTP response code (inclusive) that is considered an error.
@@ -1981,12 +1982,89 @@ HUD_SERVICE.prototype =
     function formatResult(x) {
       return (typeof(x) == "string") ? x : hud.jsterm.formatResult(x);
     }
-    let mappedArguments = Array.map(aArguments, formatResult);
-    let joinedArguments = Array.join(mappedArguments, " ");
+
+    let body = null;
+    let clipboardText = null;
+    let sourceURL = null;
+    let sourceLine = 0;
+
+    switch (aLevel) {
+      case "log":
+      case "info":
+      case "warn":
+      case "error":
+      case "debug":
+        let mappedArguments = Array.map(aArguments, formatResult);
+        body = Array.join(mappedArguments, " ");
+        break;
+
+      case "trace":
+        let filename = ConsoleUtils.abbreviateSourceURL(aArguments[0].filename);
+        let functionName = aArguments[0].functionName ||
+                           this.getStr("stacktrace.anonymousFunction");
+        let lineNumber = aArguments[0].lineNumber;
+
+        body = this.getFormatStr("stacktrace.outputMessage",
+                                 [filename, functionName, lineNumber]);
+
+        sourceURL = aArguments[0].filename;
+        sourceLine = aArguments[0].lineNumber;
+
+        clipboardText = "";
+
+        aArguments.forEach(function(aFrame) {
+          clipboardText += aFrame.filename + " :: " +
+                           aFrame.functionName + " :: " +
+                           aFrame.lineNumber + "\n";
+        });
+
+        clipboardText = clipboardText.trimRight();
+        break;
+
+      default:
+        Cu.reportError("Unknown Console API log level: " + aLevel);
+        return;
+    }
+
     let node = ConsoleUtils.createMessageNode(hud.outputNode.ownerDocument,
                                               CATEGORY_WEBDEV,
                                               LEVELS[aLevel],
-                                              joinedArguments);
+                                              body,
+                                              sourceURL,
+                                              sourceLine,
+                                              clipboardText);
+
+    // Make the node bring up the property panel, to allow the user to inspect
+    // the stack trace.
+    if (aLevel == "trace") {
+      node._stacktrace = aArguments;
+
+      let linkNode = node.querySelector(".webconsole-msg-body");
+      linkNode.classList.add("hud-clickable");
+      linkNode.setAttribute("aria-haspopup", "true");
+
+      node.addEventListener("mousedown", function(aEvent) {
+        this._startX = aEvent.clientX;
+        this._startY = aEvent.clientY;
+      }, false);
+
+      node.addEventListener("click", function(aEvent) {
+        if (aEvent.detail != 1 || aEvent.button != 0 ||
+            (this._startX != aEvent.clientX &&
+             this._startY != aEvent.clientY)) {
+          return;
+        }
+
+        if (!this._panelOpen) {
+          let propPanel = hud.jsterm.openPropertyPanel(null,
+                                                       node._stacktrace,
+                                                       this);
+          propPanel.panel.setAttribute("hudId", aHUDId);
+          this._panelOpen = true;
+        }
+      }, false);
+    }
+
     ConsoleUtils.outputMessageNode(node, aHUDId);
   },
 
diff --git a/toolkit/components/console/hudservice/tests/browser/Makefile.in b/toolkit/components/console/hudservice/tests/browser/Makefile.in
index 87dd39e2d23a..2da05635fa93 100644
--- a/toolkit/components/console/hudservice/tests/browser/Makefile.in
+++ b/toolkit/components/console/hudservice/tests/browser/Makefile.in
@@ -131,6 +131,7 @@ _BROWSER_TEST_FILES = \
 	browser_webconsole_bug_632347_iterators_generators.js \
 	browser_webconsole_bug_642108_refForOutputNode.js \
 	browser_webconsole_bug_642108_pruneTest.js \
+	browser_webconsole_bug_585956_console_trace.js \
 	head.js \
 	$(NULL)
 
@@ -199,6 +200,7 @@ _BROWSER_TEST_PAGES = \
 	test-bug-630733-response-redirect-headers.sjs \
 	test-bug-621644-jsterm-dollar.html \
 	test-bug-632347-iterators-generators.html \
+	test-bug-585956-console-trace.html \
 	$(NULL)
 
 libs:: $(_BROWSER_TEST_FILES)
diff --git a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_585956_console_trace.js b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_585956_console_trace.js
new file mode 100644
index 000000000000..16a1bf133a53
--- /dev/null
+++ b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_585956_console_trace.js
@@ -0,0 +1,76 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Web Console test suite.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Mihai Sucan <mihai.sucan@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-bug-585956-console-trace.html";
+
+function test() {
+  addTab(TEST_URI);
+  browser.addEventListener("load", tabLoaded, true);
+}
+
+function tabLoaded() {
+  browser.removeEventListener("load", tabLoaded, true);
+
+  openConsole();
+
+  browser.addEventListener("load", tabReloaded, true);
+  content.location.reload();
+}
+
+function tabReloaded() {
+  browser.removeEventListener("load", tabReloaded, true);
+
+  // The expected stack trace object.
+  let stacktrace = [
+    { filename: TEST_URI, lineNumber: 9, functionName: null, language: 2 },
+    { filename: TEST_URI, lineNumber: 14, functionName: "foobar585956b", language: 2 },
+    { filename: TEST_URI, lineNumber: 18, functionName: "foobar585956a", language: 2 },
+    { filename: TEST_URI, lineNumber: 21, functionName: null, language: 2 }
+  ];
+
+  let hudId = HUDService.getHudIdByWindow(content);
+  let HUD = HUDService.hudReferences[hudId];
+
+  let node = HUD.outputNode.querySelector(".hud-log");
+  ok(node, "found trace log node");
+  ok(node._stacktrace, "found stacktrace object");
+  is(node._stacktrace.toSource(), stacktrace.toSource(), "stacktrace is correct");
+  isnot(node.textContent.indexOf("bug-585956"), -1, "found file name");
+
+  finishTest();
+}
diff --git a/toolkit/components/console/hudservice/tests/browser/test-bug-585956-console-trace.html b/toolkit/components/console/hudservice/tests/browser/test-bug-585956-console-trace.html
new file mode 100644
index 000000000000..52571bc64be2
--- /dev/null
+++ b/toolkit/components/console/hudservice/tests/browser/test-bug-585956-console-trace.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>Web Console test for bug 585956 - console.trace()</title>
+    <!-- Any copyright is dedicated to the Public Domain.
+         http://creativecommons.org/publicdomain/zero/1.0/ -->
+<script type="application/javascript">
+window.foobar585956c = function(a) {
+  console.trace();
+  return a+"c";
+};
+
+function foobar585956b(a) {
+  return foobar585956c(a+"b");
+}
+
+function foobar585956a(omg) {
+  return foobar585956b(omg + "a");
+}
+
+foobar585956a("omg");
+</script>
+  </head>
+  <body>
+    <p>Web Console test for bug 585956 - console.trace().</p>
+  </body>
+</html>
diff --git a/toolkit/components/console/hudservice/tests/browser/test-console-extras.html b/toolkit/components/console/hudservice/tests/browser/test-console-extras.html
index 65f5675fffc5..cb5f958a2806 100644
--- a/toolkit/components/console/hudservice/tests/browser/test-console-extras.html
+++ b/toolkit/components/console/hudservice/tests/browser/test-console-extras.html
@@ -11,7 +11,6 @@
         console.clear()
         console.dir()
         console.dirxml()
-        console.trace()
         console.group()
         console.groupCollapsed()
         console.groupEnd()
diff --git a/toolkit/locales/en-US/chrome/global/headsUpDisplay.properties b/toolkit/locales/en-US/chrome/global/headsUpDisplay.properties
index 14719e375e0e..34f6c504ad07 100644
--- a/toolkit/locales/en-US/chrome/global/headsUpDisplay.properties
+++ b/toolkit/locales/en-US/chrome/global/headsUpDisplay.properties
@@ -114,3 +114,14 @@ NetworkPanel.imageSizeDeltaDurationMS=%Sx%Spx, Δ%Sms
 #  o music/crescendo
 NetworkPanel.responseBodyUnableToDisplay.content=Unable to display responses of type "%S"
 ConsoleAPIDisabled=The Web Console logging API (console.log, console.info, console.warn, console.error) has been disabled by a script on this page.
+
+# LOCALIZATION NOTE (stacktrace.anonymousFunction):
+# This string is used to display JavaScript functions that have no given name -
+# they are said to be anonymous. See stacktrace.outputMessage.
+stacktrace.anonymousFunction=<anonymous>
+
+# LOCALIZATION NOTE (stacktrace.outputMessage):
+# This string is used in the Web Console output to identify a web developer call
+# to console.trace(). The stack trace of JavaScript function calls is displayed.
+# In this minimal message we only show the last call.
+stacktrace.outputMessage=Stack trace from %S, function %S, line %S.

From c60aded6c2930bebd7f7e3eeaf4b5bf0296b6b16 Mon Sep 17 00:00:00 2001
From: Mihai Sucan <mihai.sucan@gmail.com>
Date: Wed, 13 Apr 2011 23:02:36 +0300
Subject: [PATCH 06/20] Bug 595223 - Keep track of file:// url 'loadGroups';
 f=ddahl r=dcamp,dolske

---
 .../console/hudservice/HUDService.jsm         | 119 ++++++++++++++----
 .../hudservice/tests/browser/Makefile.in      |   1 +
 .../browser_webconsole_bug_595223_file_uri.js |  79 ++++++++++++
 3 files changed, 175 insertions(+), 24 deletions(-)
 create mode 100644 toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_595223_file_uri.js

diff --git a/toolkit/components/console/hudservice/HUDService.jsm b/toolkit/components/console/hudservice/HUDService.jsm
index 6936a76810c8..b9ceec95daab 100644
--- a/toolkit/components/console/hudservice/HUDService.jsm
+++ b/toolkit/components/console/hudservice/HUDService.jsm
@@ -1439,7 +1439,8 @@ HUD_SERVICE.prototype =
    */
   deactivateHUDForContext: function HS_deactivateHUDForContext(aContext, aAnimated)
   {
-    let window = aContext.linkedBrowser.contentWindow;
+    let browser = aContext.linkedBrowser;
+    let window = browser.contentWindow;
     let nBox = aContext.ownerDocument.defaultView.
       getNotificationBox(window);
     let hudId = "hud_" + nBox.id;
@@ -1450,7 +1451,12 @@ HUD_SERVICE.prototype =
         this.storeHeight(hudId);
       }
 
+      let hud = this.hudReferences[hudId];
+      browser.webProgress.removeProgressListener(hud.progressListener);
+      delete hud.progressListener;
+
       this.unregisterDisplay(displayNode);
+
       window.focus();
     }
   },
@@ -2718,27 +2724,6 @@ HUD_SERVICE.prototype =
     13: "typeWarning", // JSREPORT_STRICT_MODE_ERROR | JSREPORT_WARNING | JSREPORT_ERROR
   },
 
-  /**
-   * Closes the Console, if any, that resides on the given tab.
-   *
-   * @param nsIDOMNode aTab
-   *        The tab on which to close the console.
-   * @returns void
-   */
-  closeConsoleOnTab: function HS_closeConsoleOnTab(aTab)
-  {
-    let xulDocument = aTab.ownerDocument;
-    let xulWindow = xulDocument.defaultView;
-    let gBrowser = xulWindow.gBrowser;
-    let linkedBrowser = aTab.linkedBrowser;
-    let notificationBox = gBrowser.getNotificationBox(linkedBrowser);
-    let hudId = "hud_" + notificationBox.getAttribute("id");
-    let outputNode = xulDocument.getElementById(hudId);
-    if (outputNode != null) {
-      this.unregisterDisplay(outputNode);
-    }
-  },
-
   /**
    * onTabClose event handler function
    *
@@ -2747,7 +2732,7 @@ HUD_SERVICE.prototype =
    */
   onTabClose: function HS_onTabClose(aEvent)
   {
-    this.closeConsoleOnTab(aEvent.target);
+    this.deactivateHUDForContext(aEvent.target, false);
   },
 
   /**
@@ -2765,7 +2750,7 @@ HUD_SERVICE.prototype =
 
     let tab = tabContainer.firstChild;
     while (tab != null) {
-      this.closeConsoleOnTab(tab);
+      this.deactivateHUDForContext(tab, false);
       tab = tab.nextSibling;
     }
   },
@@ -2837,6 +2822,11 @@ HUD_SERVICE.prototype =
       HUDService.registerHUDReference(hud);
       let windowId = this.getWindowId(aContentWindow.top);
       this.windowIds[windowId] = hudId;
+
+      hud.progressListener = new ConsoleProgressListener(hudId);
+
+      _browser.webProgress.addProgressListener(hud.progressListener,
+        Ci.nsIWebProgress.NOTIFY_STATE_ALL);
     }
     else {
       hud = this.hudReferences[hudId];
@@ -6085,6 +6075,87 @@ HUDConsoleObserver = {
   }
 };
 
+/**
+ * A WebProgressListener that listens for location changes, to update HUDService
+ * state information on page navigation.
+ *
+ * @constructor
+ * @param string aHudId
+ *        The HeadsUpDisplay ID.
+ */
+function ConsoleProgressListener(aHudId)
+{
+  this.hudId = aHudId;
+}
+
+ConsoleProgressListener.prototype = {
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
+                                         Ci.nsISupportsWeakReference]),
+
+  onStateChange: function CPL_onStateChange(aProgress, aRequest, aState,
+                                            aStatus)
+  {
+    if (!(aState & Ci.nsIWebProgressListener.STATE_START)) {
+      return;
+    }
+
+    let uri = null;
+    if (aRequest instanceof Ci.imgIRequest) {
+      let imgIRequest = aRequest.QueryInterface(Ci.imgIRequest);
+      uri = imgIRequest.URI;
+    }
+    else if (aRequest instanceof Ci.nsIChannel) {
+      let nsIChannel = aRequest.QueryInterface(Ci.nsIChannel);
+      uri = nsIChannel.URI;
+    }
+
+    if (!uri || !uri.schemeIs("file") && !uri.schemeIs("ftp")) {
+      return;
+    }
+
+    let outputNode = HUDService.hudReferences[this.hudId].outputNode;
+
+    let chromeDocument = outputNode.ownerDocument;
+    let msgNode = chromeDocument.createElementNS(HTML_NS, "html:span");
+
+    // Create the clickable URL part of the message.
+    let linkNode = chromeDocument.createElementNS(HTML_NS, "html:span");
+    linkNode.appendChild(chromeDocument.createTextNode(uri.spec));
+    linkNode.classList.add("hud-clickable");
+    linkNode.classList.add("webconsole-msg-url");
+
+    linkNode.addEventListener("mousedown", function(aEvent) {
+      this._startX = aEvent.clientX;
+      this._startY = aEvent.clientY;
+    }, false);
+
+    linkNode.addEventListener("click", function(aEvent) {
+      if (aEvent.detail == 1 && aEvent.button == 0 &&
+          this._startX == aEvent.clientX && this._startY == aEvent.clientY) {
+        let viewSourceUtils = chromeDocument.defaultView.gViewSourceUtils;
+        viewSourceUtils.viewSource(uri.spec, null, chromeDocument);
+      }
+    }, false);
+
+    msgNode.appendChild(linkNode);
+
+    let messageNode = ConsoleUtils.createMessageNode(chromeDocument,
+                                                     CATEGORY_NETWORK,
+                                                     SEVERITY_LOG,
+                                                     msgNode,
+                                                     null,
+                                                     null,
+                                                     uri.spec);
+
+    ConsoleUtils.outputMessageNode(messageNode, this.hudId);
+  },
+
+  onLocationChange: function() {},
+  onStatusChange: function() {},
+  onProgressChange: function() {},
+  onSecurityChange: function() {},
+};
+
 ///////////////////////////////////////////////////////////////////////////
 // appName
 ///////////////////////////////////////////////////////////////////////////
diff --git a/toolkit/components/console/hudservice/tests/browser/Makefile.in b/toolkit/components/console/hudservice/tests/browser/Makefile.in
index 2da05635fa93..2f18d02814b6 100644
--- a/toolkit/components/console/hudservice/tests/browser/Makefile.in
+++ b/toolkit/components/console/hudservice/tests/browser/Makefile.in
@@ -132,6 +132,7 @@ _BROWSER_TEST_FILES = \
 	browser_webconsole_bug_642108_refForOutputNode.js \
 	browser_webconsole_bug_642108_pruneTest.js \
 	browser_webconsole_bug_585956_console_trace.js \
+	browser_webconsole_bug_595223_file_uri.js \
 	head.js \
 	$(NULL)
 
diff --git a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_595223_file_uri.js b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_595223_file_uri.js
new file mode 100644
index 000000000000..1fd37b4ea35a
--- /dev/null
+++ b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_595223_file_uri.js
@@ -0,0 +1,79 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Web Console test suite.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Mihai Sucan <mihai.sucan@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+const TEST_FILE = "test-network.html";
+
+function tabLoad(aEvent) {
+  browser.removeEventListener(aEvent.type, arguments.callee, true);
+
+  openConsole();
+
+  let hudId = HUDService.getHudIdByWindow(content);
+  hud = HUDService.hudReferences[hudId];
+
+  browser.addEventListener("load", tabReload, true);
+
+  content.location.reload();
+}
+
+function tabReload(aEvent) {
+  browser.removeEventListener(aEvent.type, arguments.callee, true);
+
+  let textContent = hud.outputNode.textContent;
+  isnot(textContent.indexOf("test-network.html"), -1,
+        "found test-network.html");
+  isnot(textContent.indexOf("test-image.png"), -1, "found test-image.png");
+  isnot(textContent.indexOf("testscript.js"), -1, "found testscript.js");
+  isnot(textContent.indexOf("running network console logging tests"), -1,
+        "found the console.log() message from testscript.js");
+
+  finishTest();
+}
+
+function test() {
+  let jar = getJar(getRootDirectory(gTestPath));
+  let dir = jar ?
+            extractJarToTmp(jar) :
+            getChromeDir(getResolvedURI(gTestPath));
+  dir.append(TEST_FILE);
+
+  let uri = Services.io.newFileURI(dir);
+
+  addTab(uri.spec);
+  browser.addEventListener("load", tabLoad, true);
+}

From 8a438cd825f8bb8c3e28df5a811ff961340b6d39 Mon Sep 17 00:00:00 2001
From: Mihai Sucan <mihai.sucan@gmail.com>
Date: Wed, 13 Apr 2011 21:05:15 +0300
Subject: [PATCH 07/20] Bug 632275 - Web Console: Error message when click on
 an object to create an inspect window; f=rcampbell r=dcamp,sdwilsh

---
 .../console/hudservice/PropertyPanel.jsm      | 43 ++++++++++++--
 .../hudservice/tests/browser/Makefile.in      |  2 +
 ...nsole_bug_632275_getters_document_width.js | 58 +++++++++++++++++++
 .../browser/test-bug-632275-getters.html      | 19 ++++++
 4 files changed, 116 insertions(+), 6 deletions(-)
 create mode 100644 toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632275_getters_document_width.js
 create mode 100644 toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html

diff --git a/toolkit/components/console/hudservice/PropertyPanel.jsm b/toolkit/components/console/hudservice/PropertyPanel.jsm
index 3ebad1877a18..b23ba617c8ee 100644
--- a/toolkit/components/console/hudservice/PropertyPanel.jsm
+++ b/toolkit/components/console/hudservice/PropertyPanel.jsm
@@ -134,6 +134,20 @@ function presentableValueFor(aObject)
   }
 }
 
+/**
+ * Tells if the given function is native or not.
+ *
+ * @param function aFunction
+ *        The function you want to check if it is native or not.
+ *
+ * @return boolean
+ *         True if the given function is native, false otherwise.
+ */
+function isNativeFunction(aFunction)
+{
+  return typeof aFunction == "function" && !("prototype" in aFunction);
+}
+
 /**
  * Get an array of property name value pairs for the tree.
  *
@@ -145,17 +159,34 @@ function presentableValueFor(aObject)
 function namesAndValuesOf(aObject)
 {
   let pairs = [];
-  let value, presentable;
+  let value, presentable, getter;
+
+  let isDOMDocument = aObject instanceof Ci.nsIDOMDocument;
 
   for (var propName in aObject) {
-    try {
-      value = aObject[propName];
-      presentable = presentableValueFor(value);
-    }
-    catch (ex) {
+    // See bug 632275: skip deprecated width and height properties.
+    if (isDOMDocument && (propName == "width" || propName == "height")) {
       continue;
     }
 
+    // Also skip non-native getters.
+    // TODO: implement a safer way to skip non-native getters. See bug 647235.
+    getter = aObject.__lookupGetter__ ?
+             aObject.__lookupGetter__(propName) : null;
+    if (getter && !isNativeFunction(getter)) {
+      value = ""; // Value is never displayed.
+      presentable = {type: TYPE_OTHER, display: "Getter"};
+    }
+    else {
+      try {
+        value = aObject[propName];
+        presentable = presentableValueFor(value);
+      }
+      catch (ex) {
+        continue;
+      }
+    }
+
     let pair = {};
     pair.name = propName;
     pair.display = propName + ": " + presentable.display;
diff --git a/toolkit/components/console/hudservice/tests/browser/Makefile.in b/toolkit/components/console/hudservice/tests/browser/Makefile.in
index 2f18d02814b6..1f5e71eb67fe 100644
--- a/toolkit/components/console/hudservice/tests/browser/Makefile.in
+++ b/toolkit/components/console/hudservice/tests/browser/Makefile.in
@@ -133,6 +133,7 @@ _BROWSER_TEST_FILES = \
 	browser_webconsole_bug_642108_pruneTest.js \
 	browser_webconsole_bug_585956_console_trace.js \
 	browser_webconsole_bug_595223_file_uri.js \
+	browser_webconsole_bug_632275_getters_document_width.js \
 	head.js \
 	$(NULL)
 
@@ -202,6 +203,7 @@ _BROWSER_TEST_PAGES = \
 	test-bug-621644-jsterm-dollar.html \
 	test-bug-632347-iterators-generators.html \
 	test-bug-585956-console-trace.html \
+	test-bug-632275-getters.html \
 	$(NULL)
 
 libs:: $(_BROWSER_TEST_FILES)
diff --git a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632275_getters_document_width.js b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632275_getters_document_width.js
new file mode 100644
index 000000000000..08b34e22ef7b
--- /dev/null
+++ b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632275_getters_document_width.js
@@ -0,0 +1,58 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html";
+
+function test() {
+  addTab(TEST_URI);
+  browser.addEventListener("load", tabLoaded, true);
+}
+
+function tabLoaded() {
+  browser.removeEventListener("load", tabLoaded, true);
+  openConsole();
+
+  let hudId = HUDService.getHudIdByWindow(content);
+  let HUD = HUDService.hudReferences[hudId];
+  let jsterm = HUD.jsterm;
+
+  let doc = content.wrappedJSObject.document;
+
+  let panel = jsterm.openPropertyPanel("Test1", doc);
+
+  let rows = panel.treeView._rows;
+  let find = function(regex) {
+    return rows.some(function(row) {
+      return regex.test(row.display);
+    });
+  };
+
+  ok(!find(/^(width|height):/), "no document.width/height");
+
+  panel.destroy();
+
+  let getterValue = doc.foobar._val;
+
+  panel = jsterm.openPropertyPanel("Test2", doc.foobar);
+  rows = panel.treeView._rows;
+
+  is(getterValue, doc.foobar._val, "getter did not execute");
+  is(getterValue+1, doc.foobar.val, "getter executed");
+  is(getterValue+1, doc.foobar._val, "getter executed (recheck)");
+
+  ok(find(/^val: Getter$/),
+     "getter is properly displayed");
+
+  ok(find(new RegExp("^_val: " + getterValue + "$")),
+     "getter _val is properly displayed");
+
+  panel.destroy();
+
+  executeSoon(function() {
+    let textContent = HUD.outputNode.textContent;
+    is(textContent.indexOf("document.body.client"), -1,
+       "no document.width/height warning displayed");
+
+    finishTest();
+  });
+}
diff --git a/toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html b/toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html
new file mode 100644
index 000000000000..fbe4c7bf678a
--- /dev/null
+++ b/toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>Web Console test for bug 632275 - getters</title>
+    <!-- Any copyright is dedicated to the Public Domain.
+         http://creativecommons.org/publicdomain/zero/1.0/ -->
+
+<script type="application/javascript;version=1.8">
+  document.foobar = {
+    _val: 5,
+    get val() { return ++this._val; }
+  };
+</script>
+
+  </head>
+  <body>
+    <p>Web Console test for bug 632275 - getters.</p>
+  </body>
+</html>

From 3b6a01e37a16abae5b04e8dba73cf7cd71666081 Mon Sep 17 00:00:00 2001
From: Mihai Sucan <mihai.sucan@gmail.com>
Date: Wed, 20 Apr 2011 11:18:00 +0300
Subject: [PATCH 08/20] Bug 642176 - Integrate Workspace extension into the
 browser; f=rcampbell r=ddahl,sdwilsh

---
 browser/app/profile/firefox.js                |   3 +
 browser/base/content/browser-appmenu.inc      |   5 +
 browser/base/content/browser-menubar.inc      |   5 +
 browser/base/content/browser-sets.inc         |   3 +
 browser/base/content/browser.js               |  24 +
 browser/base/content/workspace.js             | 552 ++++++++++++++++++
 browser/base/content/workspace.xul            | 331 +++++++++++
 browser/base/jar.mn                           |   2 +
 .../locales/en-US/chrome/browser/browser.dtd  |   4 +
 .../en-US/chrome/browser/workspace.dtd        |  88 +++
 .../en-US/chrome/browser/workspace.properties |  30 +
 browser/locales/jar.mn                        |   2 +
 .../console/hudservice/HUDService.jsm         |  12 +
 13 files changed, 1061 insertions(+)
 create mode 100644 browser/base/content/workspace.js
 create mode 100644 browser/base/content/workspace.xul
 create mode 100644 browser/locales/en-US/chrome/browser/workspace.dtd
 create mode 100644 browser/locales/en-US/chrome/browser/workspace.properties

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 7cdde5cc8f31..f71d071e2cd2 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1047,6 +1047,9 @@ pref("services.sync.prefs.sync.xpinstall.whitelist.required", true);
 pref("devtools.errorconsole.enabled", false);
 pref("devtools.inspector.enabled", false);
 
+// Enable the Workspace tool.
+pref("devtools.workspace.enabled", true);
+
 // The last Web Console height. This is initially 0 which means that the Web
 // Console will use the default height next time it shows.
 // Change to -1 if you do not want the Web Console to remember its last height.
diff --git a/browser/base/content/browser-appmenu.inc b/browser/base/content/browser-appmenu.inc
index 17ed11006397..296b7cd207db 100644
--- a/browser/base/content/browser-appmenu.inc
+++ b/browser/base/content/browser-appmenu.inc
@@ -187,6 +187,11 @@
                     type="checkbox"
                     command="Tools:Inspect"
                     key="key_inspect"/>
+          <menuitem id="appmenu_workspace"
+                    hidden="true"
+                    label="&workspace.label;"
+                    key="key_workspace"
+                    command="Tools:Workspace"/>
           <menuitem id="appmenu_pageSource"
                     label="&viewPageSourceCmd.label;"
                     command="View:PageSource"
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index 2f1c4674e029..0aa6613600c8 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -550,6 +550,11 @@
                         accesskey="&webConsoleCmd.accesskey;"
                         key="key_webConsole"
                         oncommand="HUDConsoleUI.toggleHUD();"/>
+              <menuitem id="menu_workspace"
+                        hidden="true"
+                        label="&workspace.label;"
+                        key="key_workspace"
+                        command="Tools:Workspace"/>
               <menuitem id="menu_pageInfo"
                         accesskey="&pageInfoCmd.accesskey;"
                         label="&pageInfoCmd.label;"
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index 19a212a0774b..59fa6f1bdf9b 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -125,6 +125,7 @@
     <command id="Tools:Search" oncommand="BrowserSearch.webSearch();"/>
     <command id="Tools:Downloads" oncommand="BrowserDownloadsUI();"/>
     <command id="Tools:Inspect" oncommand="InspectorUI.toggleInspectorUI();" disabled="true"/>
+    <command id="Tools:Workspace" oncommand="Workspace.openWorkspace();" disabled="true"/>
     <command id="Tools:Addons" oncommand="BrowserOpenAddonsMgr();"/>
     <command id="Tools:Sanitize"
      oncommand="Cc['@mozilla.org/browser/browserglue;1'].getService(Ci.nsIBrowserGlue).sanitize(window);"/>
@@ -241,6 +242,8 @@
     <key id="key_errorConsole" key="&errorConsoleCmd.commandkey;" oncommand="toJavaScriptConsole();" modifiers="accel,shift" disabled="true"/>
     <key id="key_webConsole" key="&webConsoleCmd.commandkey;" oncommand="HUDConsoleUI.toggleHUD();" modifiers="accel,shift"/>
     <key id="key_inspect" key="&inspectMenu.commandkey;" command="Tools:Inspect" modifiers="accel,shift"/>
+    <key id="key_workspace" keycode="&workspace.keycode;"
+         keytext="&workspace.keytext;" command="Tools:Workspace"/>
     <key id="openFileKb" key="&openFileCmd.commandkey;" command="Browser:OpenFile"  modifiers="accel"/>
     <key id="key_savePage" key="&savePageCmd.commandkey;" command="Browser:SavePage" modifiers="accel"/>
     <key id="printKb" key="&printCmd.commandkey;" command="cmd_print"  modifiers="accel"/>
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 7d1cd26fcd6f..ac97d646cc38 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -54,6 +54,7 @@
 #   Rob Campbell <rcampbell@mozilla.com>
 #   David Dahl <ddahl@mozilla.com>
 #   Patrick Walton <pcwalton@mozilla.com>
+#   Mihai Sucan <mihai.sucan@gmail.com>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -1662,6 +1663,16 @@ function delayedStartup(isLoadingBlank, mustLoadSidebar) {
 #endif
   }
 
+  // Enable Workspace in the UI, if the preference allows this.
+  let workspaceEnabled = gPrefService.getBoolPref(Workspace.prefEnabledName);
+  if (workspaceEnabled) {
+    document.getElementById("menu_workspace").hidden = false;
+    document.getElementById("Tools:Workspace").removeAttribute("disabled");
+#ifdef MENUBAR_CAN_AUTOHIDE
+    document.getElementById("appmenu_workspace").hidden = false;
+#endif
+  }
+
 #ifdef MENUBAR_CAN_AUTOHIDE
   // If the user (or the locale) hasn't enabled the top-level "Character
   // Encoding" menu via the "browser.menu.showCharacterEncoding" preference,
@@ -8607,6 +8618,19 @@ function toggleAddonBar() {
   setToolbarVisibility(addonBar, addonBar.collapsed);
 }
 
+var Workspace = {
+  prefEnabledName: "devtools.workspace.enabled",
+
+  openWorkspace: function WS_openWorkspace() {
+    const WORKSPACE_WINDOW_URL = "chrome://browser/content/workspace.xul";
+    const WORKSPACE_WINDOW_FEATURES = "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no";
+
+    return Services.ww.openWindow(null, WORKSPACE_WINDOW_URL, "_blank",
+                                  WORKSPACE_WINDOW_FEATURES, null);
+  },
+};
+
+
 XPCOMUtils.defineLazyGetter(window, "gShowPageResizers", function () {
 #ifdef XP_WIN
   // Only show resizers on Windows 2000 and XP
diff --git a/browser/base/content/workspace.js b/browser/base/content/workspace.js
new file mode 100644
index 000000000000..0f69fca8bac3
--- /dev/null
+++ b/browser/base/content/workspace.js
@@ -0,0 +1,552 @@
+/* vim:set ts=2 sw=2 sts=2 et:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Workspace.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Rob Campbell <robcee@mozilla.com> (original author)
+ *   Erik Vold <erikvvold@gmail.com>
+ *   David Dahl <ddahl@mozilla.com>
+ *   Mihai Sucan <mihai.sucan@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK *****/
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
+Cu.import("resource:///modules/PropertyPanel.jsm");
+
+const WORKSPACE_CONTEXT_CONTENT = 1;
+const WORKSPACE_CONTEXT_CHROME = 2;
+const WORKSPACE_WINDOW_URL = "chrome://browser/content/workspace.xul";
+const WORKSPACE_L10N = "chrome://browser/locale/workspace.properties";
+const WORKSPACE_WINDOW_FEATURES = "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no";
+
+/**
+ * The workspace object handles the Workspace window functionality.
+ */
+var Workspace = {
+  /**
+   * The script execution context. This tells Workspace in which context the
+   * script shall execute.
+   *
+   * Possible values:
+   *   - WORKSPACE_CONTEXT_CONTENT to execute code in the context of the current
+   *   tab content window object.
+   *   - WORKSPACE_CONTEXT_CHROME to execute code in the context of the
+   *   currently active chrome window object.
+   */
+  executionContext: WORKSPACE_CONTEXT_CONTENT,
+
+  /**
+   * Retrieve the xul:textbox DOM element. This element holds the source code
+   * the user writes and executes.
+   */
+  get textbox() document.getElementById("workspace-textbox"),
+
+  /**
+   * Retrieve the xul:statusbarpanel DOM element. The status bar tells the
+   * current code execution context.
+   */
+  get statusbarStatus() document.getElementById("workspace-status"),
+
+  /**
+   * Get the selected text from the textbox.
+   */
+  get selectedText()
+  {
+    return this.textbox.value.substring(this.textbox.selectionStart,
+                                        this.textbox.selectionEnd);
+  },
+
+  /**
+   * Get the most recent chrome window of type navigator:browser.
+   */
+  get browserWindow() Services.wm.getMostRecentWindow("navigator:browser"),
+
+  /**
+   * Get the gBrowser object of the most recent browser window.
+   */
+  get gBrowser()
+  {
+    let recentWin = this.browserWindow;
+    return recentWin ? recentWin.gBrowser : null;
+  },
+
+  /**
+   * Get the Cu.Sandbox object for the active tab content window object.
+   */
+  get contentSandbox()
+  {
+    if (!this.browserWindow) {
+      Cu.reportError(this.strings.
+                     GetStringFromName("browserWindow.unavailable"));
+      return;
+    }
+
+    // TODO: bug 646524 - need to cache sandboxes if
+    // currentBrowser == previousBrowser
+    let contentWindow = this.gBrowser.selectedBrowser.contentWindow;
+    return new Cu.Sandbox(contentWindow,
+                          { sandboxPrototype: contentWindow,
+                            wantXrays: false });
+  },
+
+  /**
+   * Get the Cu.Sandbox object for the most recently active navigator:browser
+   * chrome window object.
+   */
+  get chromeSandbox()
+  {
+    if (!this.browserWindow) {
+      Cu.reportError(this.strings.
+                     GetStringFromName("browserWindow.unavailable"));
+      return;
+    }
+
+    return new Cu.Sandbox(this.browserWindow,
+                          { sandboxPrototype: this.browserWindow,
+                            wantXrays: false });
+  },
+
+  /**
+   * Drop the textbox selection.
+   */
+  deselect: function WS_deselect()
+  {
+    this.textbox.selectionEnd = this.textbox.selectionStart;
+  },
+
+  /**
+   * Select a specific range in the Workspace xul:textbox.
+   *
+   * @param number aStart
+   *        Selection range start.
+   * @param number aEnd
+   *        Selection range end.
+   */
+  selectRange: function WS_selectRange(aStart, aEnd)
+  {
+    this.textbox.selectionStart = aStart;
+    this.textbox.selectionEnd = aEnd;
+  },
+
+  /**
+   * Evaluate a string in the active tab content window.
+   *
+   * @param string aString
+   *        The script you want evaluated.
+   * @return mixed
+   *         The script evaluation result.
+   */
+  evalInContentSandbox: function WS_evalInContentSandbox(aString)
+  {
+    let result;
+    try {
+      result = Cu.evalInSandbox(aString, this.contentSandbox, "1.8",
+                                "Workspace", 1);
+    }
+    catch (ex) {
+      this.openWebConsole();
+
+      let contentWindow = this.gBrowser.selectedBrowser.contentWindow;
+
+      let scriptError = Cc["@mozilla.org/scripterror;1"].
+                        createInstance(Ci.nsIScriptError2);
+
+      scriptError.initWithWindowID(ex.message + "\n" + ex.stack, ex.fileName,
+                                   "", ex.lineNumber, 0, scriptError.errorFlag,
+                                   "content javascript",
+                                   this.getWindowId(contentWindow));
+
+      Services.console.logMessage(scriptError);
+    }
+
+    return result;
+  },
+
+  /**
+   * Evaluate a string in the most recent navigator:browser chrome window.
+   *
+   * @param string aString
+   *        The script you want evaluated.
+   * @return mixed
+   *         The script evaluation result.
+   */
+  evalInChromeSandbox: function WS_evalInChromeSandbox(aString)
+  {
+    let result;
+    try {
+      result = Cu.evalInSandbox(aString, this.chromeSandbox, "1.8",
+                                "Workspace", 1);
+    }
+    catch (ex) {
+      Cu.reportError(ex);
+      Cu.reportError(ex.stack);
+      this.openErrorConsole();
+    }
+
+    return result;
+  },
+
+  /**
+   * Evaluate a string in the currently desired context, that is either the
+   * chrome window or the tab content window object.
+   *
+   * @param string aString
+   *        The script you want to evaluate.
+   * @return mixed
+   *         The script evaluation result.
+   */
+  evalForContext: function WS_evaluateForContext(aString)
+  {
+    return this.executionContext == WORKSPACE_CONTEXT_CONTENT ?
+           this.evalInContentSandbox(aString) :
+           this.evalInChromeSandbox(aString);
+  },
+
+  /**
+   * Execute the selected text (if any) or the entire textbox content in the
+   * current context.
+   */
+  execute: function WS_execute()
+  {
+    let selection = this.selectedText || this.textbox.value;
+    let result = this.evalForContext(selection);
+    this.deselect();
+    return [selection, result];
+  },
+
+  /**
+   * Execute the selected text (if any) or the entire textbox content in the
+   * current context. The resulting object is opened up in the Property Panel
+   * for inspection.
+   */
+  inspect: function WS_inspect()
+  {
+    let [selection, result] = this.execute();
+
+    if (result) {
+      this.openPropertyPanel(selection, result);
+    }
+  },
+
+  /**
+   * Execute the selected text (if any) or the entire textbox content in the
+   * current context. The evaluation result is "printed" in the textbox after
+   * the selected text, or at the end of the textbox value if there is no
+   * selected text.
+   */
+  print: function WS_print()
+  {
+    let selectionStart = this.textbox.selectionStart;
+    let selectionEnd = this.textbox.selectionEnd;
+    if (selectionStart == selectionEnd) {
+      selectionEnd = this.textbox.value.length;
+    }
+
+    let [selection, result] = this.execute();
+    if (!result) {
+      return;
+    }
+
+    let firstPiece = this.textbox.value.slice(0, selectionEnd);
+    let lastPiece = this.textbox.value.
+                    slice(selectionEnd, this.textbox.value.length);
+
+    let newComment = "/*\n" + result.toString() + "\n*/";
+
+    this.textbox.value = firstPiece + newComment + lastPiece;
+
+    // Select the added comment.
+    this.selectRange(firstPiece.length, firstPiece.length + newComment.length);
+  },
+
+  /**
+   * Open the Property Panel to inspect the given object.
+   *
+   * @param string aEvalString
+   *        The string that was evaluated. This is re-used when the user updates
+   *        the properties list, by clicking the Update button.
+   * @param object aOutputObject
+   *        The object to inspect, which is the aEvalString evaluation result.
+   * @return object
+   *         The PropertyPanel object instance.
+   */
+  openPropertyPanel: function WS_openPropertyPanel(aEvalString, aOutputObject)
+  {
+    let self = this;
+    let propPanel;
+    // The property panel has a button:
+    // `Update`: reexecutes the string executed on the command line. The
+    // result will be inspected by this panel.
+    let buttons = [];
+
+    // If there is a evalString passed to this function, then add a `Update`
+    // button to the panel so that the evalString can be reexecuted to update
+    // the content of the panel.
+    if (aEvalString !== null) {
+      buttons.push({
+        label: this.strings.
+               GetStringFromName("propertyPanel.updateButton.label"),
+        accesskey: this.strings.
+                   GetStringFromName("propertyPanel.updateButton.accesskey"),
+        oncommand: function () {
+          try {
+            let result = self.evalForContext(aEvalString);
+
+            if (result !== undefined) {
+              propPanel.treeView.data = result;
+            }
+          }
+          catch (ex) { }
+        }
+      });
+    }
+
+    let doc = this.browserWindow.document;
+    let parent = doc.getElementById("mainPopupSet");
+    let title = aOutputObject.toString();
+    propPanel = new PropertyPanel(parent, doc, title, aOutputObject, buttons);
+
+    let panel = propPanel.panel;
+    panel.setAttribute("class", "workspace_propertyPanel");
+    panel.openPopup(null, "after_pointer", 0, 0, false, false);
+    panel.sizeTo(200, 400);
+
+    return propPanel;
+  },
+
+  // Menu Operations
+
+  /**
+   * Open a new Workspace window.
+   */
+  openWorkspace: function WS_openWorkspace()
+  {
+    Services.ww.openWindow(null, WORKSPACE_WINDOW_URL, "_blank",
+                           WORKSPACE_WINDOW_FEATURES, null);
+  },
+
+  /**
+   * Export the textbox content to a file.
+   *
+   * @param nsILocalFile aFile
+   *        The file where you want to save the textbox content.
+   * @param boolean aNoConfirmation
+   *        If the file already exists, ask for confirmation?
+   * @param boolean aSilentError
+   *        True if you do not want to display an error when file save fails,
+   *        false otherwise.
+   * @param function aCallback
+   *        Optional function you want to call when file save completes. It will
+   *        get the following arguments:
+   *        1) the nsresult status code for the export operation.
+   */
+  exportToFile: function WS_exportToFile(aFile, aNoConfirmation, aSilentError,
+                                         aCallback)
+  {
+    if (!aNoConfirmation && aFile.exists() &&
+        !window.confirm(this.strings.
+                        GetStringFromName("export.fileOverwriteConfirmation"))) {
+      return;
+    }
+
+    let fs = Cc["@mozilla.org/network/file-output-stream;1"].
+             createInstance(Ci.nsIFileOutputStream);
+    let modeFlags = 0x02 | 0x08 | 0x20;
+    fs.init(aFile, modeFlags, 0644, fs.DEFER_OPEN);
+
+    let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"].
+                    createInstance(Ci.nsIScriptableUnicodeConverter);
+    converter.charset = "UTF-8";
+    let input = converter.convertToInputStream(this.textbox.value);
+
+    let self = this;
+    NetUtil.asyncCopy(input, fs, function(aStatus) {
+      if (!aSilentError && !Components.isSuccessCode(aStatus)) {
+        window.alert(self.strings.GetStringFromName("saveFile.failed"));
+      }
+
+      if (aCallback) {
+        aCallback.call(self, aStatus);
+      }
+    });
+  },
+
+  /**
+   * Read the content of a file and put it into the textbox.
+   *
+   * @param nsILocalFile aFile
+   *        The file you want to save the textbox content into.
+   * @param boolean aSilentError
+   *        True if you do not want to display an error when file load fails,
+   *        false otherwise.
+   * @param function aCallback
+   *        Optional function you want to call when file load completes. It will
+   *        get the following arguments:
+   *        1) the nsresult status code for the import operation.
+   *        2) the data that was read from the file, if any.
+   */
+  importFromFile: function WS_importFromFile(aFile, aSilentError, aCallback)
+  {
+    // Prevent file type detection.
+    let channel = NetUtil.newChannel(aFile);
+    channel.contentType = "application/javascript";
+
+    let self = this;
+    NetUtil.asyncFetch(channel, function(aInputStream, aStatus) {
+      let content = null;
+
+      if (Components.isSuccessCode(aStatus)) {
+        content = NetUtil.readInputStreamToString(aInputStream,
+                                                  aInputStream.available());
+        self.textbox.value = content;
+      }
+      else if (!aSilentError) {
+        window.alert(self.strings.GetStringFromName("openFile.failed"));
+      }
+
+      if (aCallback) {
+        aCallback.call(self, aStatus, content);
+      }
+    });
+  },
+
+  /**
+   * Open a file to edit in the Workspace.
+   */
+  openFile: function WS_openFile()
+  {
+    let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
+    fp.init(window, this.strings.GetStringFromName("openFile.title"),
+            Ci.nsIFilePicker.modeOpen);
+    fp.defaultString = "";
+    if (fp.show() != Ci.nsIFilePicker.returnCancel) {
+      document.title = this.filename = fp.file.path;
+      this.importFromFile(fp.file);
+    }
+  },
+
+  /**
+   * Save the textbox content to the currently open file.
+   */
+  saveFile: function WS_saveFile()
+  {
+    if (!this.filename) {
+      return this.saveFileAs();
+    }
+
+    let file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsILocalFile);
+    file.initWithPath(this.filename);
+    this.exportToFile(file, true);
+  },
+
+  /**
+   * Save the textbox content to a new file.
+   */
+  saveFileAs: function WS_saveFileAs()
+  {
+    let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
+    fp.init(window, this.strings.GetStringFromName("saveFileAs"),
+            Ci.nsIFilePicker.modeSave);
+    fp.defaultString = "workspace.js";
+    if (fp.show() != Ci.nsIFilePicker.returnCancel) {
+      document.title = this.filename = fp.file.path;
+      this.exportToFile(fp.file);
+    }
+  },
+
+  /**
+   * Open the Error Console.
+   */
+  openErrorConsole: function WS_openErrorConsole()
+  {
+    this.browserWindow.toJavaScriptConsole();
+  },
+
+  /**
+   * Open the Web Console.
+   */
+  openWebConsole: function WS_openWebConsole()
+  {
+    if (!this.browserWindow.HUDConsoleUI.getOpenHUD()) {
+      this.browserWindow.HUDConsoleUI.toggleHUD();
+    }
+    this.browserWindow.focus();
+  },
+
+  /**
+   * Set the current execution context to be the active tab content window.
+   */
+  setContentContext: function WS_setContentContext()
+  {
+    let content = document.getElementById("ws-menu-content");
+    document.getElementById("ws-menu-chrome").removeAttribute("checked");
+    content.setAttribute("checked", true);
+    this.statusbarStatus.label = content.getAttribute("label");
+    this.executionContext = WORKSPACE_CONTEXT_CONTENT;
+  },
+
+  /**
+   * Set the current execution context to be the most recent chrome window.
+   */
+  setChromeContext: function WS_setChromeContext()
+  {
+    let chrome = document.getElementById("ws-menu-chrome");
+    document.getElementById("ws-menu-content").removeAttribute("checked");
+    chrome.setAttribute("checked", true);
+    this.statusbarStatus.label = chrome.getAttribute("label");
+    this.executionContext = WORKSPACE_CONTEXT_CHROME;
+  },
+
+  /**
+   * Gets the ID of the outer window of the given DOM window object.
+   *
+   * @param nsIDOMWindow aWindow
+   * @return integer
+   *         the outer window ID
+   */
+  getWindowId: function HS_getWindowId(aWindow)
+  {
+    return aWindow.QueryInterface(Ci.nsIInterfaceRequestor).
+           getInterface(Ci.nsIDOMWindowUtils).outerWindowID;
+  },
+};
+
+XPCOMUtils.defineLazyGetter(Workspace, "strings", function () {
+  return Services.strings.createBundle(WORKSPACE_L10N);
+});
+
diff --git a/browser/base/content/workspace.xul b/browser/base/content/workspace.xul
new file mode 100644
index 000000000000..625b486055db
--- /dev/null
+++ b/browser/base/content/workspace.xul
@@ -0,0 +1,331 @@
+<?xml version="1.0"?>
+#ifdef 0
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is Workspace.
+   -
+   - The Initial Developer of the Original Code is
+   - The Mozilla Foundation.
+   - Portions created by the Initial Developer are Copyright (C) 2011
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   Rob Campbell <robcee@mozilla.com> (original author)
+   -   Mihai Sucan <mihai.sucan@gmail.com>
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the GPL or the LGPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+#endif
+<!DOCTYPE window [
+<!ENTITY % workspaceDTD SYSTEM "chrome://browser/locale/workspace.dtd" >
+ %workspaceDTD;
+]>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
+
+<window id="main-window"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="&window.title;"
+        windowtype="devtools:workspace"
+        screenX="4" screenY="4"
+        width="640" height="480"
+        persist="screenX screenY width height sizemode">
+
+<script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
+<script type="application/javascript" src="chrome://browser/content/workspace.js"/>
+
+<commandset id="editMenuCommands"/>
+
+<commandset id="ws-commandset">
+  <command id="ws-cmd-newWindow" oncommand="Workspace.openWorkspace();"/>
+  <command id="ws-cmd-openFile" oncommand="Workspace.openFile();"/>
+  <command id="ws-cmd-save" oncommand="Workspace.saveFile();"/>
+  <command id="ws-cmd-saveas" oncommand="Workspace.saveFileAs();"/>
+
+  <!-- TODO: bug 650340 - implement printFile()
+  <command id="ws-cmd-printFile" oncommand="Workspace.printFile();" disabled="true"/>
+ -->
+
+  <command id="ws-cmd-close" oncommand="window.close();"/>
+  <command id="ws-cmd-execute" oncommand="Workspace.execute();"/>
+  <command id="ws-cmd-inspect" oncommand="Workspace.inspect();"/>
+  <command id="ws-cmd-print" oncommand="Workspace.print();"/>
+  <command id="ws-cmd-contentContext" oncommand="Workspace.setContentContext();"/>
+  <command id="ws-cmd-chromeContext" oncommand="Workspace.setChromeContext();"/>
+  <command id="ws-cmd-errorConsole" oncommand="Workspace.openErrorConsole();"/>
+  <command id="ws-cmd-webConsole" oncommand="Workspace.openWebConsole();"/>
+</commandset>
+
+<keyset id="ws-keyset">
+  <key id="ws-key-window"
+       key="&newWindowCmd.commandkey;"
+       command="ws-cmd-newWindow"
+       modifiers="accel"/>
+  <key id="ws-key-open"
+       key="&openFileCmd.commandkey;"
+       command="ws-cmd-openFile"
+       modifiers="accel"/>
+  <key id="ws-key-save"
+       key="&saveFileCmd.commandkey;"
+       command="ws-cmd-save"
+       modifiers="accel"/>
+  <key id="ws-key-close"
+       key="&closeCmd.key;"
+       command="ws-cmd-close"
+       modifiers="accel"/>
+
+  <!-- TODO: bug 650340 - implement printFile
+  <key id="ws-key-printFile"
+       key="&printCmd.commandkey;"
+       command="ws-cmd-printFile"
+       modifiers="accel"/>
+  -->
+
+  <key id="key_cut"
+       key="&cutCmd.key;"
+       modifiers="accel"/>
+
+  <key id="key_copy"
+       key="&copyCmd.key;"
+       modifiers="accel"/>
+  <key id="key_paste"
+       key="&pasteCmd.key;"
+       modifiers="accel"/>
+  <key id="key_selectAll" key="&selectAllCmd.key;" modifiers="accel"/>
+  <key id="key_undo" key="&undoCmd.key;" modifiers="accel"/>
+  <key id="key_redo" key="&undoCmd.key;" modifiers="accel,shift"/>
+  <key id="ws-key-execute"
+       key="&execute.key;"
+       command="ws-cmd-execute"
+       modifiers="accel"/>
+  <key id="ws-key-inspect"
+       key="&inspect.key;"
+       command="ws-cmd-inspect"
+       modifiers="accel"/>
+  <key id="ws-key-print"
+       key="&print.key;"
+       command="ws-cmd-print"
+       modifiers="accel"/>
+  <key id="ws-key-errorConsole"
+       key="&errorConsoleCmd.commandkey;"
+       command="ws-cmd-errorConsole"
+       modifiers="accel,shift"/>
+  <key id="ws-key-webConsole"
+       key="&webConsoleCmd.commandkey;"
+       command="ws-cmd-webConsole"
+       modifiers="accel,shift"/>
+</keyset>
+
+
+<menubar id="ws-menubar">
+  <menu id="ws-file-menu" label="&fileMenu.label;"
+        accesskey="&fileMenu.accesskey;">
+    <menupopup id="ws-menu-filepopup">
+      <menuitem id="ws-menu-newworkspace"
+                label="&newWindowCmd.label;"
+                accesskey="&newWindowCmd.accesskey;"
+                key="ws-key-window"
+                command="ws-cmd-newWindow"/>
+      <menuseparator/>
+      <menuitem id="ws-menu-open"
+                label="&openFileCmd.label;"
+                command="ws-cmd-openFile"
+                key="ws-key-open"
+                accesskey="&openFileCmd.accesskey;"/>
+      <menuitem id="ws-menu-save"
+                label="&saveFileCmd.label;"
+                accesskey="&saveFileCmd.accesskey;"
+                key="ws-key-save"
+                command="ws-cmd-save"/>
+      <menuitem id="ws-menu-saveas"
+                label="&saveFileAsCmd.label;"
+                accesskey="&saveFileAsCmd.accesskey;"
+                command="ws-cmd-saveas"/>
+      <menuseparator/>
+
+      <!-- TODO: bug 650340 - implement printFile
+      <menuitem id="ws-menu-print"
+                label="&printCmd.label;"
+                accesskey="&printCmd.accesskey;"
+                command="ws-cmd-printFile"/>
+      <menuseparator/>
+      -->
+
+      <menuitem id="ws-menu-close"
+                label="&closeCmd.label;"
+                key="ws-key-close"
+                accesskey="&closeCmd.accesskey;"
+                command="ws-cmd-close"/>
+    </menupopup>
+  </menu>
+
+  <menu id="ws-edit-menu" label="&editMenu.label;"
+        accesskey="&editMenu.accesskey;">
+    <menupopup id="ws-menu_editpopup">
+      <menuitem id="ws-menu_undo"
+                label="&undoCmd.label;"
+                key="key_undo"
+                accesskey="&undoCmd.accesskey;"
+                disabled="true"
+                oncommand="cmd_undo"/>
+      <menuitem id="ws-menu-redo"
+                label="&redoCmd.label;"
+                key="key_redo"
+                disabled="true"
+                accesskey="&redoCmd.accesskey;"
+                command="cmd_redo"/>
+      <menuseparator/>
+      <menuitem id="ws-menu-cut"
+                label="&cutCmd.label;"
+                key="key_cut"
+                accesskey="&cutCmd.accesskey;"
+                command="cmd_cut"/>
+      <menuitem id="ws-menu-copy"
+                label="&copyCmd.label;"
+                key="key_copy"
+                accesskey="&copyCmd.accesskey;"
+                command="cmd_copy"/>
+      <menuitem id="ws-menu-paste"
+                label="&pasteCmd.label;"
+                key="key_paste"
+                accesskey="&pasteCmd.accesskey;"
+                command="cmd_paste"/>
+      <menuseparator/>
+      <menuitem id="ws-menu-selectAll"
+                label="&selectAllCmd.label;"
+                key="key_selectAll"
+                accesskey="&selectAllCmd.accesskey;"
+                command="cmd_selectAll"/>
+      <menuseparator/>
+
+      <!-- TODO: bug 650345 - implement search and replace
+      <menuitem id="ws-menu-find"
+                label="&findOnCmd.label;"
+                accesskey="&findOnCmd.accesskey;"
+                key="key_find"
+                disabled="true"
+                command="cmd_find"/>
+      <menuitem id="ws-menu-findAgain"
+                label="&findAgainCmd.label;"
+                accesskey="&findAgainCmd.accesskey;"
+                key="key_findAgain"
+                disabled="true"
+                command="cmd_findAgain"/>
+      <menuseparator id="ws-execute-separator"/>
+      -->
+
+      <menuitem id="ws-text-execute"
+                label="&execute.label;"
+                accesskey="&execute.accesskey;"
+                key="ws-key-execute"
+                command="ws-cmd-execute"/>
+      <menuitem id="ws-text-inspect"
+                label="&inspect.label;"
+                accesskey="&inspect.accesskey;"
+                key="ws-key-inspect"
+                command="ws-cmd-inspect"/>
+      <menuitem id="ws-text-print"
+                label="&print.label;"
+                accesskey="&print.accesskey;"
+                key="ws-key-print"
+                command="ws-cmd-print"/>
+    </menupopup>
+  </menu>
+
+  <menu id="ws-context-menu"
+        label="&contextMenu.label;"
+        accesskey="&contextMenu.accesskey;">
+    <menupopup id="ws-menu-context">
+      <menuitem id="ws-menu-content"
+                label="&contentContext.label;"
+                accesskey="&contentContext.accesskey;"
+                command="ws-cmd-contentContext"
+                checked="true"
+                type="radio"/>
+      <menuitem id="ws-menu-chrome"
+                command="ws-cmd-chromeContext"
+                label="&chromeContext.label;"
+                accesskey="&chromeContext.accesskey;"
+                type="radio"/>
+    </menupopup>
+  </menu>
+
+  <menu id="ws-tools-menu"
+        label="&toolsMenu.label;"
+        accesskey="&toolsMenu.accesskey;">
+    <menupopup id="ws-menu-tools">
+      <menuitem id="ws-menu-errorConsole"
+                label="&errorConsoleCmd.label;"
+                accesskey="&errorConsoleCmd.accesskey;"
+                key="ws-key-errorConsole"
+                command="ws-cmd-errorConsole"/>
+      <menuitem id="ws-menu-webConsole"
+                label="&webConsoleCmd.label;"
+                accesskey="&webConsoleCmd.accesskey;"
+                key="ws-key-webConsole"
+                command="ws-cmd-webConsole"/>
+    </menupopup>
+  </menu>
+</menubar>
+
+<popupset id="workspace-popups">
+  <menupopup id="workspace-text-popup">
+    <menuitem id="menu_cut"/>
+    <menuitem id="menu_copy"/>
+    <menuitem id="menu_paste"/>
+    <menuitem id="menu_delete"/>
+    <menuseparator/>
+    <menuitem id="menu_selectAll"/>
+    <menuseparator/>
+    <menuitem id="ws-text-execute"
+              label="&execute.label;"
+              accesskey="&execute.accesskey;"
+              key="ws-key-execute"
+              command="ws-cmd-execute"/>
+    <menuitem id="ws-text-inspect"
+              label="&inspect.label;"
+              accesskey="&inspect.accesskey;"
+              key="ws-key-inspect"
+              command="ws-cmd-inspect"/>
+    <menuitem id="ws-text-print"
+              label="&print.label;"
+              accesskey="&print.accesskey;"
+              key="ws-key-print"
+              command="ws-cmd-print"/>
+  </menupopup>
+</popupset>
+
+<textbox id="workspace-textbox"
+         multiline="true"
+         flex="1"
+         context="workspace-text-popup"
+         placeholder="&textbox.placeholder;" />
+<statusbar id="workspace-statusbar" align="end">
+  <statusbarpanel id="workspace-status"
+                  label="&contentContext.label;"
+                  class="statusbarpanel-iconic-text"/>
+  <spacer flex="1"/>
+</statusbar>
+</window>
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index dbc7a62d07da..d427c70a196f 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -30,6 +30,8 @@ browser.jar:
 *       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
 *       content/browser/fullscreen-video.xhtml        (content/fullscreen-video.xhtml)
 *       content/browser/inspector.html                (content/inspector.html)
+*       content/browser/workspace.xul                 (content/workspace.xul)
+*       content/browser/workspace.js                  (content/workspace.js)
 *       content/browser/pageinfo/pageInfo.xul         (content/pageinfo/pageInfo.xul)
 *       content/browser/pageinfo/pageInfo.js          (content/pageinfo/pageInfo.js)
 *       content/browser/pageinfo/pageInfo.css         (content/pageinfo/pageInfo.css)
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 8d98ca9339bb..7202bee28d8f 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -191,6 +191,10 @@ can reach it easily. -->
 <!ENTITY inspectMenu.accesskey        "T">
 <!ENTITY inspectMenu.commandkey       "I">
 
+<!ENTITY workspace.label               "Workspace">
+<!ENTITY workspace.keycode             "VK_F4">
+<!ENTITY workspace.keytext             "F4">
+
 <!ENTITY inspectPanelTitle.label      "HTML">
 <!ENTITY inspectButton.label          "Inspect">
 <!ENTITY inspectButton.accesskey      "I">
diff --git a/browser/locales/en-US/chrome/browser/workspace.dtd b/browser/locales/en-US/chrome/browser/workspace.dtd
new file mode 100644
index 000000000000..d2ade7d685f8
--- /dev/null
+++ b/browser/locales/en-US/chrome/browser/workspace.dtd
@@ -0,0 +1,88 @@
+<!-- LOCALIZATION NOTE : FILE This file contains the Workspace window strings -->
+<!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
+
+<!ENTITY window.title                 "Workspace">
+
+<!ENTITY fileMenu.label               "File">
+<!ENTITY fileMenu.accesskey           "F">
+
+<!ENTITY newWindowCmd.label           "New Window">
+<!ENTITY newWindowCmd.accesskey       "N">
+<!ENTITY newWindowCmd.commandkey      "n">
+
+<!ENTITY openFileCmd.label            "Open File…">
+<!ENTITY openFileCmd.accesskey        "O">
+<!ENTITY openFileCmd.commandkey       "o">
+
+<!ENTITY saveFileCmd.label            "Save">
+<!ENTITY saveFileCmd.accesskey        "S">
+<!ENTITY saveFileCmd.commandkey       "s">
+
+<!ENTITY saveFileAsCmd.label          "Save As…">
+<!ENTITY saveFileAsCmd.accesskey      "A">
+
+<!ENTITY closeCmd.label               "Close">
+<!ENTITY closeCmd.key                 "W">
+<!ENTITY closeCmd.accesskey           "C">
+
+<!ENTITY editMenu.label               "Edit">
+<!ENTITY editMenu.accesskey           "E">
+
+<!ENTITY undoCmd.label                "Undo">
+<!ENTITY undoCmd.key                  "Z">
+<!ENTITY undoCmd.accesskey            "U">
+
+<!ENTITY redoCmd.label                "Redo">
+<!ENTITY redoCmd.key                  "Y">
+<!ENTITY redoCmd.accesskey            "R">
+
+<!ENTITY cutCmd.label                 "Cut">
+<!ENTITY cutCmd.key                   "X">
+<!ENTITY cutCmd.accesskey             "t">
+
+<!ENTITY copyCmd.label                "Copy">
+<!ENTITY copyCmd.key                  "C">
+<!ENTITY copyCmd.accesskey            "C">
+
+<!ENTITY pasteCmd.label               "Paste">
+<!ENTITY pasteCmd.key                 "V">
+<!ENTITY pasteCmd.accesskey           "P">
+
+<!ENTITY selectAllCmd.label           "Select All">
+<!ENTITY selectAllCmd.key             "A">
+<!ENTITY selectAllCmd.accesskey       "A">
+
+<!ENTITY execute.label                "Execute">
+<!ENTITY execute.accesskey            "E">
+<!ENTITY execute.key                  "t">
+
+<!ENTITY inspect.label                "Inspect">
+<!ENTITY inspect.accesskey            "I">
+<!ENTITY inspect.key                  "i">
+
+<!ENTITY print.label                  "Print">
+<!ENTITY print.accesskey              "p">
+<!ENTITY print.key                    "r">
+
+<!ENTITY contextMenu.label            "Context">
+<!ENTITY contextMenu.accesskey        "C">
+
+<!ENTITY contentContext.label         "Content">
+<!ENTITY contentContext.accesskey     "C">
+
+<!ENTITY chromeContext.label          "Chrome">
+<!ENTITY chromeContext.accesskey      "H">
+
+<!ENTITY toolsMenu.label              "Tools">
+<!ENTITY toolsMenu.accesskey          "T">
+
+<!ENTITY errorConsoleCmd.label        "Error Console">
+<!ENTITY errorConsoleCmd.accesskey    "C">
+<!ENTITY errorConsoleCmd.commandkey   "j">
+
+<!ENTITY webConsoleCmd.label          "Web Console">
+<!ENTITY webConsoleCmd.accesskey      "W">
+<!ENTITY webConsoleCmd.commandkey     "k">
+
+<!ENTITY textbox.placeholder          "// Enter some JavaScript, select it, right click and select Execute, Inspect or Print.">
+
diff --git a/browser/locales/en-US/chrome/browser/workspace.properties b/browser/locales/en-US/chrome/browser/workspace.properties
new file mode 100644
index 000000000000..3b0dbab5241c
--- /dev/null
+++ b/browser/locales/en-US/chrome/browser/workspace.properties
@@ -0,0 +1,30 @@
+# LOCALIZATION NOTE  (propertyPanel.updateButton.label): Used in the Property
+# Panel that is opened by the Workspace window when inspecting an object. This
+# is the Update button label.
+propertyPanel.updateButton.label=Update
+propertyPanel.updateButton.accesskey=U
+
+# LOCALIZATION NOTE  (export.fileOverwriteConfirmation): This is displayed when
+# the user attempts to save to an already existing file.
+export.fileOverwriteConfirmation=File exists. Overwrite?
+
+# LOCALIZATION NOTE  (browserWindow.unavailable): This error message is shown
+# when Workspace does not find any recently active window of navigator:browser
+# type.
+browserWindow.unavailable=Workspace cannot find any browser window where to execute the code.
+
+# LOCALIZATION NOTE  (openFile.title): This is the file picker title, when you
+# open a file from Workspace.
+openFile.title=Open File
+
+# LOCALIZATION NOTE  (openFile.failed): This is the message displayed when file
+# open fails.
+openFile.failed=Failed to read the file.
+
+# LOCALIZATION NOTE  (saveFileAs): This is the file picker title, when you save
+# a file in Workspace.
+saveFileAs=Save File As
+
+# LOCALIZATION NOTE  (saveFile.failed): This is the message displayed when file
+# save fails.
+saveFile.failed=The file save operation failed.
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
index 79b73fe55ea7..32b4a00759be 100644
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -15,6 +15,8 @@
     locale/browser/baseMenuOverlay.dtd             (%chrome/browser/baseMenuOverlay.dtd)
     locale/browser/browser.properties              (%chrome/browser/browser.properties)
     locale/browser/inspector.properties            (%chrome/browser/inspector.properties)
+    locale/browser/workspace.properties            (%chrome/browser/workspace.properties)
+    locale/browser/workspace.dtd                   (%chrome/browser/workspace.dtd)
     locale/browser/openLocation.dtd                (%chrome/browser/openLocation.dtd)
     locale/browser/openLocation.properties         (%chrome/browser/openLocation.properties)
 *   locale/browser/pageInfo.dtd                    (%chrome/browser/pageInfo.dtd)
diff --git a/toolkit/components/console/hudservice/HUDService.jsm b/toolkit/components/console/hudservice/HUDService.jsm
index b9ceec95daab..01240dce9bd7 100644
--- a/toolkit/components/console/hudservice/HUDService.jsm
+++ b/toolkit/components/console/hudservice/HUDService.jsm
@@ -5512,6 +5512,18 @@ HeadsUpDisplayUICommands = {
     }
   },
 
+  /**
+   * Find the hudId for the active chrome window.
+   * @return string|null
+   *         The hudId or null if the active chrome window has no open Web
+   *         Console.
+   */
+  getOpenHUD: function UIC_getOpenHUD() {
+    let chromeWindow = HUDService.currentContext();
+    let contentWindow = chromeWindow.gBrowser.selectedBrowser.contentWindow;
+    return HUDService.getHudIdByWindow(contentWindow);
+  },
+
   /**
    * The event handler that is called whenever a user switches a filter on or
    * off.

From 4cf675db3d15a77f5e76887b92dd46f904d59d6b Mon Sep 17 00:00:00 2001
From: Mihai Sucan <mihai.sucan@gmail.com>
Date: Tue, 19 Apr 2011 23:40:30 +0300
Subject: [PATCH 09/20] Bug 636725 - Unit tests for Workspaces;
 r=rcampbell,sdwilsh

---
 browser/base/content/test/Makefile.in         |   6 +
 .../test/browser_workspace_contexts.js        |  93 +++++++++++
 .../test/browser_workspace_execute_print.js   | 115 ++++++++++++++
 .../content/test/browser_workspace_files.js   | 149 ++++++++++++++++++
 .../test/browser_workspace_initialization.js  |  39 +++++
 .../content/test/browser_workspace_inspect.js |  65 ++++++++
 .../base/content/test/browser_workspace_ui.js |  80 ++++++++++
 7 files changed, 547 insertions(+)
 create mode 100644 browser/base/content/test/browser_workspace_contexts.js
 create mode 100644 browser/base/content/test/browser_workspace_execute_print.js
 create mode 100644 browser/base/content/test/browser_workspace_files.js
 create mode 100644 browser/base/content/test/browser_workspace_initialization.js
 create mode 100644 browser/base/content/test/browser_workspace_inspect.js
 create mode 100644 browser/base/content/test/browser_workspace_ui.js

diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index 286cb74dba5f..e4ec14f7113f 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -192,6 +192,12 @@ _BROWSER_FILES = \
                  browser_inspector_treePanel_output.js \
                  browser_inspector_treePanel_input.html \
                  browser_inspector_treePanel_result.html \
+                 browser_workspace_initialization.js \
+                 browser_workspace_contexts.js \
+                 browser_workspace_execute_print.js \
+                 browser_workspace_inspect.js \
+                 browser_workspace_files.js \
+                 browser_workspace_ui.js \
                  browser_overflowScroll.js \
                  browser_pageInfo.js \
                  browser_page_style_menu.js \
diff --git a/browser/base/content/test/browser_workspace_contexts.js b/browser/base/content/test/browser_workspace_contexts.js
new file mode 100644
index 000000000000..9bfb2566be8c
--- /dev/null
+++ b/browser/base/content/test/browser_workspace_contexts.js
@@ -0,0 +1,93 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Reference to the Workspace chrome window object.
+let gWorkspaceWindow;
+
+function test()
+{
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+
+    gWorkspaceWindow = Workspace.openWorkspace();
+    gWorkspaceWindow.addEventListener("load", runTests, false);
+  }, true);
+
+  content.location = "data:text/html,test context switch in Workspace";
+}
+
+function runTests()
+{
+  gWorkspaceWindow.removeEventListener("load", arguments.callee, false);
+
+  let ws = gWorkspaceWindow.Workspace;
+
+  let contentMenu = gWorkspaceWindow.document.getElementById("ws-menu-content");
+  let chromeMenu = gWorkspaceWindow.document.getElementById("ws-menu-chrome");
+  let statusbar = ws.statusbarStatus;
+
+  ok(contentMenu, "found #ws-menu-content");
+  ok(chromeMenu, "found #ws-menu-chrome");
+  ok(statusbar, "found Workspace.statusbarStatus");
+
+  ws.setContentContext();
+
+  is(ws.executionContext, gWorkspaceWindow.WORKSPACE_CONTEXT_CONTENT,
+     "executionContext is content");
+
+  is(contentMenu.getAttribute("checked"), "true",
+     "content menuitem is checked");
+
+  ok(!chromeMenu.hasAttribute("checked"),
+     "chrome menuitem is not checked");
+
+  is(statusbar.getAttribute("label"), contentMenu.getAttribute("label"),
+     "statusbar label is correct");
+
+  ok(ws.textbox, "textbox exists");
+  ws.textbox.value = "window.foobarBug636725 = 'aloha';";
+
+  ok(!content.wrappedJSObject.foobarBug636725,
+     "no content.foobarBug636725");
+
+  ws.execute();
+
+  is(content.wrappedJSObject.foobarBug636725, "aloha",
+     "content.foobarBug636725 has been set");
+
+  ws.setChromeContext();
+
+  is(ws.executionContext, gWorkspaceWindow.WORKSPACE_CONTEXT_CHROME,
+     "executionContext is chrome");
+
+  is(chromeMenu.getAttribute("checked"), "true",
+     "chrome menuitem is checked");
+
+  ok(!contentMenu.hasAttribute("checked"),
+     "content menuitem is not checked");
+
+  is(statusbar.getAttribute("label"), chromeMenu.getAttribute("label"),
+     "statusbar label is correct");
+
+  ws.textbox.value = "window.foobarBug636725 = 'aloha2';";
+
+  ok(!window.foobarBug636725, "no window.foobarBug636725");
+
+  ws.execute();
+
+  is(window.foobarBug636725, "aloha2", "window.foobarBug636725 has been set");
+
+  ws.textbox.value = "window.gBrowser";
+
+  is(typeof ws.execute()[1].addTab, "function",
+     "chrome context has access to chrome objects");
+
+  gWorkspaceWindow.close();
+  gWorkspaceWindow = null;
+  gBrowser.removeCurrentTab();
+  finish();
+}
diff --git a/browser/base/content/test/browser_workspace_execute_print.js b/browser/base/content/test/browser_workspace_execute_print.js
new file mode 100644
index 000000000000..3257b897ce7e
--- /dev/null
+++ b/browser/base/content/test/browser_workspace_execute_print.js
@@ -0,0 +1,115 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Reference to the Workspace chrome window object.
+let gWorkspaceWindow;
+
+function test()
+{
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+
+    gWorkspaceWindow = Workspace.openWorkspace();
+    gWorkspaceWindow.addEventListener("load", runTests, false);
+  }, true);
+
+  content.location = "data:text/html,<p>test execute() and print() in Workspace";
+}
+
+function runTests()
+{
+  gWorkspaceWindow.removeEventListener("load", arguments.callee, false);
+
+  let ws = gWorkspaceWindow.Workspace;
+
+  content.wrappedJSObject.foobarBug636725 = 1;
+
+  ok(ws.textbox, "textbox exists");
+  ws.textbox.value = "++window.foobarBug636725";
+
+  let exec = ws.execute();
+  is(exec[0], ws.textbox.value, "execute()[0] is correct");
+  is(exec[1], content.wrappedJSObject.foobarBug636725,
+     "execute()[1] is correct");
+
+  is(ws.textbox.value, "++window.foobarBug636725",
+     "execute() does not change the textbox value");
+
+  is(content.wrappedJSObject.foobarBug636725, 2,
+     "execute() updated window.foobarBug636725");
+
+  ws.print();
+
+  is(content.wrappedJSObject.foobarBug636725, 3,
+     "print() updated window.foobarBug636725");
+
+  is(ws.textbox.value, "++window.foobarBug636725/*\n3\n*/",
+     "print() shows evaluation result in the textbox");
+
+  is(ws.selectedText, "/*\n3\n*/", "selectedText is correct");
+  is(ws.textbox.selectionStart, 24, "selectionStart is correct");
+  is(ws.textbox.selectionEnd, 31, "selectionEnd is correct");
+
+  // Test selection execute() and print().
+
+  ws.textbox.value = "window.foobarBug636725 = 'a';\n" +
+                     "window.foobarBug636725 = 'b';";
+
+  ws.selectRange(1, 2);
+
+  is(ws.textbox.selectionStart, 1, "selectionStart is 1");
+  is(ws.textbox.selectionEnd, 2, "selectionEnd is 2");
+
+  ws.selectRange(0, 29);
+
+  is(ws.textbox.selectionStart, 0, "selectionStart is 0");
+  is(ws.textbox.selectionEnd, 29, "selectionEnd is 29");
+
+  exec = ws.execute();
+
+  is(exec[0], "window.foobarBug636725 = 'a';",
+     "execute()[0] is correct");
+  is(exec[1], "a",
+     "execute()[1] is correct");
+
+  is(ws.textbox.value, "window.foobarBug636725 = 'a';\n" +
+                       "window.foobarBug636725 = 'b';",
+     "execute() does not change the textbox value");
+
+  is(content.wrappedJSObject.foobarBug636725, "a",
+     "execute() worked for the selected range");
+
+  ws.textbox.value = "window.foobarBug636725 = 'c';\n" +
+                     "window.foobarBug636725 = 'b';";
+
+  ws.selectRange(0, 22);
+
+  ws.print();
+
+  is(content.wrappedJSObject.foobarBug636725, "a",
+     "print() worked for the selected range");
+
+  is(ws.textbox.value, "window.foobarBug636725" +
+                       "/*\na\n*/" +
+                       " = 'c';\n" +
+                       "window.foobarBug636725 = 'b';",
+     "print() shows evaluation result in the textbox");
+
+  is(ws.selectedText, "/*\na\n*/", "selectedText is correct");
+  is(ws.textbox.selectionStart, 22, "selectionStart is correct");
+  is(ws.textbox.selectionEnd, 29, "selectionEnd is correct");
+
+  ws.deselect();
+
+  ok(!ws.selectedText, "selectedText is empty");
+  is(ws.textbox.selectionStart, ws.textbox.selectionEnd, "deselect() works");
+
+  gWorkspaceWindow.close();
+  gWorkspaceWindow = null;
+  gBrowser.removeCurrentTab();
+  finish();
+}
diff --git a/browser/base/content/test/browser_workspace_files.js b/browser/base/content/test/browser_workspace_files.js
new file mode 100644
index 000000000000..478a60b31e0b
--- /dev/null
+++ b/browser/base/content/test/browser_workspace_files.js
@@ -0,0 +1,149 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+
+Cu.import("resource://gre/modules/NetUtil.jsm");
+Cu.import("resource://gre/modules/FileUtils.jsm");
+
+// Reference to the Workspace chrome window object.
+let gWorkspaceWindow;
+
+// Reference to the Workspace object.
+let gWorkspace;
+
+// Reference to the temporary nsIFile we will work with.
+let gFile;
+
+// The temporary file content.
+let gFileContent = "hello.world('bug636725');";
+
+function test()
+{
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+
+    gWorkspaceWindow = Workspace.openWorkspace();
+    gWorkspaceWindow.addEventListener("load", runTests, false);
+  }, true);
+
+  content.location = "data:text/html,<p>test file open and save in Workspace";
+}
+
+function runTests()
+{
+  gWorkspaceWindow.removeEventListener("load", arguments.callee, false);
+
+  gWorkspace = gWorkspaceWindow.Workspace;
+
+  // Create a temporary file.
+  gFile = FileUtils.getFile("TmpD", ["fileForBug636725.tmp"]);
+  gFile.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, 0666);
+
+  // Write the temporary file.
+  let fout = Cc["@mozilla.org/network/file-output-stream;1"].
+             createInstance(Ci.nsIFileOutputStream);
+  fout.init(gFile.QueryInterface(Ci.nsILocalFile), 0x02 | 0x08 | 0x20,
+            0644, fout.DEFER_OPEN);
+
+  let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"].
+                  createInstance(Ci.nsIScriptableUnicodeConverter);
+  converter.charset = "UTF-8";
+  let fileContentStream = converter.convertToInputStream(gFileContent);
+
+  NetUtil.asyncCopy(fileContentStream, fout, tempFileSaved);
+}
+
+function tempFileSaved(aStatus)
+{
+  ok(Components.isSuccessCode(aStatus),
+     "the temporary file was saved successfully");
+
+  // Import the file into Workspace.
+  gWorkspace.importFromFile(gFile.QueryInterface(Ci.nsILocalFile),  true,
+                            fileImported);
+}
+
+function fileImported(aStatus, aFileContent)
+{
+  ok(Components.isSuccessCode(aStatus),
+     "the temporary file was imported successfully with Workspace");
+
+  is(aFileContent, gFileContent,
+     "received data is correct");
+
+  is(gWorkspace.textbox.value, gFileContent,
+     "the textbox.value is correct");
+
+  // Save the file after changes.
+  gFileContent += "// omg, saved!";
+  gWorkspace.textbox.value = gFileContent;
+
+  gWorkspace.exportToFile(gFile.QueryInterface(Ci.nsILocalFile), true, true,
+                          fileExported);
+}
+
+function fileExported(aStatus)
+{
+  ok(Components.isSuccessCode(aStatus),
+     "the temporary file was exported successfully with Workspace");
+
+  let oldContent = gFileContent;
+
+  // Attempt another file save, with confirmation which returns false.
+  gFileContent += "// omg, saved twice!";
+  gWorkspace.textbox.value = gFileContent;
+
+  let oldConfirm = gWorkspaceWindow.confirm;
+  let askedConfirmation = false;
+  gWorkspaceWindow.confirm = function() {
+    askedConfirmation = true;
+    return false;
+  };
+
+  gWorkspace.exportToFile(gFile.QueryInterface(Ci.nsILocalFile), false, true,
+                          fileExported2);
+
+  gWorkspaceWindow.confirm = oldConfirm;
+
+  ok(askedConfirmation, "exportToFile() asked for overwrite confirmation");
+
+  gFileContent = oldContent;
+
+  let channel = NetUtil.newChannel(gFile);
+  channel.contentType = "application/javascript";
+
+  // Read back the temporary file.
+  NetUtil.asyncFetch(channel, fileRead);
+}
+
+function fileExported2()
+{
+  ok(false, "exportToFile() did not cancel file overwrite");
+}
+
+function fileRead(aInputStream, aStatus)
+{
+  ok(Components.isSuccessCode(aStatus),
+     "the temporary file was read back successfully");
+
+  let updatedContent =
+    NetUtil.readInputStreamToString(aInputStream, aInputStream.available());;
+
+  is(updatedContent, gFileContent, "file properly updated");
+
+  // Done!
+  gFile.remove(false);
+  gFile = null;
+  gWorkspace = null;
+  gWorkspaceWindow.close();
+  gWorkspaceWindow = null;
+  gBrowser.removeCurrentTab();
+  finish();
+}
diff --git a/browser/base/content/test/browser_workspace_initialization.js b/browser/base/content/test/browser_workspace_initialization.js
new file mode 100644
index 000000000000..9306c546ffef
--- /dev/null
+++ b/browser/base/content/test/browser_workspace_initialization.js
@@ -0,0 +1,39 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Reference to the Workspace chrome window object.
+let gWorkspaceWindow;
+
+function test()
+{
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+
+    ok(Workspace, "Workspace variable exists");
+
+    gWorkspaceWindow = Workspace.openWorkspace();
+    gWorkspaceWindow.addEventListener("load", runTests, false);
+  }, true);
+
+  content.location = "data:text/html,initialization test for Workspace";
+}
+
+function runTests()
+{
+  gWorkspaceWindow.removeEventListener("load", arguments.callee, false);
+
+  let ws = gWorkspaceWindow.Workspace;
+  ok(ws, "Workspace object exists in new window");
+  is(typeof ws.execute, "function", "Workspace.execute() exists");
+  is(typeof ws.inspect, "function", "Workspace.inspect() exists");
+  is(typeof ws.print, "function", "Workspace.print() exists");
+
+  gWorkspaceWindow.close();
+  gWorkspaceWindow = null;
+  gBrowser.removeCurrentTab();
+  finish();
+}
diff --git a/browser/base/content/test/browser_workspace_inspect.js b/browser/base/content/test/browser_workspace_inspect.js
new file mode 100644
index 000000000000..e0cc6ddacca1
--- /dev/null
+++ b/browser/base/content/test/browser_workspace_inspect.js
@@ -0,0 +1,65 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Reference to the Workspace chrome window object.
+let gWorkspaceWindow;
+
+function test()
+{
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+
+    gWorkspaceWindow = Workspace.openWorkspace();
+    gWorkspaceWindow.addEventListener("load", runTests, false);
+  }, true);
+
+  content.location = "data:text/html,<title>foobarBug636725</title>" +
+    "<p>test inspect() in Workspace";
+}
+
+function runTests()
+{
+  gWorkspaceWindow.removeEventListener("load", arguments.callee, false);
+
+  let ws = gWorkspaceWindow.Workspace;
+
+  ok(ws.textbox, "textbox exists");
+  ws.textbox.value = "document";
+
+  ws.inspect();
+
+  let propPanel = document.querySelector(".workspace_propertyPanel");
+  ok(propPanel, "property panel is open");
+
+  propPanel.addEventListener("popupshown", function() {
+    propPanel.removeEventListener("popupshown", arguments.callee, false);
+
+    let tree = propPanel.querySelector("tree");
+    ok(tree, "property panel tree found");
+
+    let column = tree.columns[0];
+    let found = false;
+
+    for (let i = 0; i < tree.view.rowCount; i++) {
+      let cell = tree.view.getCellText(i, column);
+      if (cell == 'title: "foobarBug636725"') {
+        found = true;
+        break;
+      }
+    }
+    ok(found, "found the document.title property");
+
+    executeSoon(function() {
+      propPanel.hidePopup();
+
+      gWorkspaceWindow.close();
+      gWorkspaceWindow = null;
+      gBrowser.removeCurrentTab();
+      finish();
+    });
+  }, false);
+}
diff --git a/browser/base/content/test/browser_workspace_ui.js b/browser/base/content/test/browser_workspace_ui.js
new file mode 100644
index 000000000000..1fcc6a22b3d4
--- /dev/null
+++ b/browser/base/content/test/browser_workspace_ui.js
@@ -0,0 +1,80 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Reference to the Workspace chrome window object.
+let gWorkspaceWindow;
+
+function test()
+{
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+
+    gWorkspaceWindow = Workspace.openWorkspace();
+    gWorkspaceWindow.addEventListener("load", runTests, false);
+  }, true);
+
+  content.location = "data:text/html,<title>foobarBug636725</title>" +
+    "<p>test inspect() in Workspace";
+}
+
+function runTests()
+{
+  gWorkspaceWindow.removeEventListener("load", arguments.callee, false);
+
+  let ws = gWorkspaceWindow.Workspace;
+  let doc = gWorkspaceWindow.document;
+
+  let methodsAndItems = {
+    "ws-menu-newworkspace": "openWorkspace",
+    "ws-menu-open": "openFile",
+    "ws-menu-save": "saveFile",
+    "ws-menu-saveas": "saveFileAs",
+    "ws-text-execute": "execute",
+    "ws-text-inspect": "inspect",
+    "ws-menu-content": "setContentContext",
+    "ws-menu-chrome": "setChromeContext",
+    "ws-menu-errorConsole": "openErrorConsole",
+    "ws-menu-webConsole": "openWebConsole",
+  };
+
+  let lastMethodCalled = null;
+  ws.__noSuchMethod__ = function(aMethodName) {
+    lastMethodCalled = aMethodName;
+  };
+
+  for (let id in methodsAndItems) {
+    lastMethodCalled = null;
+
+    let methodName = methodsAndItems[id];
+    let oldMethod = ws[methodName];
+    ok(oldMethod, "found method " + methodName + " in Workspace object");
+
+    delete ws[methodName];
+
+    let menu = doc.getElementById(id);
+    ok(menu, "found menuitem #" + id);
+
+    try {
+      menu.doCommand();
+    }
+    catch (ex) {
+      ok(false, "exception thrown while executing the command of menuitem #" + id);
+    }
+
+    ok(lastMethodCalled == methodName,
+       "method " + methodName + " invoked by the associated menuitem");
+
+    ws[methodName] = oldMethod;
+  }
+
+  delete ws.__noSuchMethod__;
+
+  gWorkspaceWindow.close();
+  gWorkspaceWindow = null;
+  gBrowser.removeCurrentTab();
+  finish();
+}

From 5f07973699b7658da1d536ea6eea7877b8a89867 Mon Sep 17 00:00:00 2001
From: Adam <unusualtears@gmail.com>
Date: Tue, 19 Apr 2011 12:40:36 -0500
Subject: [PATCH 10/20] Bug 626484 - Incorrect order of lines when copying from
 web console; f=rcampbell,mihai.sucan r=mihai.sucan,gavin.sharp

---
 .../console/hudservice/HUDService.jsm         | 10 ++-
 .../hudservice/tests/browser/Makefile.in      |  1 +
 ...webconsole_bug_626484_output_copy_order.js | 61 +++++++++++++++++++
 3 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_626484_output_copy_order.js

diff --git a/toolkit/components/console/hudservice/HUDService.jsm b/toolkit/components/console/hudservice/HUDService.jsm
index 01240dce9bd7..fd5122dd61a1 100644
--- a/toolkit/components/console/hudservice/HUDService.jsm
+++ b/toolkit/components/console/hudservice/HUDService.jsm
@@ -2981,8 +2981,14 @@ HUD_SERVICE.prototype =
 
     let strings = [];
     let newGroup = false;
-    for (let i = 0; i < aOutputNode.selectedCount; i++) {
-      let item = aOutputNode.selectedItems[i];
+
+    let children = aOutputNode.children;
+
+    for (let i = 0; i < children.length; i++) {
+      let item = children[i];
+      if (!item.selected) {
+        continue;
+      }
 
       // Add dashes between groups so that group boundaries show up in the
       // copied output.
diff --git a/toolkit/components/console/hudservice/tests/browser/Makefile.in b/toolkit/components/console/hudservice/tests/browser/Makefile.in
index 718aeea47eaa..40aee0b60672 100644
--- a/toolkit/components/console/hudservice/tests/browser/Makefile.in
+++ b/toolkit/components/console/hudservice/tests/browser/Makefile.in
@@ -128,6 +128,7 @@ _BROWSER_TEST_FILES = \
 	browser_webconsole_bug_611795.js \
 	browser_webconsole_bug_618311_close_panels.js \
 	browser_webconsole_bug_618311_private_browsing.js \
+	browser_webconsole_bug_626484_output_copy_order.js \
 	browser_webconsole_bug_632347_iterators_generators.js \
 	browser_webconsole_bug_642108_refForOutputNode.js \
 	browser_webconsole_bug_642108_pruneTest.js \
diff --git a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_626484_output_copy_order.js b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_626484_output_copy_order.js
new file mode 100644
index 000000000000..b101619a7a47
--- /dev/null
+++ b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_626484_output_copy_order.js
@@ -0,0 +1,61 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+let itemsSet;
+
+function test() {
+  addTab("data:text/html,Web Console test for bug 626484");
+  browser.addEventListener("load", tabLoaded, true);
+}
+
+function tabLoaded(aEvent) {
+  browser.removeEventListener(aEvent.type, arguments.callee, true);
+  openConsole();
+
+  let console = browser.contentWindow.wrappedJSObject.console;
+  console.log("The first line.");
+  console.log("The second line.");
+  console.log("The last line.");
+
+  let hudId = HUDService.getHudIdByWindow(content);
+  HUD = HUDService.hudReferences[hudId];
+  outputNode = HUD.outputNode;
+
+  itemsSet = [[0, 1, 2], [0, 2, 1], [1, 0, 2], [1, 2, 0], [2, 0, 1],
+    [2, 1, 0]];
+
+  nextTest();
+}
+
+function nextTest() {
+  if (itemsSet.length === 0) {
+    outputNode.clearSelection();
+    HUD.jsterm.clearOutput();
+    finish();
+  }
+  else {
+    outputNode.clearSelection();
+    let items = itemsSet.shift();
+    items.forEach(function (index) {
+      outputNode.addItemToSelection(outputNode.getItemAtIndex(index));
+    });
+    outputNode.focus();
+    waitForClipboard(getExpectedClipboardText(items.length),
+      clipboardSetup, nextTest, nextTest);
+  }
+}
+
+function getExpectedClipboardText(aItemCount) {
+  let expectedClipboardText = [];
+  for (let i = 0; i < aItemCount; i++) {
+    let item = outputNode.getItemAtIndex(i);
+    expectedClipboardText.push("[" +
+      ConsoleUtils.timestampString(item.timestamp) + "] " +
+      item.clipboardText);
+  }
+  return expectedClipboardText.join("\n");
+}
+
+function clipboardSetup() {
+  goDoCommand("cmd_copy");
+}
+

From bfbf6f773a5168915fc46cb38b3d614f4956f680 Mon Sep 17 00:00:00 2001
From: Mihai Sucan <mihai.sucan@gmail.com>
Date: Tue, 19 Apr 2011 23:42:56 +0300
Subject: [PATCH 11/20] Bug 646070 - Respect chrome developer tools preference
 in workspace; f=rcampbell r=sdwilsh

---
 browser/app/profile/firefox.js                |  3 +
 browser/base/content/test/Makefile.in         |  1 +
 ...orkspace_bug_646070_chrome_context_pref.js | 66 +++++++++++++++++++
 .../test/browser_workspace_initialization.js  | 22 +++++++
 browser/base/content/workspace.js             | 22 +++++++
 browser/base/content/workspace.xul            |  8 +--
 6 files changed, 118 insertions(+), 4 deletions(-)
 create mode 100644 browser/base/content/test/browser_workspace_bug_646070_chrome_context_pref.js

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index f71d071e2cd2..fdec6aecbc2f 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1050,6 +1050,9 @@ pref("devtools.inspector.enabled", false);
 // Enable the Workspace tool.
 pref("devtools.workspace.enabled", true);
 
+// Enable tools for Chrome development.
+pref("devtools.chrome.enabled", false);
+
 // The last Web Console height. This is initially 0 which means that the Web
 // Console will use the default height next time it shows.
 // Change to -1 if you do not want the Web Console to remember its last height.
diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index e4ec14f7113f..0cb6c6422cdb 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -198,6 +198,7 @@ _BROWSER_FILES = \
                  browser_workspace_inspect.js \
                  browser_workspace_files.js \
                  browser_workspace_ui.js \
+                 browser_workspace_bug_646070_chrome_context_pref.js \
                  browser_overflowScroll.js \
                  browser_pageInfo.js \
                  browser_page_style_menu.js \
diff --git a/browser/base/content/test/browser_workspace_bug_646070_chrome_context_pref.js b/browser/base/content/test/browser_workspace_bug_646070_chrome_context_pref.js
new file mode 100644
index 000000000000..514951db23ab
--- /dev/null
+++ b/browser/base/content/test/browser_workspace_bug_646070_chrome_context_pref.js
@@ -0,0 +1,66 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Reference to the Workspace chrome window object.
+let gWorkspaceWindow;
+
+let gOldPref;
+let DEVTOOLS_CHROME_ENABLED = "devtools.chrome.enabled";
+
+function test()
+{
+  waitForExplicitFinish();
+
+  gOldPref = Services.prefs.getBoolPref(DEVTOOLS_CHROME_ENABLED);
+  Services.prefs.setBoolPref(DEVTOOLS_CHROME_ENABLED, true);
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+
+    ok(Workspace, "Workspace variable exists");
+
+    gWorkspaceWindow = Workspace.openWorkspace();
+    gWorkspaceWindow.addEventListener("load", runTests, false);
+  }, true);
+
+  content.location = "data:text/html,Workspace test for bug 646070 - chrome context preference";
+}
+
+function runTests()
+{
+  gWorkspaceWindow.removeEventListener("load", arguments.callee, false);
+
+  let ws = gWorkspaceWindow.Workspace;
+  ok(ws, "Workspace object exists in new window");
+
+  let contextMenu = gWorkspaceWindow.document.getElementById("ws-context-menu");
+  ok(contextMenu, "Context menu element exists");
+  ok(!contextMenu.hasAttribute("hidden"), "Context menu is visible");
+
+  let errorConsoleCommand = gWorkspaceWindow.document.
+                            getElementById("ws-cmd-errorConsole");
+  ok(errorConsoleCommand, "Error console command element exists");
+  ok(!errorConsoleCommand.hasAttribute("disabled"),
+     "Error console command is enabled");
+
+  let errorConsoleMenu = gWorkspaceWindow.document.
+                         getElementById("ws-menu-errorConsole");
+  ok(errorConsoleMenu, "Error console menu element exists");
+  ok(!errorConsoleMenu.hasAttribute("hidden"),
+     "Error console menuitem is visible");
+
+  let chromeContextCommand = gWorkspaceWindow.document.
+                            getElementById("ws-cmd-chromeContext");
+  ok(chromeContextCommand, "Chrome context command element exists");
+  ok(!chromeContextCommand.hasAttribute("disabled"),
+     "Chrome context command is disabled");
+
+  Services.prefs.setBoolPref(DEVTOOLS_CHROME_ENABLED, gOldPref);
+
+  gWorkspaceWindow.close();
+  gWorkspaceWindow = null;
+  gBrowser.removeCurrentTab();
+  finish();
+}
diff --git a/browser/base/content/test/browser_workspace_initialization.js b/browser/base/content/test/browser_workspace_initialization.js
index 9306c546ffef..ef1fa9a893c9 100644
--- a/browser/base/content/test/browser_workspace_initialization.js
+++ b/browser/base/content/test/browser_workspace_initialization.js
@@ -32,6 +32,28 @@ function runTests()
   is(typeof ws.inspect, "function", "Workspace.inspect() exists");
   is(typeof ws.print, "function", "Workspace.print() exists");
 
+  let contextMenu = gWorkspaceWindow.document.getElementById("ws-context-menu");
+  ok(contextMenu, "Context menu element exists");
+  is(contextMenu.getAttribute("hidden"), "true", "Context menu is hidden");
+
+  let errorConsoleCommand = gWorkspaceWindow.document.
+                            getElementById("ws-cmd-errorConsole");
+  ok(errorConsoleCommand, "Error console command element exists");
+  is(errorConsoleCommand.getAttribute("disabled"), "true",
+     "Error console command is disabled");
+
+  let errorConsoleMenu = gWorkspaceWindow.document.
+                         getElementById("ws-menu-errorConsole");
+  ok(errorConsoleMenu, "Error console menu element exists");
+  is(errorConsoleMenu.getAttribute("hidden"), "true",
+     "Error console menu item is hidden");
+
+  let chromeContextCommand = gWorkspaceWindow.document.
+                            getElementById("ws-cmd-chromeContext");
+  ok(chromeContextCommand, "Chrome context command element exists");
+  is(chromeContextCommand.getAttribute("disabled"), "true",
+     "Chrome context command is disabled");
+
   gWorkspaceWindow.close();
   gWorkspaceWindow = null;
   gBrowser.removeCurrentTab();
diff --git a/browser/base/content/workspace.js b/browser/base/content/workspace.js
index 0f69fca8bac3..bd134fdf8c65 100644
--- a/browser/base/content/workspace.js
+++ b/browser/base/content/workspace.js
@@ -53,6 +53,7 @@ const WORKSPACE_CONTEXT_CHROME = 2;
 const WORKSPACE_WINDOW_URL = "chrome://browser/content/workspace.xul";
 const WORKSPACE_L10N = "chrome://browser/locale/workspace.properties";
 const WORKSPACE_WINDOW_FEATURES = "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no";
+const DEVTOOLS_CHROME_ENABLED = "devtools.chrome.enabled";
 
 /**
  * The workspace object handles the Workspace window functionality.
@@ -544,9 +545,30 @@ var Workspace = {
     return aWindow.QueryInterface(Ci.nsIInterfaceRequestor).
            getInterface(Ci.nsIDOMWindowUtils).outerWindowID;
   },
+
+  /**
+   * The Workspace window DOMContentLoaded event handler.
+   */
+  onLoad: function HS_onLoad()
+  {
+    let contextMenu = document.getElementById("ws-context-menu");
+    let errorConsoleMenu = document.getElementById("ws-menu-errorConsole");
+    let errorConsoleCommand = document.getElementById("ws-cmd-errorConsole");
+    let chromeContextCommand = document.getElementById("ws-cmd-chromeContext");
+
+    let chrome = Services.prefs.getBoolPref(DEVTOOLS_CHROME_ENABLED);
+    if (chrome) {
+      contextMenu.removeAttribute("hidden");
+      errorConsoleMenu.removeAttribute("hidden");
+      errorConsoleCommand.removeAttribute("disabled");
+      chromeContextCommand.removeAttribute("disabled");
+    }
+  },
 };
 
 XPCOMUtils.defineLazyGetter(Workspace, "strings", function () {
   return Services.strings.createBundle(WORKSPACE_L10N);
 });
 
+addEventListener("DOMContentLoaded", Workspace.onLoad.bind(Workspace), false);
+
diff --git a/browser/base/content/workspace.xul b/browser/base/content/workspace.xul
index 625b486055db..c2b6074d1241 100644
--- a/browser/base/content/workspace.xul
+++ b/browser/base/content/workspace.xul
@@ -73,8 +73,8 @@
   <command id="ws-cmd-inspect" oncommand="Workspace.inspect();"/>
   <command id="ws-cmd-print" oncommand="Workspace.print();"/>
   <command id="ws-cmd-contentContext" oncommand="Workspace.setContentContext();"/>
-  <command id="ws-cmd-chromeContext" oncommand="Workspace.setChromeContext();"/>
-  <command id="ws-cmd-errorConsole" oncommand="Workspace.openErrorConsole();"/>
+  <command id="ws-cmd-chromeContext" oncommand="Workspace.setChromeContext();" disabled="true"/>
+  <command id="ws-cmd-errorConsole" oncommand="Workspace.openErrorConsole();" disabled="true"/>
   <command id="ws-cmd-webConsole" oncommand="Workspace.openWebConsole();"/>
 </commandset>
 
@@ -254,7 +254,7 @@
     </menupopup>
   </menu>
 
-  <menu id="ws-context-menu"
+  <menu id="ws-context-menu" hidden="true"
         label="&contextMenu.label;"
         accesskey="&contextMenu.accesskey;">
     <menupopup id="ws-menu-context">
@@ -276,7 +276,7 @@
         label="&toolsMenu.label;"
         accesskey="&toolsMenu.accesskey;">
     <menupopup id="ws-menu-tools">
-      <menuitem id="ws-menu-errorConsole"
+      <menuitem id="ws-menu-errorConsole" hidden="true"
                 label="&errorConsoleCmd.label;"
                 accesskey="&errorConsoleCmd.accesskey;"
                 key="ws-key-errorConsole"

From 19eba7bd60fbfd86f0eee1a9646725419879bd1f Mon Sep 17 00:00:00 2001
From: Mihai Sucan <mihai.sucan@gmail.com>
Date: Thu, 21 Apr 2011 11:24:30 +0300
Subject: [PATCH 12/20] Bug 646524 - Workspace: cache the sandboxes;
 f=rcampbell r=ddahl,sdwilsh

---
 ...orkspace_bug_646070_chrome_context_pref.js |  8 ++-
 .../test/browser_workspace_contexts.js        | 32 +++++++++
 .../test/browser_workspace_initialization.js  |  8 ++-
 .../base/content/test/browser_workspace_ui.js |  1 +
 browser/base/content/workspace.js             | 70 +++++++++++++++----
 browser/base/content/workspace.xul            | 10 ++-
 .../en-US/chrome/browser/workspace.dtd        |  6 ++
 7 files changed, 114 insertions(+), 21 deletions(-)

diff --git a/browser/base/content/test/browser_workspace_bug_646070_chrome_context_pref.js b/browser/base/content/test/browser_workspace_bug_646070_chrome_context_pref.js
index 514951db23ab..bc622bca1fe1 100644
--- a/browser/base/content/test/browser_workspace_bug_646070_chrome_context_pref.js
+++ b/browser/base/content/test/browser_workspace_bug_646070_chrome_context_pref.js
@@ -35,9 +35,11 @@ function runTests()
   let ws = gWorkspaceWindow.Workspace;
   ok(ws, "Workspace object exists in new window");
 
-  let contextMenu = gWorkspaceWindow.document.getElementById("ws-context-menu");
-  ok(contextMenu, "Context menu element exists");
-  ok(!contextMenu.hasAttribute("hidden"), "Context menu is visible");
+  let chromeContextMenu = gWorkspaceWindow.document.
+                          getElementById("ws-menu-chrome");
+  ok(chromeContextMenu, "Chrome context menuitem element exists");
+  ok(!chromeContextMenu.hasAttribute("hidden"),
+     "Chrome context menuitem is visible");
 
   let errorConsoleCommand = gWorkspaceWindow.document.
                             getElementById("ws-cmd-errorConsole");
diff --git a/browser/base/content/test/browser_workspace_contexts.js b/browser/base/content/test/browser_workspace_contexts.js
index 9bfb2566be8c..6cc8f18edaa3 100644
--- a/browser/base/content/test/browser_workspace_contexts.js
+++ b/browser/base/content/test/browser_workspace_contexts.js
@@ -86,6 +86,38 @@ function runTests()
   is(typeof ws.execute()[1].addTab, "function",
      "chrome context has access to chrome objects");
 
+  // Check that the sandbox is cached.
+
+  ws.textbox.value = "typeof foobarBug636725cache;";
+  is(ws.execute()[1], "undefined", "global variable does not exist");
+
+  ws.textbox.value = "var foobarBug636725cache = 'foo';";
+  ws.execute();
+
+  ws.textbox.value = "typeof foobarBug636725cache;";
+  is(ws.execute()[1], "string",
+     "global variable exists across two different executions");
+
+  ws.resetContext();
+
+  is(ws.execute()[1], "undefined",
+     "global variable no longer exists after calling resetContext()");
+
+  ws.textbox.value = "var foobarBug636725cache2 = 'foo';";
+  ws.execute();
+
+  ws.textbox.value = "typeof foobarBug636725cache2;";
+  is(ws.execute()[1], "string",
+     "global variable exists across two different executions");
+
+  ws.setContentContext();
+
+  is(ws.executionContext, gWorkspaceWindow.WORKSPACE_CONTEXT_CONTENT,
+     "executionContext is content");
+
+  is(ws.execute()[1], "undefined",
+     "global variable no longer exists after changing the context");
+
   gWorkspaceWindow.close();
   gWorkspaceWindow = null;
   gBrowser.removeCurrentTab();
diff --git a/browser/base/content/test/browser_workspace_initialization.js b/browser/base/content/test/browser_workspace_initialization.js
index ef1fa9a893c9..3e0218215fc6 100644
--- a/browser/base/content/test/browser_workspace_initialization.js
+++ b/browser/base/content/test/browser_workspace_initialization.js
@@ -32,9 +32,11 @@ function runTests()
   is(typeof ws.inspect, "function", "Workspace.inspect() exists");
   is(typeof ws.print, "function", "Workspace.print() exists");
 
-  let contextMenu = gWorkspaceWindow.document.getElementById("ws-context-menu");
-  ok(contextMenu, "Context menu element exists");
-  is(contextMenu.getAttribute("hidden"), "true", "Context menu is hidden");
+  let chromeContextMenu = gWorkspaceWindow.document.
+                          getElementById("ws-menu-chrome");
+  ok(chromeContextMenu, "Chrome context menuitem element exists");
+  is(chromeContextMenu.getAttribute("hidden"), "true",
+     "Chrome context menuitem is hidden");
 
   let errorConsoleCommand = gWorkspaceWindow.document.
                             getElementById("ws-cmd-errorConsole");
diff --git a/browser/base/content/test/browser_workspace_ui.js b/browser/base/content/test/browser_workspace_ui.js
index 1fcc6a22b3d4..b1af4447e148 100644
--- a/browser/base/content/test/browser_workspace_ui.js
+++ b/browser/base/content/test/browser_workspace_ui.js
@@ -37,6 +37,7 @@ function runTests()
     "ws-text-inspect": "inspect",
     "ws-menu-content": "setContentContext",
     "ws-menu-chrome": "setChromeContext",
+    "ws-menu-resetContext": "resetContext",
     "ws-menu-errorConsole": "openErrorConsole",
     "ws-menu-webConsole": "openWebConsole",
   };
diff --git a/browser/base/content/workspace.js b/browser/base/content/workspace.js
index bd134fdf8c65..e1abf7ce76c9 100644
--- a/browser/base/content/workspace.js
+++ b/browser/base/content/workspace.js
@@ -97,6 +97,12 @@ var Workspace = {
    */
   get browserWindow() Services.wm.getMostRecentWindow("navigator:browser"),
 
+  /**
+   * Reference to the last chrome window of type navigator:browser. We use this
+   * to check if the chrome window changed since the last code evaluation.
+   */
+  _previousWindow: null,
+
   /**
    * Get the gBrowser object of the most recent browser window.
    */
@@ -107,7 +113,15 @@ var Workspace = {
   },
 
   /**
-   * Get the Cu.Sandbox object for the active tab content window object.
+   * Cached Cu.Sandbox object for the active tab content window object.
+   */
+  _contentSandbox: null,
+
+  /**
+   * Get the Cu.Sandbox object for the active tab content window object. Note
+   * that the returned object is cached for later reuse. The cached object is
+   * kept only for the current browser window and it is reset for each context
+   * switch or navigator:browser window switch.
    */
   get contentSandbox()
   {
@@ -117,18 +131,30 @@ var Workspace = {
       return;
     }
 
-    // TODO: bug 646524 - need to cache sandboxes if
-    // currentBrowser == previousBrowser
-    let contentWindow = this.gBrowser.selectedBrowser.contentWindow;
-    return new Cu.Sandbox(contentWindow,
-                          { sandboxPrototype: contentWindow,
-                            wantXrays: false });
+    if (!this._contentSandbox ||
+        this.browserWindow != this._previousBrowserWindow) {
+      let contentWindow = this.gBrowser.selectedBrowser.contentWindow;
+      this._contentSandbox = new Cu.Sandbox(contentWindow,
+        { sandboxPrototype: contentWindow, wantXrays: false });
+
+      this._previousBrowserWindow = this.browserWindow;
+    }
+
+    return this._contentSandbox;
   },
 
   /**
-   * Get the Cu.Sandbox object for the most recently active navigator:browser
+   * Cached Cu.Sandbox object for the most recently active navigator:browser
    * chrome window object.
    */
+  _chromeSandbox: null,
+
+  /**
+   * Get the Cu.Sandbox object for the most recently active navigator:browser
+   * chrome window object. Note that the returned object is cached for later
+   * reuse. The cached object is kept only for the current browser window and it
+   * is reset for each context switch or navigator:browser window switch.
+   */
   get chromeSandbox()
   {
     if (!this.browserWindow) {
@@ -137,9 +163,15 @@ var Workspace = {
       return;
     }
 
-    return new Cu.Sandbox(this.browserWindow,
-                          { sandboxPrototype: this.browserWindow,
-                            wantXrays: false });
+    if (!this._chromeSandbox ||
+        this.browserWindow != this._previousBrowserWindow) {
+      this._chromeSandbox = new Cu.Sandbox(this.browserWindow,
+        { sandboxPrototype: this.browserWindow, wantXrays: false });
+
+      this._previousBrowserWindow = this.browserWindow;
+    }
+
+    return this._chromeSandbox;
   },
 
   /**
@@ -519,6 +551,7 @@ var Workspace = {
     content.setAttribute("checked", true);
     this.statusbarStatus.label = content.getAttribute("label");
     this.executionContext = WORKSPACE_CONTEXT_CONTENT;
+    this.resetContext();
   },
 
   /**
@@ -531,6 +564,17 @@ var Workspace = {
     chrome.setAttribute("checked", true);
     this.statusbarStatus.label = chrome.getAttribute("label");
     this.executionContext = WORKSPACE_CONTEXT_CHROME;
+    this.resetContext();
+  },
+
+  /**
+   * Reset the cached Cu.Sandbox object for the current context.
+   */
+  resetContext: function WS_resetContext()
+  {
+    this._chromeSandbox = null;
+    this._contentSandbox = null;
+    this._previousWindow = null;
   },
 
   /**
@@ -551,14 +595,14 @@ var Workspace = {
    */
   onLoad: function HS_onLoad()
   {
-    let contextMenu = document.getElementById("ws-context-menu");
+    let chromeContextMenu = document.getElementById("ws-menu-chrome");
     let errorConsoleMenu = document.getElementById("ws-menu-errorConsole");
     let errorConsoleCommand = document.getElementById("ws-cmd-errorConsole");
     let chromeContextCommand = document.getElementById("ws-cmd-chromeContext");
 
     let chrome = Services.prefs.getBoolPref(DEVTOOLS_CHROME_ENABLED);
     if (chrome) {
-      contextMenu.removeAttribute("hidden");
+      chromeContextMenu.removeAttribute("hidden");
       errorConsoleMenu.removeAttribute("hidden");
       errorConsoleCommand.removeAttribute("disabled");
       chromeContextCommand.removeAttribute("disabled");
diff --git a/browser/base/content/workspace.xul b/browser/base/content/workspace.xul
index c2b6074d1241..a8b97cb6a853 100644
--- a/browser/base/content/workspace.xul
+++ b/browser/base/content/workspace.xul
@@ -74,6 +74,7 @@
   <command id="ws-cmd-print" oncommand="Workspace.print();"/>
   <command id="ws-cmd-contentContext" oncommand="Workspace.setContentContext();"/>
   <command id="ws-cmd-chromeContext" oncommand="Workspace.setChromeContext();" disabled="true"/>
+  <command id="ws-cmd-resetContext" oncommand="Workspace.resetContext();"/>
   <command id="ws-cmd-errorConsole" oncommand="Workspace.openErrorConsole();" disabled="true"/>
   <command id="ws-cmd-webConsole" oncommand="Workspace.openWebConsole();"/>
 </commandset>
@@ -254,7 +255,7 @@
     </menupopup>
   </menu>
 
-  <menu id="ws-context-menu" hidden="true"
+  <menu id="ws-context-menu"
         label="&contextMenu.label;"
         accesskey="&contextMenu.accesskey;">
     <menupopup id="ws-menu-context">
@@ -264,11 +265,16 @@
                 command="ws-cmd-contentContext"
                 checked="true"
                 type="radio"/>
-      <menuitem id="ws-menu-chrome"
+      <menuitem id="ws-menu-chrome" hidden="true"
                 command="ws-cmd-chromeContext"
                 label="&chromeContext.label;"
                 accesskey="&chromeContext.accesskey;"
                 type="radio"/>
+      <menuseparator/>
+      <menuitem id="ws-menu-resetContext"
+                command="ws-cmd-resetContext"
+                label="&resetContext.label;"
+                accesskey="&resetContext.accesskey;"/>
     </menupopup>
   </menu>
 
diff --git a/browser/locales/en-US/chrome/browser/workspace.dtd b/browser/locales/en-US/chrome/browser/workspace.dtd
index d2ade7d685f8..35589c1a83cc 100644
--- a/browser/locales/en-US/chrome/browser/workspace.dtd
+++ b/browser/locales/en-US/chrome/browser/workspace.dtd
@@ -73,6 +73,12 @@
 <!ENTITY chromeContext.label          "Chrome">
 <!ENTITY chromeContext.accesskey      "H">
 
+<!-- LOCALIZATION NOTE (resetContext.label): This command allows the developer
+  -  to reset/clear the global object of the context where the code executes.
+  -->
+<!ENTITY resetContext.label           "Reset">
+<!ENTITY resetContext.accesskey       "R">
+
 <!ENTITY toolsMenu.label              "Tools">
 <!ENTITY toolsMenu.accesskey          "T">
 

From 0989c22c9ddc91de64e4d957a45c776db49adffe Mon Sep 17 00:00:00 2001
From: Mihai Sucan <mihai.sucan@gmail.com>
Date: Thu, 21 Apr 2011 18:46:06 +0300
Subject: [PATCH 13/20] Bug 651872 - Create access key for Workspace menu item;
 r=rcampbell

---
 browser/base/content/browser-menubar.inc         | 1 +
 browser/locales/en-US/chrome/browser/browser.dtd | 1 +
 2 files changed, 2 insertions(+)

diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index 0aa6613600c8..d1a240af716f 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -553,6 +553,7 @@
               <menuitem id="menu_workspace"
                         hidden="true"
                         label="&workspace.label;"
+                        accesskey="&workspace.accesskey;"
                         key="key_workspace"
                         command="Tools:Workspace"/>
               <menuitem id="menu_pageInfo"
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 7202bee28d8f..8a9bdcb2128b 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -192,6 +192,7 @@ can reach it easily. -->
 <!ENTITY inspectMenu.commandkey       "I">
 
 <!ENTITY workspace.label               "Workspace">
+<!ENTITY workspace.accesskey           "O">
 <!ENTITY workspace.keycode             "VK_F4">
 <!ENTITY workspace.keytext             "F4">
 

From 052271d1f612520239914753cb7edb6e0f512874 Mon Sep 17 00:00:00 2001
From: Rob Campbell <rcampbell@mozilla.com>
Date: Thu, 21 Apr 2011 13:20:18 -0300
Subject: [PATCH 14/20] Bug 627342 - re-enable
 browser_webconsole_js_input_expansion.js; f=pwalton r=gavin.sharp

---
 .../tests/browser/browser_webconsole_js_input_expansion.js   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_js_input_expansion.js b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_js_input_expansion.js
index f539db54b5a3..ea4c2199d45d 100644
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_js_input_expansion.js
+++ b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_js_input_expansion.js
@@ -93,7 +93,10 @@ function testJSInputExpansion() {
   input.value = "";
   EventUtils.synthesizeKey("d", {});
   let height = getHeight();
-  // is(height, initialHeight, "height shrank to original size");
+  info("height: " + height);
+  info("initialHeight: " + initialHeight);
+  let finalHeightDifference = Math.abs(initialHeight - height);
+  ok(finalHeightDifference <= 1, "height shrank to original size within 1px");
 
   finishTest();
 }

From 1249f6bd8c6a09ffba0a735366cdbf2ae89a9e54 Mon Sep 17 00:00:00 2001
From: Rob Campbell <rcampbell@mozilla.com>
Date: Thu, 21 Apr 2011 13:22:13 -0300
Subject: [PATCH 15/20] Bug 650780 - evaluating a null object in the web
 console returns TypeError: aObject is null; r=ddahl,dtownsend

---
 toolkit/components/console/hudservice/HUDService.jsm         | 4 ++++
 .../hudservice/tests/browser/browser_webconsole_jsterm.js    | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/toolkit/components/console/hudservice/HUDService.jsm b/toolkit/components/console/hudservice/HUDService.jsm
index fd5122dd61a1..2b09e5ad9e42 100644
--- a/toolkit/components/console/hudservice/HUDService.jsm
+++ b/toolkit/components/console/hudservice/HUDService.jsm
@@ -3861,6 +3861,10 @@ function JSPropertyProvider(aScope, aInputValue)
 
 function isIteratorOrGenerator(aObject)
 {
+  if (aObject === null) {
+    return false;
+  }
+
   if (typeof aObject == "object") {
     if (typeof aObject.__iterator__ == "function" ||
         aObject.constructor && aObject.constructor.name == "Iterator") {
diff --git a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_jsterm.js b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_jsterm.js
index c71e8ab5a90c..f83d8a88ef69 100644
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_jsterm.js
+++ b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_jsterm.js
@@ -153,5 +153,10 @@ function testJSTerm()
   isnot(label.textContent.indexOf("SEVERITY_LOG"), -1,
         "pprint(function) shows function source");
 
+  // check that an evaluated null produces "null", bug 650780
+  jsterm.clearOutput();
+  jsterm.execute("null");
+  checkResult("null", "null is null", 1);
+
   finishTest();
 }

From 4377d199b3864e99fd543f59cb1d0d3ecc698e45 Mon Sep 17 00:00:00 2001
From: Mihai Sucan <mihai.sucan@gmail.com>
Date: Mon, 2 May 2011 22:07:38 +0300
Subject: [PATCH 16/20] Bug 642176 - add Erik Vold to the contributors list for
 workspace.xul; r=rcampbell

---
 browser/base/content/workspace.xul | 1 +
 1 file changed, 1 insertion(+)

diff --git a/browser/base/content/workspace.xul b/browser/base/content/workspace.xul
index a8b97cb6a853..332b5075679a 100644
--- a/browser/base/content/workspace.xul
+++ b/browser/base/content/workspace.xul
@@ -23,6 +23,7 @@
    - Contributor(s):
    -   Rob Campbell <robcee@mozilla.com> (original author)
    -   Mihai Sucan <mihai.sucan@gmail.com>
+   -   Erik Vold <erikvvold@gmail.com>
    -
    - Alternatively, the contents of this file may be used under the terms of
    - either the GNU General Public License Version 2 or later (the "GPL"), or

From 8882a778e9ee2b4842b95c3939645bd222e198e5 Mon Sep 17 00:00:00 2001
From: Mihai Sucan <mihai.sucan@gmail.com>
Date: Wed, 4 May 2011 17:45:40 +0300
Subject: [PATCH 17/20] Bug 593460 - Tests must properly close the Inspector;
 f=rcampbell r=sdwilsh

---
 browser/base/content/browser.xul                   |  2 +-
 browser/base/content/inspector.js                  | 14 ++++++++------
 .../test/browser_inspector_initialization.js       |  2 +-
 .../content/test/browser_inspector_tab_switch.js   |  1 +
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index b88cfc516b96..39ad0993a57d 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -240,7 +240,7 @@
            noautohide="true"
            titlebar="normal"
            close="true"
-           onpopuphiding="InspectorUI.closeInspectorUI(true);"
+           onpopuphiding="InspectorUI.closeInspectorUI();"
            label="&inspectPanelTitle.label;">
       <toolbar id="inspector-toolbar"
                nowindowdrag="true">
diff --git a/browser/base/content/inspector.js b/browser/base/content/inspector.js
index 37dc7946bf34..7fe792ae67e1 100644
--- a/browser/base/content/inspector.js
+++ b/browser/base/content/inspector.js
@@ -347,7 +347,7 @@ var InspectorUI = {
   toggleInspectorUI: function IUI_toggleInspectorUI(aEvent)
   {
     if (this.isTreePanelOpen) {
-      this.closeInspectorUI(true);
+      this.closeInspectorUI();
     } else {
       this.openInspectorUI();
     }
@@ -738,10 +738,12 @@ var InspectorUI = {
    * Remove event listeners for document scrolling, resize,
    * tabContainer.TabSelect and others.
    *
-   * @param boolean aClearStore tells if you want the store associated to the
-   * current tab/window to be cleared or not.
+   * @param boolean aKeepStore
+   *        Tells if you want the store associated to the current tab/window to
+   *        be cleared or not. Set this to true to not clear the store, or false
+   *        otherwise.
    */
-  closeInspectorUI: function IUI_closeInspectorUI(aClearStore)
+  closeInspectorUI: function IUI_closeInspectorUI(aKeepStore)
   {
     if (this.closing || !this.win || !this.browser) {
       return;
@@ -749,7 +751,7 @@ var InspectorUI = {
 
     this.closing = true;
 
-    if (aClearStore) {
+    if (!aKeepStore) {
       InspectorStore.deleteStore(this.winID);
       this.win.removeEventListener("pagehide", this, true);
     } else {
@@ -1028,7 +1030,7 @@ var InspectorUI = {
       case "TabSelect":
         winID = this.getWindowID(gBrowser.selectedBrowser.contentWindow);
         if (this.isTreePanelOpen && winID != this.winID) {
-          this.closeInspectorUI(false);
+          this.closeInspectorUI(true);
           inspectorClosed = true;
         }
 
diff --git a/browser/base/content/test/browser_inspector_initialization.js b/browser/base/content/test/browser_inspector_initialization.js
index 790826a8f447..b56dcba65240 100644
--- a/browser/base/content/test/browser_inspector_initialization.js
+++ b/browser/base/content/test/browser_inspector_initialization.js
@@ -56,7 +56,7 @@ function runInspectorTests()
   ok(InspectorUI.isTreePanelOpen, "Inspector Tree Panel is open");
   ok(InspectorUI.isStylePanelOpen, "Inspector Style Panel is open");
   ok(InspectorUI.isDOMPanelOpen, "Inspector DOM Panel is open");
-  InspectorUI.closeInspectorUI(true);
+  InspectorUI.closeInspectorUI();
 }
 
 function finishInspectorTests()
diff --git a/browser/base/content/test/browser_inspector_tab_switch.js b/browser/base/content/test/browser_inspector_tab_switch.js
index 07980d051f12..7ec32249d39c 100644
--- a/browser/base/content/test/browser_inspector_tab_switch.js
+++ b/browser/base/content/test/browser_inspector_tab_switch.js
@@ -157,6 +157,7 @@ function inspectorTabUnload1(evt)
   ok(InspectorUI.isStylePanelOpen, "Inspector Style Panel is open");
   is(InspectorStore.length, 1, "InspectorStore.length = 1");
 
+  InspectorUI.closeInspectorUI();
   gBrowser.removeCurrentTab();
   finish();
 }

From 73d26eb9e358db4889dbd9303ef57d5b4cebc026 Mon Sep 17 00:00:00 2001
From: Rob Campbell <rcampbell@mozilla.com>
Date: Mon, 9 May 2011 11:51:52 -0300
Subject: [PATCH 18/20] Bug 653093 - Rename Workspace to Scratchpad; r=l10n

--HG--
rename : browser/base/content/workspace.js => browser/base/content/scratchpad.js
rename : browser/base/content/workspace.xul => browser/base/content/scratchpad.xul
rename : browser/base/content/test/browser_workspace_bug_646070_chrome_context_pref.js => browser/base/content/test/browser_scratchpad_bug_646070_chrome_context_pref.js
rename : browser/base/content/test/browser_workspace_contexts.js => browser/base/content/test/browser_scratchpad_contexts.js
rename : browser/base/content/test/browser_workspace_execute_print.js => browser/base/content/test/browser_scratchpad_execute_print.js
rename : browser/base/content/test/browser_workspace_files.js => browser/base/content/test/browser_scratchpad_files.js
rename : browser/base/content/test/browser_workspace_initialization.js => browser/base/content/test/browser_scratchpad_initialization.js
rename : browser/base/content/test/browser_workspace_inspect.js => browser/base/content/test/browser_scratchpad_inspect.js
rename : browser/base/content/test/browser_workspace_ui.js => browser/base/content/test/browser_scratchpad_ui.js
rename : browser/locales/en-US/chrome/browser/workspace.dtd => browser/locales/en-US/chrome/browser/scratchpad.dtd
rename : browser/locales/en-US/chrome/browser/workspace.properties => browser/locales/en-US/chrome/browser/scratchpad.properties
---
 browser/app/profile/firefox.js                |   4 +-
 browser/base/content/browser-appmenu.inc      |   8 +-
 browser/base/content/browser-menubar.inc      |  10 +-
 browser/base/content/browser-sets.inc         |   6 +-
 browser/base/content/browser.js               |  26 +-
 .../content/{workspace.js => scratchpad.js}   | 120 +++++-----
 .../content/{workspace.xul => scratchpad.xul} | 222 +++++++++---------
 browser/base/content/test/Makefile.in         |  14 +-
 ...atchpad_bug_646070_chrome_context_pref.js} |  38 +--
 .../test/browser_scratchpad_contexts.js       | 125 ++++++++++
 ...js => browser_scratchpad_execute_print.js} |  76 +++---
 ...e_files.js => browser_scratchpad_files.js} |  48 ++--
 .../test/browser_scratchpad_initialization.js |  63 +++++
 ...spect.js => browser_scratchpad_inspect.js} |  26 +-
 .../content/test/browser_scratchpad_ui.js     |  81 +++++++
 .../test/browser_workspace_contexts.js        | 125 ----------
 .../test/browser_workspace_initialization.js  |  63 -----
 .../base/content/test/browser_workspace_ui.js |  81 -------
 browser/base/jar.mn                           |   4 +-
 .../locales/en-US/chrome/browser/browser.dtd  |  18 +-
 .../browser/{workspace.dtd => scratchpad.dtd} |  13 +-
 ...space.properties => scratchpad.properties} |  10 +-
 browser/locales/jar.mn                        |   4 +-
 23 files changed, 602 insertions(+), 583 deletions(-)
 rename browser/base/content/{workspace.js => scratchpad.js} (83%)
 rename browser/base/content/{workspace.xul => scratchpad.xul} (63%)
 rename browser/base/content/test/{browser_workspace_bug_646070_chrome_context_pref.js => browser_scratchpad_bug_646070_chrome_context_pref.js} (57%)
 create mode 100644 browser/base/content/test/browser_scratchpad_contexts.js
 rename browser/base/content/test/{browser_workspace_execute_print.js => browser_scratchpad_execute_print.js} (51%)
 rename browser/base/content/test/{browser_workspace_files.js => browser_scratchpad_files.js} (73%)
 create mode 100644 browser/base/content/test/browser_scratchpad_initialization.js
 rename browser/base/content/test/{browser_workspace_inspect.js => browser_scratchpad_inspect.js} (67%)
 create mode 100644 browser/base/content/test/browser_scratchpad_ui.js
 delete mode 100644 browser/base/content/test/browser_workspace_contexts.js
 delete mode 100644 browser/base/content/test/browser_workspace_initialization.js
 delete mode 100644 browser/base/content/test/browser_workspace_ui.js
 rename browser/locales/en-US/chrome/browser/{workspace.dtd => scratchpad.dtd} (82%)
 rename browser/locales/en-US/chrome/browser/{workspace.properties => scratchpad.properties} (75%)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index a38f9795545a..6a84d745129c 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -992,8 +992,8 @@ pref("services.sync.prefs.sync.xpinstall.whitelist.required", true);
 pref("devtools.errorconsole.enabled", false);
 pref("devtools.inspector.enabled", false);
 
-// Enable the Workspace tool.
-pref("devtools.workspace.enabled", true);
+// Enable the Scratchpad tool.
+pref("devtools.scratchpad.enabled", true);
 
 // Enable tools for Chrome development.
 pref("devtools.chrome.enabled", false);
diff --git a/browser/base/content/browser-appmenu.inc b/browser/base/content/browser-appmenu.inc
index 296b7cd207db..215076659138 100644
--- a/browser/base/content/browser-appmenu.inc
+++ b/browser/base/content/browser-appmenu.inc
@@ -187,11 +187,11 @@
                     type="checkbox"
                     command="Tools:Inspect"
                     key="key_inspect"/>
-          <menuitem id="appmenu_workspace"
+          <menuitem id="appmenu_scratchpad"
                     hidden="true"
-                    label="&workspace.label;"
-                    key="key_workspace"
-                    command="Tools:Workspace"/>
+                    label="&scratchpad.label;"
+                    key="key_scratchpad"
+                    command="Tools:Scratchpad"/>
           <menuitem id="appmenu_pageSource"
                     label="&viewPageSourceCmd.label;"
                     command="View:PageSource"
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index f9d466eff367..19f4e4892177 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -557,12 +557,12 @@
                         accesskey="&webConsoleCmd.accesskey;"
                         key="key_webConsole"
                         oncommand="HUDConsoleUI.toggleHUD();"/>
-              <menuitem id="menu_workspace"
+              <menuitem id="menu_scratchpad"
                         hidden="true"
-                        label="&workspace.label;"
-                        accesskey="&workspace.accesskey;"
-                        key="key_workspace"
-                        command="Tools:Workspace"/>
+                        label="&scratchpad.label;"
+                        accesskey="&scratchpad.accesskey;"
+                        key="key_scratchpad"
+                        command="Tools:Scratchpad"/>
               <menuitem id="menu_pageInfo"
                         accesskey="&pageInfoCmd.accesskey;"
                         label="&pageInfoCmd.label;"
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index 59fa6f1bdf9b..e3fd839a9125 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -125,7 +125,7 @@
     <command id="Tools:Search" oncommand="BrowserSearch.webSearch();"/>
     <command id="Tools:Downloads" oncommand="BrowserDownloadsUI();"/>
     <command id="Tools:Inspect" oncommand="InspectorUI.toggleInspectorUI();" disabled="true"/>
-    <command id="Tools:Workspace" oncommand="Workspace.openWorkspace();" disabled="true"/>
+    <command id="Tools:Scratchpad" oncommand="Scratchpad.openScratchpad();" disabled="true"/>
     <command id="Tools:Addons" oncommand="BrowserOpenAddonsMgr();"/>
     <command id="Tools:Sanitize"
      oncommand="Cc['@mozilla.org/browser/browserglue;1'].getService(Ci.nsIBrowserGlue).sanitize(window);"/>
@@ -242,8 +242,8 @@
     <key id="key_errorConsole" key="&errorConsoleCmd.commandkey;" oncommand="toJavaScriptConsole();" modifiers="accel,shift" disabled="true"/>
     <key id="key_webConsole" key="&webConsoleCmd.commandkey;" oncommand="HUDConsoleUI.toggleHUD();" modifiers="accel,shift"/>
     <key id="key_inspect" key="&inspectMenu.commandkey;" command="Tools:Inspect" modifiers="accel,shift"/>
-    <key id="key_workspace" keycode="&workspace.keycode;"
-         keytext="&workspace.keytext;" command="Tools:Workspace"/>
+    <key id="key_scratchpad" keycode="&scratchpad.keycode;"
+         keytext="&scratchpad.keytext;" command="Tools:Scratchpad"/>
     <key id="openFileKb" key="&openFileCmd.commandkey;" command="Browser:OpenFile"  modifiers="accel"/>
     <key id="key_savePage" key="&savePageCmd.commandkey;" command="Browser:SavePage" modifiers="accel"/>
     <key id="printKb" key="&printCmd.commandkey;" command="cmd_print"  modifiers="accel"/>
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 57cd949ee32d..a7be03e604a7 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1654,13 +1654,13 @@ function delayedStartup(isLoadingBlank, mustLoadSidebar) {
 #endif
   }
 
-  // Enable Workspace in the UI, if the preference allows this.
-  let workspaceEnabled = gPrefService.getBoolPref(Workspace.prefEnabledName);
-  if (workspaceEnabled) {
-    document.getElementById("menu_workspace").hidden = false;
-    document.getElementById("Tools:Workspace").removeAttribute("disabled");
+  // Enable Scratchpad in the UI, if the preference allows this.
+  let scratchpadEnabled = gPrefService.getBoolPref(Scratchpad.prefEnabledName);
+  if (scratchpadEnabled) {
+    document.getElementById("menu_scratchpad").hidden = false;
+    document.getElementById("Tools:Scratchpad").removeAttribute("disabled");
 #ifdef MENUBAR_CAN_AUTOHIDE
-    document.getElementById("appmenu_workspace").hidden = false;
+    document.getElementById("appmenu_scratchpad").hidden = false;
 #endif
   }
 
@@ -8642,15 +8642,15 @@ function toggleAddonBar() {
   setToolbarVisibility(addonBar, addonBar.collapsed);
 }
 
-var Workspace = {
-  prefEnabledName: "devtools.workspace.enabled",
+var Scratchpad = {
+  prefEnabledName: "devtools.scratchpad.enabled",
 
-  openWorkspace: function WS_openWorkspace() {
-    const WORKSPACE_WINDOW_URL = "chrome://browser/content/workspace.xul";
-    const WORKSPACE_WINDOW_FEATURES = "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no";
+  openScratchpad: function SP_openScratchpad() {
+    const SCRATCHPAD_WINDOW_URL = "chrome://browser/content/scratchpad.xul";
+    const SCRATCHPAD_WINDOW_FEATURES = "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no";
 
-    return Services.ww.openWindow(null, WORKSPACE_WINDOW_URL, "_blank",
-                                  WORKSPACE_WINDOW_FEATURES, null);
+    return Services.ww.openWindow(null, SCRATCHPAD_WINDOW_URL, "_blank",
+                                  SCRATCHPAD_WINDOW_FEATURES, null);
   },
 };
 
diff --git a/browser/base/content/workspace.js b/browser/base/content/scratchpad.js
similarity index 83%
rename from browser/base/content/workspace.js
rename to browser/base/content/scratchpad.js
index e1abf7ce76c9..28215c6d9a12 100644
--- a/browser/base/content/workspace.js
+++ b/browser/base/content/scratchpad.js
@@ -12,7 +12,7 @@
  * for the specific language governing rights and limitations under the
  * License.
  *
- * The Original Code is Workspace.
+ * The Original Code is Scratchpad.
  *
  * The Initial Developer of the Original Code is
  * The Mozilla Foundation.
@@ -48,40 +48,40 @@ Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/NetUtil.jsm");
 Cu.import("resource:///modules/PropertyPanel.jsm");
 
-const WORKSPACE_CONTEXT_CONTENT = 1;
-const WORKSPACE_CONTEXT_CHROME = 2;
-const WORKSPACE_WINDOW_URL = "chrome://browser/content/workspace.xul";
-const WORKSPACE_L10N = "chrome://browser/locale/workspace.properties";
-const WORKSPACE_WINDOW_FEATURES = "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no";
+const SCRATCHPAD_CONTEXT_CONTENT = 1;
+const SCRATCHPAD_CONTEXT_CHROME = 2;
+const SCRATCHPAD_WINDOW_URL = "chrome://browser/content/scratchpad.xul";
+const SCRATCHPAD_L10N = "chrome://browser/locale/scratchpad.properties";
+const SCRATCHPAD_WINDOW_FEATURES = "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no";
 const DEVTOOLS_CHROME_ENABLED = "devtools.chrome.enabled";
 
 /**
- * The workspace object handles the Workspace window functionality.
+ * The scratchpad object handles the Scratchpad window functionality.
  */
-var Workspace = {
+var Scratchpad = {
   /**
-   * The script execution context. This tells Workspace in which context the
+   * The script execution context. This tells Scratchpad in which context the
    * script shall execute.
    *
    * Possible values:
-   *   - WORKSPACE_CONTEXT_CONTENT to execute code in the context of the current
+   *   - SCRATCHPAD_CONTEXT_CONTENT to execute code in the context of the current
    *   tab content window object.
-   *   - WORKSPACE_CONTEXT_CHROME to execute code in the context of the
+   *   - SCRATCHPAD_CONTEXT_CHROME to execute code in the context of the
    *   currently active chrome window object.
    */
-  executionContext: WORKSPACE_CONTEXT_CONTENT,
+  executionContext: SCRATCHPAD_CONTEXT_CONTENT,
 
   /**
    * Retrieve the xul:textbox DOM element. This element holds the source code
    * the user writes and executes.
    */
-  get textbox() document.getElementById("workspace-textbox"),
+  get textbox() document.getElementById("scratchpad-textbox"),
 
   /**
    * Retrieve the xul:statusbarpanel DOM element. The status bar tells the
    * current code execution context.
    */
-  get statusbarStatus() document.getElementById("workspace-status"),
+  get statusbarStatus() document.getElementById("scratchpad-status"),
 
   /**
    * Get the selected text from the textbox.
@@ -177,20 +177,20 @@ var Workspace = {
   /**
    * Drop the textbox selection.
    */
-  deselect: function WS_deselect()
+  deselect: function SP_deselect()
   {
     this.textbox.selectionEnd = this.textbox.selectionStart;
   },
 
   /**
-   * Select a specific range in the Workspace xul:textbox.
+   * Select a specific range in the Scratchpad xul:textbox.
    *
    * @param number aStart
    *        Selection range start.
    * @param number aEnd
    *        Selection range end.
    */
-  selectRange: function WS_selectRange(aStart, aEnd)
+  selectRange: function SP_selectRange(aStart, aEnd)
   {
     this.textbox.selectionStart = aStart;
     this.textbox.selectionEnd = aEnd;
@@ -204,12 +204,12 @@ var Workspace = {
    * @return mixed
    *         The script evaluation result.
    */
-  evalInContentSandbox: function WS_evalInContentSandbox(aString)
+  evalInContentSandbox: function SP_evalInContentSandbox(aString)
   {
     let result;
     try {
       result = Cu.evalInSandbox(aString, this.contentSandbox, "1.8",
-                                "Workspace", 1);
+                                "Scratchpad", 1);
     }
     catch (ex) {
       this.openWebConsole();
@@ -238,12 +238,12 @@ var Workspace = {
    * @return mixed
    *         The script evaluation result.
    */
-  evalInChromeSandbox: function WS_evalInChromeSandbox(aString)
+  evalInChromeSandbox: function SP_evalInChromeSandbox(aString)
   {
     let result;
     try {
       result = Cu.evalInSandbox(aString, this.chromeSandbox, "1.8",
-                                "Workspace", 1);
+                                "Scratchpad", 1);
     }
     catch (ex) {
       Cu.reportError(ex);
@@ -263,9 +263,9 @@ var Workspace = {
    * @return mixed
    *         The script evaluation result.
    */
-  evalForContext: function WS_evaluateForContext(aString)
+  evalForContext: function SP_evaluateForContext(aString)
   {
-    return this.executionContext == WORKSPACE_CONTEXT_CONTENT ?
+    return this.executionContext == SCRATCHPAD_CONTEXT_CONTENT ?
            this.evalInContentSandbox(aString) :
            this.evalInChromeSandbox(aString);
   },
@@ -274,7 +274,7 @@ var Workspace = {
    * Execute the selected text (if any) or the entire textbox content in the
    * current context.
    */
-  execute: function WS_execute()
+  execute: function SP_execute()
   {
     let selection = this.selectedText || this.textbox.value;
     let result = this.evalForContext(selection);
@@ -287,7 +287,7 @@ var Workspace = {
    * current context. The resulting object is opened up in the Property Panel
    * for inspection.
    */
-  inspect: function WS_inspect()
+  inspect: function SP_inspect()
   {
     let [selection, result] = this.execute();
 
@@ -302,7 +302,7 @@ var Workspace = {
    * the selected text, or at the end of the textbox value if there is no
    * selected text.
    */
-  print: function WS_print()
+  print: function SP_print()
   {
     let selectionStart = this.textbox.selectionStart;
     let selectionEnd = this.textbox.selectionEnd;
@@ -338,7 +338,7 @@ var Workspace = {
    * @return object
    *         The PropertyPanel object instance.
    */
-  openPropertyPanel: function WS_openPropertyPanel(aEvalString, aOutputObject)
+  openPropertyPanel: function SP_openPropertyPanel(aEvalString, aOutputObject)
   {
     let self = this;
     let propPanel;
@@ -375,7 +375,7 @@ var Workspace = {
     propPanel = new PropertyPanel(parent, doc, title, aOutputObject, buttons);
 
     let panel = propPanel.panel;
-    panel.setAttribute("class", "workspace_propertyPanel");
+    panel.setAttribute("class", "scratchpad_propertyPanel");
     panel.openPopup(null, "after_pointer", 0, 0, false, false);
     panel.sizeTo(200, 400);
 
@@ -385,12 +385,12 @@ var Workspace = {
   // Menu Operations
 
   /**
-   * Open a new Workspace window.
+   * Open a new Scratchpad window.
    */
-  openWorkspace: function WS_openWorkspace()
+  openScratchpad: function SP_openScratchpad()
   {
-    Services.ww.openWindow(null, WORKSPACE_WINDOW_URL, "_blank",
-                           WORKSPACE_WINDOW_FEATURES, null);
+    Services.ww.openWindow(null, SCRATCHPAD_WINDOW_URL, "_blank",
+                           SCRATCHPAD_WINDOW_FEATURES, null);
   },
 
   /**
@@ -408,7 +408,7 @@ var Workspace = {
    *        get the following arguments:
    *        1) the nsresult status code for the export operation.
    */
-  exportToFile: function WS_exportToFile(aFile, aNoConfirmation, aSilentError,
+  exportToFile: function SP_exportToFile(aFile, aNoConfirmation, aSilentError,
                                          aCallback)
   {
     if (!aNoConfirmation && aFile.exists() &&
@@ -453,7 +453,7 @@ var Workspace = {
    *        1) the nsresult status code for the import operation.
    *        2) the data that was read from the file, if any.
    */
-  importFromFile: function WS_importFromFile(aFile, aSilentError, aCallback)
+  importFromFile: function SP_importFromFile(aFile, aSilentError, aCallback)
   {
     // Prevent file type detection.
     let channel = NetUtil.newChannel(aFile);
@@ -479,9 +479,9 @@ var Workspace = {
   },
 
   /**
-   * Open a file to edit in the Workspace.
+   * Open a file to edit in the Scratchpad.
    */
-  openFile: function WS_openFile()
+  openFile: function SP_openFile()
   {
     let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
     fp.init(window, this.strings.GetStringFromName("openFile.title"),
@@ -496,7 +496,7 @@ var Workspace = {
   /**
    * Save the textbox content to the currently open file.
    */
-  saveFile: function WS_saveFile()
+  saveFile: function SP_saveFile()
   {
     if (!this.filename) {
       return this.saveFileAs();
@@ -510,12 +510,12 @@ var Workspace = {
   /**
    * Save the textbox content to a new file.
    */
-  saveFileAs: function WS_saveFileAs()
+  saveFileAs: function SP_saveFileAs()
   {
     let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
     fp.init(window, this.strings.GetStringFromName("saveFileAs"),
             Ci.nsIFilePicker.modeSave);
-    fp.defaultString = "workspace.js";
+    fp.defaultString = "scratchpad.js";
     if (fp.show() != Ci.nsIFilePicker.returnCancel) {
       document.title = this.filename = fp.file.path;
       this.exportToFile(fp.file);
@@ -525,7 +525,7 @@ var Workspace = {
   /**
    * Open the Error Console.
    */
-  openErrorConsole: function WS_openErrorConsole()
+  openErrorConsole: function SP_openErrorConsole()
   {
     this.browserWindow.toJavaScriptConsole();
   },
@@ -533,7 +533,7 @@ var Workspace = {
   /**
    * Open the Web Console.
    */
-  openWebConsole: function WS_openWebConsole()
+  openWebConsole: function SP_openWebConsole()
   {
     if (!this.browserWindow.HUDConsoleUI.getOpenHUD()) {
       this.browserWindow.HUDConsoleUI.toggleHUD();
@@ -544,33 +544,33 @@ var Workspace = {
   /**
    * Set the current execution context to be the active tab content window.
    */
-  setContentContext: function WS_setContentContext()
+  setContentContext: function SP_setContentContext()
   {
-    let content = document.getElementById("ws-menu-content");
-    document.getElementById("ws-menu-chrome").removeAttribute("checked");
+    let content = document.getElementById("sp-menu-content");
+    document.getElementById("sp-menu-chrome").removeAttribute("checked");
     content.setAttribute("checked", true);
     this.statusbarStatus.label = content.getAttribute("label");
-    this.executionContext = WORKSPACE_CONTEXT_CONTENT;
+    this.executionContext = SCRATCHPAD_CONTEXT_CONTENT;
     this.resetContext();
   },
 
   /**
    * Set the current execution context to be the most recent chrome window.
    */
-  setChromeContext: function WS_setChromeContext()
+  setChromeContext: function SP_setChromeContext()
   {
-    let chrome = document.getElementById("ws-menu-chrome");
-    document.getElementById("ws-menu-content").removeAttribute("checked");
+    let chrome = document.getElementById("sp-menu-chrome");
+    document.getElementById("sp-menu-content").removeAttribute("checked");
     chrome.setAttribute("checked", true);
     this.statusbarStatus.label = chrome.getAttribute("label");
-    this.executionContext = WORKSPACE_CONTEXT_CHROME;
+    this.executionContext = SCRATCHPAD_CONTEXT_CHROME;
     this.resetContext();
   },
 
   /**
    * Reset the cached Cu.Sandbox object for the current context.
    */
-  resetContext: function WS_resetContext()
+  resetContext: function SP_resetContext()
   {
     this._chromeSandbox = null;
     this._contentSandbox = null;
@@ -584,21 +584,21 @@ var Workspace = {
    * @return integer
    *         the outer window ID
    */
-  getWindowId: function HS_getWindowId(aWindow)
+  getWindowId: function SP_getWindowId(aWindow)
   {
     return aWindow.QueryInterface(Ci.nsIInterfaceRequestor).
            getInterface(Ci.nsIDOMWindowUtils).outerWindowID;
   },
 
   /**
-   * The Workspace window DOMContentLoaded event handler.
+   * The Scratchpad window DOMContentLoaded event handler.
    */
-  onLoad: function HS_onLoad()
+  onLoad: function SP_onLoad()
   {
-    let chromeContextMenu = document.getElementById("ws-menu-chrome");
-    let errorConsoleMenu = document.getElementById("ws-menu-errorConsole");
-    let errorConsoleCommand = document.getElementById("ws-cmd-errorConsole");
-    let chromeContextCommand = document.getElementById("ws-cmd-chromeContext");
+    let chromeContextMenu = document.getElementById("sp-menu-chrome");
+    let errorConsoleMenu = document.getElementById("sp-menu-errorConsole");
+    let errorConsoleCommand = document.getElementById("sp-cmd-errorConsole");
+    let chromeContextCommand = document.getElementById("sp-cmd-chromeContext");
 
     let chrome = Services.prefs.getBoolPref(DEVTOOLS_CHROME_ENABLED);
     if (chrome) {
@@ -610,9 +610,9 @@ var Workspace = {
   },
 };
 
-XPCOMUtils.defineLazyGetter(Workspace, "strings", function () {
-  return Services.strings.createBundle(WORKSPACE_L10N);
+XPCOMUtils.defineLazyGetter(Scratchpad, "strings", function () {
+  return Services.strings.createBundle(SCRATCHPAD_L10N);
 });
 
-addEventListener("DOMContentLoaded", Workspace.onLoad.bind(Workspace), false);
+addEventListener("DOMContentLoaded", Scratchpad.onLoad.bind(Scratchpad), false);
 
diff --git a/browser/base/content/workspace.xul b/browser/base/content/scratchpad.xul
similarity index 63%
rename from browser/base/content/workspace.xul
rename to browser/base/content/scratchpad.xul
index 332b5075679a..656954756e96 100644
--- a/browser/base/content/workspace.xul
+++ b/browser/base/content/scratchpad.xul
@@ -13,7 +13,7 @@
    - for the specific language governing rights and limitations under the
    - License.
    -
-   - The Original Code is Workspace.
+   - The Original Code is Scratchpad.
    -
    - The Initial Developer of the Original Code is
    - The Mozilla Foundation.
@@ -40,8 +40,8 @@
    - ***** END LICENSE BLOCK ***** -->
 #endif
 <!DOCTYPE window [
-<!ENTITY % workspaceDTD SYSTEM "chrome://browser/locale/workspace.dtd" >
- %workspaceDTD;
+<!ENTITY % scratchpadDTD SYSTEM "chrome://browser/locale/scratchpad.dtd" >
+ %scratchpadDTD;
 ]>
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
@@ -49,59 +49,59 @@
 <window id="main-window"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&window.title;"
-        windowtype="devtools:workspace"
+        windowtype="devtools:scratchpad"
         screenX="4" screenY="4"
         width="640" height="480"
         persist="screenX screenY width height sizemode">
 
 <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-<script type="application/javascript" src="chrome://browser/content/workspace.js"/>
+<script type="application/javascript" src="chrome://browser/content/scratchpad.js"/>
 
 <commandset id="editMenuCommands"/>
 
-<commandset id="ws-commandset">
-  <command id="ws-cmd-newWindow" oncommand="Workspace.openWorkspace();"/>
-  <command id="ws-cmd-openFile" oncommand="Workspace.openFile();"/>
-  <command id="ws-cmd-save" oncommand="Workspace.saveFile();"/>
-  <command id="ws-cmd-saveas" oncommand="Workspace.saveFileAs();"/>
+<commandset id="sp-commandset">
+  <command id="sp-cmd-newWindow" oncommand="Scratchpad.openScratchpad();"/>
+  <command id="sp-cmd-openFile" oncommand="Scratchpad.openFile();"/>
+  <command id="sp-cmd-save" oncommand="Scratchpad.saveFile();"/>
+  <command id="sp-cmd-saveas" oncommand="Scratchpad.saveFileAs();"/>
 
   <!-- TODO: bug 650340 - implement printFile()
-  <command id="ws-cmd-printFile" oncommand="Workspace.printFile();" disabled="true"/>
+  <command id="sp-cmd-printFile" oncommand="Scratchpad.printFile();" disabled="true"/>
  -->
 
-  <command id="ws-cmd-close" oncommand="window.close();"/>
-  <command id="ws-cmd-execute" oncommand="Workspace.execute();"/>
-  <command id="ws-cmd-inspect" oncommand="Workspace.inspect();"/>
-  <command id="ws-cmd-print" oncommand="Workspace.print();"/>
-  <command id="ws-cmd-contentContext" oncommand="Workspace.setContentContext();"/>
-  <command id="ws-cmd-chromeContext" oncommand="Workspace.setChromeContext();" disabled="true"/>
-  <command id="ws-cmd-resetContext" oncommand="Workspace.resetContext();"/>
-  <command id="ws-cmd-errorConsole" oncommand="Workspace.openErrorConsole();" disabled="true"/>
-  <command id="ws-cmd-webConsole" oncommand="Workspace.openWebConsole();"/>
+  <command id="sp-cmd-close" oncommand="window.close();"/>
+  <command id="sp-cmd-execute" oncommand="Scratchpad.execute();"/>
+  <command id="sp-cmd-inspect" oncommand="Scratchpad.inspect();"/>
+  <command id="sp-cmd-print" oncommand="Scratchpad.print();"/>
+  <command id="sp-cmd-contentContext" oncommand="Scratchpad.setContentContext();"/>
+  <command id="sp-cmd-chromeContext" oncommand="Scratchpad.setChromeContext();" disabled="true"/>
+  <command id="sp-cmd-resetContext" oncommand="Scratchpad.resetContext();"/>
+  <command id="sp-cmd-errorConsole" oncommand="Scratchpad.openErrorConsole();" disabled="true"/>
+  <command id="sp-cmd-webConsole" oncommand="Scratchpad.openWebConsole();"/>
 </commandset>
 
-<keyset id="ws-keyset">
-  <key id="ws-key-window"
+<keyset id="sp-keyset">
+  <key id="sp-key-window"
        key="&newWindowCmd.commandkey;"
-       command="ws-cmd-newWindow"
+       command="sp-cmd-newWindow"
        modifiers="accel"/>
-  <key id="ws-key-open"
+  <key id="sp-key-open"
        key="&openFileCmd.commandkey;"
-       command="ws-cmd-openFile"
+       command="sp-cmd-openFile"
        modifiers="accel"/>
-  <key id="ws-key-save"
+  <key id="sp-key-save"
        key="&saveFileCmd.commandkey;"
-       command="ws-cmd-save"
+       command="sp-cmd-save"
        modifiers="accel"/>
-  <key id="ws-key-close"
+  <key id="sp-key-close"
        key="&closeCmd.key;"
-       command="ws-cmd-close"
+       command="sp-cmd-close"
        modifiers="accel"/>
 
   <!-- TODO: bug 650340 - implement printFile
-  <key id="ws-key-printFile"
+  <key id="sp-key-printFile"
        key="&printCmd.commandkey;"
-       command="ws-cmd-printFile"
+       command="sp-cmd-printFile"
        modifiers="accel"/>
   -->
 
@@ -118,104 +118,104 @@
   <key id="key_selectAll" key="&selectAllCmd.key;" modifiers="accel"/>
   <key id="key_undo" key="&undoCmd.key;" modifiers="accel"/>
   <key id="key_redo" key="&undoCmd.key;" modifiers="accel,shift"/>
-  <key id="ws-key-execute"
+  <key id="sp-key-execute"
        key="&execute.key;"
-       command="ws-cmd-execute"
+       command="sp-cmd-execute"
        modifiers="accel"/>
-  <key id="ws-key-inspect"
+  <key id="sp-key-inspect"
        key="&inspect.key;"
-       command="ws-cmd-inspect"
+       command="sp-cmd-inspect"
        modifiers="accel"/>
-  <key id="ws-key-print"
+  <key id="sp-key-print"
        key="&print.key;"
-       command="ws-cmd-print"
+       command="sp-cmd-print"
        modifiers="accel"/>
-  <key id="ws-key-errorConsole"
+  <key id="sp-key-errorConsole"
        key="&errorConsoleCmd.commandkey;"
-       command="ws-cmd-errorConsole"
+       command="sp-cmd-errorConsole"
        modifiers="accel,shift"/>
-  <key id="ws-key-webConsole"
+  <key id="sp-key-webConsole"
        key="&webConsoleCmd.commandkey;"
-       command="ws-cmd-webConsole"
+       command="sp-cmd-webConsole"
        modifiers="accel,shift"/>
 </keyset>
 
 
-<menubar id="ws-menubar">
-  <menu id="ws-file-menu" label="&fileMenu.label;"
+<menubar id="sp-menubar">
+  <menu id="sp-file-menu" label="&fileMenu.label;"
         accesskey="&fileMenu.accesskey;">
-    <menupopup id="ws-menu-filepopup">
-      <menuitem id="ws-menu-newworkspace"
+    <menupopup id="sp-menu-filepopup">
+      <menuitem id="sp-menu-newscratchpad"
                 label="&newWindowCmd.label;"
                 accesskey="&newWindowCmd.accesskey;"
-                key="ws-key-window"
-                command="ws-cmd-newWindow"/>
+                key="sp-key-window"
+                command="sp-cmd-newWindow"/>
       <menuseparator/>
-      <menuitem id="ws-menu-open"
+      <menuitem id="sp-menu-open"
                 label="&openFileCmd.label;"
-                command="ws-cmd-openFile"
-                key="ws-key-open"
+                command="sp-cmd-openFile"
+                key="sp-key-open"
                 accesskey="&openFileCmd.accesskey;"/>
-      <menuitem id="ws-menu-save"
+      <menuitem id="sp-menu-save"
                 label="&saveFileCmd.label;"
                 accesskey="&saveFileCmd.accesskey;"
-                key="ws-key-save"
-                command="ws-cmd-save"/>
-      <menuitem id="ws-menu-saveas"
+                key="sp-key-save"
+                command="sp-cmd-save"/>
+      <menuitem id="sp-menu-saveas"
                 label="&saveFileAsCmd.label;"
                 accesskey="&saveFileAsCmd.accesskey;"
-                command="ws-cmd-saveas"/>
+                command="sp-cmd-saveas"/>
       <menuseparator/>
 
       <!-- TODO: bug 650340 - implement printFile
-      <menuitem id="ws-menu-print"
+      <menuitem id="sp-menu-print"
                 label="&printCmd.label;"
                 accesskey="&printCmd.accesskey;"
-                command="ws-cmd-printFile"/>
+                command="sp-cmd-printFile"/>
       <menuseparator/>
       -->
 
-      <menuitem id="ws-menu-close"
+      <menuitem id="sp-menu-close"
                 label="&closeCmd.label;"
-                key="ws-key-close"
+                key="sp-key-close"
                 accesskey="&closeCmd.accesskey;"
-                command="ws-cmd-close"/>
+                command="sp-cmd-close"/>
     </menupopup>
   </menu>
 
-  <menu id="ws-edit-menu" label="&editMenu.label;"
+  <menu id="sp-edit-menu" label="&editMenu.label;"
         accesskey="&editMenu.accesskey;">
-    <menupopup id="ws-menu_editpopup">
-      <menuitem id="ws-menu_undo"
+    <menupopup id="sp-menu_editpopup">
+      <menuitem id="sp-menu_undo"
                 label="&undoCmd.label;"
                 key="key_undo"
                 accesskey="&undoCmd.accesskey;"
                 disabled="true"
                 oncommand="cmd_undo"/>
-      <menuitem id="ws-menu-redo"
+      <menuitem id="sp-menu-redo"
                 label="&redoCmd.label;"
                 key="key_redo"
                 disabled="true"
                 accesskey="&redoCmd.accesskey;"
                 command="cmd_redo"/>
       <menuseparator/>
-      <menuitem id="ws-menu-cut"
+      <menuitem id="sp-menu-cut"
                 label="&cutCmd.label;"
                 key="key_cut"
                 accesskey="&cutCmd.accesskey;"
                 command="cmd_cut"/>
-      <menuitem id="ws-menu-copy"
+      <menuitem id="sp-menu-copy"
                 label="&copyCmd.label;"
                 key="key_copy"
                 accesskey="&copyCmd.accesskey;"
                 command="cmd_copy"/>
-      <menuitem id="ws-menu-paste"
+      <menuitem id="sp-menu-paste"
                 label="&pasteCmd.label;"
                 key="key_paste"
                 accesskey="&pasteCmd.accesskey;"
                 command="cmd_paste"/>
       <menuseparator/>
-      <menuitem id="ws-menu-selectAll"
+      <menuitem id="sp-menu-selectAll"
                 label="&selectAllCmd.label;"
                 key="key_selectAll"
                 accesskey="&selectAllCmd.accesskey;"
@@ -223,82 +223,82 @@
       <menuseparator/>
 
       <!-- TODO: bug 650345 - implement search and replace
-      <menuitem id="ws-menu-find"
+      <menuitem id="sp-menu-find"
                 label="&findOnCmd.label;"
                 accesskey="&findOnCmd.accesskey;"
                 key="key_find"
                 disabled="true"
                 command="cmd_find"/>
-      <menuitem id="ws-menu-findAgain"
+      <menuitem id="sp-menu-findAgain"
                 label="&findAgainCmd.label;"
                 accesskey="&findAgainCmd.accesskey;"
                 key="key_findAgain"
                 disabled="true"
                 command="cmd_findAgain"/>
-      <menuseparator id="ws-execute-separator"/>
+      <menuseparator id="sp-execute-separator"/>
       -->
 
-      <menuitem id="ws-text-execute"
+      <menuitem id="sp-text-execute"
                 label="&execute.label;"
                 accesskey="&execute.accesskey;"
-                key="ws-key-execute"
-                command="ws-cmd-execute"/>
-      <menuitem id="ws-text-inspect"
+                key="sp-key-execute"
+                command="sp-cmd-execute"/>
+      <menuitem id="sp-text-inspect"
                 label="&inspect.label;"
                 accesskey="&inspect.accesskey;"
-                key="ws-key-inspect"
-                command="ws-cmd-inspect"/>
-      <menuitem id="ws-text-print"
+                key="sp-key-inspect"
+                command="sp-cmd-inspect"/>
+      <menuitem id="sp-text-print"
                 label="&print.label;"
                 accesskey="&print.accesskey;"
-                key="ws-key-print"
-                command="ws-cmd-print"/>
+                key="sp-key-print"
+                command="sp-cmd-print"/>
     </menupopup>
   </menu>
 
-  <menu id="ws-context-menu"
+  <menu id="sp-context-menu"
         label="&contextMenu.label;"
         accesskey="&contextMenu.accesskey;">
-    <menupopup id="ws-menu-context">
-      <menuitem id="ws-menu-content"
+    <menupopup id="sp-menu-context">
+      <menuitem id="sp-menu-content"
                 label="&contentContext.label;"
                 accesskey="&contentContext.accesskey;"
-                command="ws-cmd-contentContext"
+                command="sp-cmd-contentContext"
                 checked="true"
                 type="radio"/>
-      <menuitem id="ws-menu-chrome" hidden="true"
-                command="ws-cmd-chromeContext"
+      <menuitem id="sp-menu-chrome" hidden="true"
+                command="sp-cmd-chromeContext"
                 label="&chromeContext.label;"
                 accesskey="&chromeContext.accesskey;"
                 type="radio"/>
       <menuseparator/>
-      <menuitem id="ws-menu-resetContext"
-                command="ws-cmd-resetContext"
+      <menuitem id="sp-menu-resetContext"
+                command="sp-cmd-resetContext"
                 label="&resetContext.label;"
                 accesskey="&resetContext.accesskey;"/>
     </menupopup>
   </menu>
 
-  <menu id="ws-tools-menu"
+  <menu id="sp-tools-menu"
         label="&toolsMenu.label;"
         accesskey="&toolsMenu.accesskey;">
-    <menupopup id="ws-menu-tools">
-      <menuitem id="ws-menu-errorConsole" hidden="true"
+    <menupopup id="sp-menu-tools">
+      <menuitem id="sp-menu-errorConsole" hidden="true"
                 label="&errorConsoleCmd.label;"
                 accesskey="&errorConsoleCmd.accesskey;"
-                key="ws-key-errorConsole"
-                command="ws-cmd-errorConsole"/>
-      <menuitem id="ws-menu-webConsole"
+                key="sp-key-errorConsole"
+                command="sp-cmd-errorConsole"/>
+      <menuitem id="sp-menu-webConsole"
                 label="&webConsoleCmd.label;"
                 accesskey="&webConsoleCmd.accesskey;"
-                key="ws-key-webConsole"
-                command="ws-cmd-webConsole"/>
+                key="sp-key-webConsole"
+                command="sp-cmd-webConsole"/>
     </menupopup>
   </menu>
 </menubar>
 
-<popupset id="workspace-popups">
-  <menupopup id="workspace-text-popup">
+<popupset id="scratchpad-popups">
+  <menupopup id="scratchpad-text-popup">
     <menuitem id="menu_cut"/>
     <menuitem id="menu_copy"/>
     <menuitem id="menu_paste"/>
@@ -306,31 +306,31 @@
     <menuseparator/>
     <menuitem id="menu_selectAll"/>
     <menuseparator/>
-    <menuitem id="ws-text-execute"
+    <menuitem id="sp-text-execute"
               label="&execute.label;"
               accesskey="&execute.accesskey;"
-              key="ws-key-execute"
-              command="ws-cmd-execute"/>
-    <menuitem id="ws-text-inspect"
+              key="sp-key-execute"
+              command="sp-cmd-execute"/>
+    <menuitem id="sp-text-inspect"
               label="&inspect.label;"
               accesskey="&inspect.accesskey;"
-              key="ws-key-inspect"
-              command="ws-cmd-inspect"/>
-    <menuitem id="ws-text-print"
+              key="sp-key-inspect"
+              command="sp-cmd-inspect"/>
+    <menuitem id="sp-text-print"
               label="&print.label;"
               accesskey="&print.accesskey;"
-              key="ws-key-print"
-              command="ws-cmd-print"/>
+              key="sp-key-print"
+              command="sp-cmd-print"/>
   </menupopup>
 </popupset>
 
-<textbox id="workspace-textbox"
+<textbox id="scratchpad-textbox"
          multiline="true"
          flex="1"
-         context="workspace-text-popup"
+         context="scratchpad-text-popup"
          placeholder="&textbox.placeholder;" />
-<statusbar id="workspace-statusbar" align="end">
-  <statusbarpanel id="workspace-status"
+<statusbar id="scratchpad-statusbar" align="end">
+  <statusbarpanel id="scratchpad-status"
                   label="&contentContext.label;"
                   class="statusbarpanel-iconic-text"/>
   <spacer flex="1"/>
diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index 6d34953e0179..6ac661849606 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -192,13 +192,13 @@ _BROWSER_FILES = \
                  browser_inspector_treePanel_output.js \
                  browser_inspector_treePanel_input.html \
                  browser_inspector_treePanel_result.html \
-                 browser_workspace_initialization.js \
-                 browser_workspace_contexts.js \
-                 browser_workspace_execute_print.js \
-                 browser_workspace_inspect.js \
-                 browser_workspace_files.js \
-                 browser_workspace_ui.js \
-                 browser_workspace_bug_646070_chrome_context_pref.js \
+                 browser_scratchpad_initialization.js \
+                 browser_scratchpad_contexts.js \
+                 browser_scratchpad_execute_print.js \
+                 browser_scratchpad_inspect.js \
+                 browser_scratchpad_files.js \
+                 browser_scratchpad_ui.js \
+                 browser_scratchpad_bug_646070_chrome_context_pref.js \
                  browser_overflowScroll.js \
                  browser_pageInfo.js \
                  browser_page_style_menu.js \
diff --git a/browser/base/content/test/browser_workspace_bug_646070_chrome_context_pref.js b/browser/base/content/test/browser_scratchpad_bug_646070_chrome_context_pref.js
similarity index 57%
rename from browser/base/content/test/browser_workspace_bug_646070_chrome_context_pref.js
rename to browser/base/content/test/browser_scratchpad_bug_646070_chrome_context_pref.js
index bc622bca1fe1..b000e8421ddd 100644
--- a/browser/base/content/test/browser_workspace_bug_646070_chrome_context_pref.js
+++ b/browser/base/content/test/browser_scratchpad_bug_646070_chrome_context_pref.js
@@ -2,8 +2,8 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-// Reference to the Workspace chrome window object.
-let gWorkspaceWindow;
+// Reference to the Scratchpad chrome window object.
+let gScratchpadWindow;
 
 let gOldPref;
 let DEVTOOLS_CHROME_ENABLED = "devtools.chrome.enabled";
@@ -19,50 +19,50 @@ function test()
   gBrowser.selectedBrowser.addEventListener("load", function() {
     gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
 
-    ok(Workspace, "Workspace variable exists");
+    ok(Scratchpad, "Scratchpad variable exists");
 
-    gWorkspaceWindow = Workspace.openWorkspace();
-    gWorkspaceWindow.addEventListener("load", runTests, false);
+    gScratchpadWindow = Scratchpad.openScratchpad();
+    gScratchpadWindow.addEventListener("load", runTests, false);
   }, true);
 
-  content.location = "data:text/html,Workspace test for bug 646070 - chrome context preference";
+  content.location = "data:text/html,Scratchpad test for bug 646070 - chrome context preference";
 }
 
 function runTests()
 {
-  gWorkspaceWindow.removeEventListener("load", arguments.callee, false);
+  gScratchpadWindow.removeEventListener("load", arguments.callee, false);
 
-  let ws = gWorkspaceWindow.Workspace;
-  ok(ws, "Workspace object exists in new window");
+  let sp = gScratchpadWindow.Scratchpad;
+  ok(sp, "Scratchpad object exists in new window");
 
-  let chromeContextMenu = gWorkspaceWindow.document.
-                          getElementById("ws-menu-chrome");
+  let chromeContextMenu = gScratchpadWindow.document.
+                          getElementById("sp-menu-chrome");
   ok(chromeContextMenu, "Chrome context menuitem element exists");
   ok(!chromeContextMenu.hasAttribute("hidden"),
      "Chrome context menuitem is visible");
 
-  let errorConsoleCommand = gWorkspaceWindow.document.
-                            getElementById("ws-cmd-errorConsole");
+  let errorConsoleCommand = gScratchpadWindow.document.
+                            getElementById("sp-cmd-errorConsole");
   ok(errorConsoleCommand, "Error console command element exists");
   ok(!errorConsoleCommand.hasAttribute("disabled"),
      "Error console command is enabled");
 
-  let errorConsoleMenu = gWorkspaceWindow.document.
-                         getElementById("ws-menu-errorConsole");
+  let errorConsoleMenu = gScratchpadWindow.document.
+                         getElementById("sp-menu-errorConsole");
   ok(errorConsoleMenu, "Error console menu element exists");
   ok(!errorConsoleMenu.hasAttribute("hidden"),
      "Error console menuitem is visible");
 
-  let chromeContextCommand = gWorkspaceWindow.document.
-                            getElementById("ws-cmd-chromeContext");
+  let chromeContextCommand = gScratchpadWindow.document.
+                            getElementById("sp-cmd-chromeContext");
   ok(chromeContextCommand, "Chrome context command element exists");
   ok(!chromeContextCommand.hasAttribute("disabled"),
      "Chrome context command is disabled");
 
   Services.prefs.setBoolPref(DEVTOOLS_CHROME_ENABLED, gOldPref);
 
-  gWorkspaceWindow.close();
-  gWorkspaceWindow = null;
+  gScratchpadWindow.close();
+  gScratchpadWindow = null;
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/base/content/test/browser_scratchpad_contexts.js b/browser/base/content/test/browser_scratchpad_contexts.js
new file mode 100644
index 000000000000..e9baf926700c
--- /dev/null
+++ b/browser/base/content/test/browser_scratchpad_contexts.js
@@ -0,0 +1,125 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Reference to the Scratchpad chrome window object.
+let gScratchpadWindow;
+
+function test()
+{
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+
+    gScratchpadWindow = Scratchpad.openScratchpad();
+    gScratchpadWindow.addEventListener("load", runTests, false);
+  }, true);
+
+  content.location = "data:text/html,test context switch in Scratchpad";
+}
+
+function runTests()
+{
+  gScratchpadWindow.removeEventListener("load", arguments.callee, false);
+
+  let sp = gScratchpadWindow.Scratchpad;
+
+  let contentMenu = gScratchpadWindow.document.getElementById("sp-menu-content");
+  let chromeMenu = gScratchpadWindow.document.getElementById("sp-menu-chrome");
+  let statusbar = sp.statusbarStatus;
+
+  ok(contentMenu, "found #sp-menu-content");
+  ok(chromeMenu, "found #sp-menu-chrome");
+  ok(statusbar, "found Scratchpad.statusbarStatus");
+
+  sp.setContentContext();
+
+  is(sp.executionContext, gScratchpadWindow.SCRATCHPAD_CONTEXT_CONTENT,
+     "executionContext is content");
+
+  is(contentMenu.getAttribute("checked"), "true",
+     "content menuitem is checked");
+
+  ok(!chromeMenu.hasAttribute("checked"),
+     "chrome menuitem is not checked");
+
+  is(statusbar.getAttribute("label"), contentMenu.getAttribute("label"),
+     "statusbar label is correct");
+
+  ok(sp.textbox, "textbox exists");
+  sp.textbox.value = "window.foobarBug636725 = 'aloha';";
+
+  ok(!content.wrappedJSObject.foobarBug636725,
+     "no content.foobarBug636725");
+
+  sp.execute();
+
+  is(content.wrappedJSObject.foobarBug636725, "aloha",
+     "content.foobarBug636725 has been set");
+
+  sp.setChromeContext();
+
+  is(sp.executionContext, gScratchpadWindow.SCRATCHPAD_CONTEXT_CHROME,
+     "executionContext is chrome");
+
+  is(chromeMenu.getAttribute("checked"), "true",
+     "chrome menuitem is checked");
+
+  ok(!contentMenu.hasAttribute("checked"),
+     "content menuitem is not checked");
+
+  is(statusbar.getAttribute("label"), chromeMenu.getAttribute("label"),
+     "statusbar label is correct");
+
+  sp.textbox.value = "window.foobarBug636725 = 'aloha2';";
+
+  ok(!window.foobarBug636725, "no window.foobarBug636725");
+
+  sp.execute();
+
+  is(window.foobarBug636725, "aloha2", "window.foobarBug636725 has been set");
+
+  sp.textbox.value = "window.gBrowser";
+
+  is(typeof sp.execute()[1].addTab, "function",
+     "chrome context has access to chrome objects");
+
+  // Check that the sandbox is cached.
+
+  sp.textbox.value = "typeof foobarBug636725cache;";
+  is(sp.execute()[1], "undefined", "global variable does not exist");
+
+  sp.textbox.value = "var foobarBug636725cache = 'foo';";
+  sp.execute();
+
+  sp.textbox.value = "typeof foobarBug636725cache;";
+  is(sp.execute()[1], "string",
+     "global variable exists across two different executions");
+
+  sp.resetContext();
+
+  is(sp.execute()[1], "undefined",
+     "global variable no longer exists after calling resetContext()");
+
+  sp.textbox.value = "var foobarBug636725cache2 = 'foo';";
+  sp.execute();
+
+  sp.textbox.value = "typeof foobarBug636725cache2;";
+  is(sp.execute()[1], "string",
+     "global variable exists across two different executions");
+
+  sp.setContentContext();
+
+  is(sp.executionContext, gScratchpadWindow.SCRATCHPAD_CONTEXT_CONTENT,
+     "executionContext is content");
+
+  is(sp.execute()[1], "undefined",
+     "global variable no longer exists after changing the context");
+
+  gScratchpadWindow.close();
+  gScratchpadWindow = null;
+  gBrowser.removeCurrentTab();
+  finish();
+}
diff --git a/browser/base/content/test/browser_workspace_execute_print.js b/browser/base/content/test/browser_scratchpad_execute_print.js
similarity index 51%
rename from browser/base/content/test/browser_workspace_execute_print.js
rename to browser/base/content/test/browser_scratchpad_execute_print.js
index 3257b897ce7e..91aa8d1f23b9 100644
--- a/browser/base/content/test/browser_workspace_execute_print.js
+++ b/browser/base/content/test/browser_scratchpad_execute_print.js
@@ -2,8 +2,8 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-// Reference to the Workspace chrome window object.
-let gWorkspaceWindow;
+// Reference to the Scratchpad chrome window object.
+let gScratchpadWindow;
 
 function test()
 {
@@ -13,103 +13,103 @@ function test()
   gBrowser.selectedBrowser.addEventListener("load", function() {
     gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
 
-    gWorkspaceWindow = Workspace.openWorkspace();
-    gWorkspaceWindow.addEventListener("load", runTests, false);
+    gScratchpadWindow = Scratchpad.openScratchpad();
+    gScratchpadWindow.addEventListener("load", runTests, false);
   }, true);
 
-  content.location = "data:text/html,<p>test execute() and print() in Workspace";
+  content.location = "data:text/html,<p>test execute() and print() in Scratchpad";
 }
 
 function runTests()
 {
-  gWorkspaceWindow.removeEventListener("load", arguments.callee, false);
+  gScratchpadWindow.removeEventListener("load", arguments.callee, false);
 
-  let ws = gWorkspaceWindow.Workspace;
+  let sp = gScratchpadWindow.Scratchpad;
 
   content.wrappedJSObject.foobarBug636725 = 1;
 
-  ok(ws.textbox, "textbox exists");
-  ws.textbox.value = "++window.foobarBug636725";
+  ok(sp.textbox, "textbox exists");
+  sp.textbox.value = "++window.foobarBug636725";
 
-  let exec = ws.execute();
-  is(exec[0], ws.textbox.value, "execute()[0] is correct");
+  let exec = sp.execute();
+  is(exec[0], sp.textbox.value, "execute()[0] is correct");
   is(exec[1], content.wrappedJSObject.foobarBug636725,
      "execute()[1] is correct");
 
-  is(ws.textbox.value, "++window.foobarBug636725",
+  is(sp.textbox.value, "++window.foobarBug636725",
      "execute() does not change the textbox value");
 
   is(content.wrappedJSObject.foobarBug636725, 2,
      "execute() updated window.foobarBug636725");
 
-  ws.print();
+  sp.print();
 
   is(content.wrappedJSObject.foobarBug636725, 3,
      "print() updated window.foobarBug636725");
 
-  is(ws.textbox.value, "++window.foobarBug636725/*\n3\n*/",
+  is(sp.textbox.value, "++window.foobarBug636725/*\n3\n*/",
      "print() shows evaluation result in the textbox");
 
-  is(ws.selectedText, "/*\n3\n*/", "selectedText is correct");
-  is(ws.textbox.selectionStart, 24, "selectionStart is correct");
-  is(ws.textbox.selectionEnd, 31, "selectionEnd is correct");
+  is(sp.selectedText, "/*\n3\n*/", "selectedText is correct");
+  is(sp.textbox.selectionStart, 24, "selectionStart is correct");
+  is(sp.textbox.selectionEnd, 31, "selectionEnd is correct");
 
   // Test selection execute() and print().
 
-  ws.textbox.value = "window.foobarBug636725 = 'a';\n" +
+  sp.textbox.value = "window.foobarBug636725 = 'a';\n" +
                      "window.foobarBug636725 = 'b';";
 
-  ws.selectRange(1, 2);
+  sp.selectRange(1, 2);
 
-  is(ws.textbox.selectionStart, 1, "selectionStart is 1");
-  is(ws.textbox.selectionEnd, 2, "selectionEnd is 2");
+  is(sp.textbox.selectionStart, 1, "selectionStart is 1");
+  is(sp.textbox.selectionEnd, 2, "selectionEnd is 2");
 
-  ws.selectRange(0, 29);
+  sp.selectRange(0, 29);
 
-  is(ws.textbox.selectionStart, 0, "selectionStart is 0");
-  is(ws.textbox.selectionEnd, 29, "selectionEnd is 29");
+  is(sp.textbox.selectionStart, 0, "selectionStart is 0");
+  is(sp.textbox.selectionEnd, 29, "selectionEnd is 29");
 
-  exec = ws.execute();
+  exec = sp.execute();
 
   is(exec[0], "window.foobarBug636725 = 'a';",
      "execute()[0] is correct");
   is(exec[1], "a",
      "execute()[1] is correct");
 
-  is(ws.textbox.value, "window.foobarBug636725 = 'a';\n" +
+  is(sp.textbox.value, "window.foobarBug636725 = 'a';\n" +
                        "window.foobarBug636725 = 'b';",
      "execute() does not change the textbox value");
 
   is(content.wrappedJSObject.foobarBug636725, "a",
      "execute() worked for the selected range");
 
-  ws.textbox.value = "window.foobarBug636725 = 'c';\n" +
+  sp.textbox.value = "window.foobarBug636725 = 'c';\n" +
                      "window.foobarBug636725 = 'b';";
 
-  ws.selectRange(0, 22);
+  sp.selectRange(0, 22);
 
-  ws.print();
+  sp.print();
 
   is(content.wrappedJSObject.foobarBug636725, "a",
      "print() worked for the selected range");
 
-  is(ws.textbox.value, "window.foobarBug636725" +
+  is(sp.textbox.value, "window.foobarBug636725" +
                        "/*\na\n*/" +
                        " = 'c';\n" +
                        "window.foobarBug636725 = 'b';",
      "print() shows evaluation result in the textbox");
 
-  is(ws.selectedText, "/*\na\n*/", "selectedText is correct");
-  is(ws.textbox.selectionStart, 22, "selectionStart is correct");
-  is(ws.textbox.selectionEnd, 29, "selectionEnd is correct");
+  is(sp.selectedText, "/*\na\n*/", "selectedText is correct");
+  is(sp.textbox.selectionStart, 22, "selectionStart is correct");
+  is(sp.textbox.selectionEnd, 29, "selectionEnd is correct");
 
-  ws.deselect();
+  sp.deselect();
 
-  ok(!ws.selectedText, "selectedText is empty");
-  is(ws.textbox.selectionStart, ws.textbox.selectionEnd, "deselect() works");
+  ok(!sp.selectedText, "selectedText is empty");
+  is(sp.textbox.selectionStart, sp.textbox.selectionEnd, "deselect() works");
 
-  gWorkspaceWindow.close();
-  gWorkspaceWindow = null;
+  gScratchpadWindow.close();
+  gScratchpadWindow = null;
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/base/content/test/browser_workspace_files.js b/browser/base/content/test/browser_scratchpad_files.js
similarity index 73%
rename from browser/base/content/test/browser_workspace_files.js
rename to browser/base/content/test/browser_scratchpad_files.js
index 478a60b31e0b..1b3ce4c2ad57 100644
--- a/browser/base/content/test/browser_workspace_files.js
+++ b/browser/base/content/test/browser_scratchpad_files.js
@@ -9,11 +9,11 @@ const Cu = Components.utils;
 Cu.import("resource://gre/modules/NetUtil.jsm");
 Cu.import("resource://gre/modules/FileUtils.jsm");
 
-// Reference to the Workspace chrome window object.
-let gWorkspaceWindow;
+// Reference to the Scratchpad chrome window object.
+let gScratchpadWindow;
 
-// Reference to the Workspace object.
-let gWorkspace;
+// Reference to the Scratchpad object.
+let gScratchpad;
 
 // Reference to the temporary nsIFile we will work with.
 let gFile;
@@ -29,18 +29,18 @@ function test()
   gBrowser.selectedBrowser.addEventListener("load", function() {
     gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
 
-    gWorkspaceWindow = Workspace.openWorkspace();
-    gWorkspaceWindow.addEventListener("load", runTests, false);
+    gScratchpadWindow = Scratchpad.openScratchpad();
+    gScratchpadWindow.addEventListener("load", runTests, false);
   }, true);
 
-  content.location = "data:text/html,<p>test file open and save in Workspace";
+  content.location = "data:text/html,<p>test file open and save in Scratchpad";
 }
 
 function runTests()
 {
-  gWorkspaceWindow.removeEventListener("load", arguments.callee, false);
+  gScratchpadWindow.removeEventListener("load", arguments.callee, false);
 
-  gWorkspace = gWorkspaceWindow.Workspace;
+  gScratchpad = gScratchpadWindow.Scratchpad;
 
   // Create a temporary file.
   gFile = FileUtils.getFile("TmpD", ["fileForBug636725.tmp"]);
@@ -65,52 +65,52 @@ function tempFileSaved(aStatus)
   ok(Components.isSuccessCode(aStatus),
      "the temporary file was saved successfully");
 
-  // Import the file into Workspace.
-  gWorkspace.importFromFile(gFile.QueryInterface(Ci.nsILocalFile),  true,
+  // Import the file into Scratchpad.
+  gScratchpad.importFromFile(gFile.QueryInterface(Ci.nsILocalFile),  true,
                             fileImported);
 }
 
 function fileImported(aStatus, aFileContent)
 {
   ok(Components.isSuccessCode(aStatus),
-     "the temporary file was imported successfully with Workspace");
+     "the temporary file was imported successfully with Scratchpad");
 
   is(aFileContent, gFileContent,
      "received data is correct");
 
-  is(gWorkspace.textbox.value, gFileContent,
+  is(gScratchpad.textbox.value, gFileContent,
      "the textbox.value is correct");
 
   // Save the file after changes.
   gFileContent += "// omg, saved!";
-  gWorkspace.textbox.value = gFileContent;
+  gScratchpad.textbox.value = gFileContent;
 
-  gWorkspace.exportToFile(gFile.QueryInterface(Ci.nsILocalFile), true, true,
+  gScratchpad.exportToFile(gFile.QueryInterface(Ci.nsILocalFile), true, true,
                           fileExported);
 }
 
 function fileExported(aStatus)
 {
   ok(Components.isSuccessCode(aStatus),
-     "the temporary file was exported successfully with Workspace");
+     "the temporary file was exported successfully with Scratchpad");
 
   let oldContent = gFileContent;
 
   // Attempt another file save, with confirmation which returns false.
   gFileContent += "// omg, saved twice!";
-  gWorkspace.textbox.value = gFileContent;
+  gScratchpad.textbox.value = gFileContent;
 
-  let oldConfirm = gWorkspaceWindow.confirm;
+  let oldConfirm = gScratchpadWindow.confirm;
   let askedConfirmation = false;
-  gWorkspaceWindow.confirm = function() {
+  gScratchpadWindow.confirm = function() {
     askedConfirmation = true;
     return false;
   };
 
-  gWorkspace.exportToFile(gFile.QueryInterface(Ci.nsILocalFile), false, true,
+  gScratchpad.exportToFile(gFile.QueryInterface(Ci.nsILocalFile), false, true,
                           fileExported2);
 
-  gWorkspaceWindow.confirm = oldConfirm;
+  gScratchpadWindow.confirm = oldConfirm;
 
   ok(askedConfirmation, "exportToFile() asked for overwrite confirmation");
 
@@ -141,9 +141,9 @@ function fileRead(aInputStream, aStatus)
   // Done!
   gFile.remove(false);
   gFile = null;
-  gWorkspace = null;
-  gWorkspaceWindow.close();
-  gWorkspaceWindow = null;
+  gScratchpad = null;
+  gScratchpadWindow.close();
+  gScratchpadWindow = null;
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/base/content/test/browser_scratchpad_initialization.js b/browser/base/content/test/browser_scratchpad_initialization.js
new file mode 100644
index 000000000000..bf2ad9b9c88b
--- /dev/null
+++ b/browser/base/content/test/browser_scratchpad_initialization.js
@@ -0,0 +1,63 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Reference to the Scratchpad chrome window object.
+let gScratchpadWindow;
+
+function test()
+{
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+
+    ok(Scratchpad, "Scratchpad variable exists");
+
+    gScratchpadWindow = Scratchpad.openScratchpad();
+    gScratchpadWindow.addEventListener("load", runTests, false);
+  }, true);
+
+  content.location = "data:text/html,initialization test for Scratchpad";
+}
+
+function runTests()
+{
+  gScratchpadWindow.removeEventListener("load", arguments.callee, false);
+
+  let sp = gScratchpadWindow.Scratchpad;
+  ok(sp, "Scratchpad object exists in new window");
+  is(typeof sp.execute, "function", "Scratchpad.execute() exists");
+  is(typeof sp.inspect, "function", "Scratchpad.inspect() exists");
+  is(typeof sp.print, "function", "Scratchpad.print() exists");
+
+  let chromeContextMenu = gScratchpadWindow.document.
+                          getElementById("sp-menu-chrome");
+  ok(chromeContextMenu, "Chrome context menuitem element exists");
+  is(chromeContextMenu.getAttribute("hidden"), "true",
+     "Chrome context menuitem is hidden");
+
+  let errorConsoleCommand = gScratchpadWindow.document.
+                            getElementById("sp-cmd-errorConsole");
+  ok(errorConsoleCommand, "Error console command element exists");
+  is(errorConsoleCommand.getAttribute("disabled"), "true",
+     "Error console command is disabled");
+
+  let errorConsoleMenu = gScratchpadWindow.document.
+                         getElementById("sp-menu-errorConsole");
+  ok(errorConsoleMenu, "Error console menu element exists");
+  is(errorConsoleMenu.getAttribute("hidden"), "true",
+     "Error console menu item is hidden");
+
+  let chromeContextCommand = gScratchpadWindow.document.
+                            getElementById("sp-cmd-chromeContext");
+  ok(chromeContextCommand, "Chrome context command element exists");
+  is(chromeContextCommand.getAttribute("disabled"), "true",
+     "Chrome context command is disabled");
+
+  gScratchpadWindow.close();
+  gScratchpadWindow = null;
+  gBrowser.removeCurrentTab();
+  finish();
+}
diff --git a/browser/base/content/test/browser_workspace_inspect.js b/browser/base/content/test/browser_scratchpad_inspect.js
similarity index 67%
rename from browser/base/content/test/browser_workspace_inspect.js
rename to browser/base/content/test/browser_scratchpad_inspect.js
index e0cc6ddacca1..1c43cafb2001 100644
--- a/browser/base/content/test/browser_workspace_inspect.js
+++ b/browser/base/content/test/browser_scratchpad_inspect.js
@@ -2,8 +2,8 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-// Reference to the Workspace chrome window object.
-let gWorkspaceWindow;
+// Reference to the Scratchpad chrome window object.
+let gScratchpadWindow;
 
 function test()
 {
@@ -13,26 +13,26 @@ function test()
   gBrowser.selectedBrowser.addEventListener("load", function() {
     gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
 
-    gWorkspaceWindow = Workspace.openWorkspace();
-    gWorkspaceWindow.addEventListener("load", runTests, false);
+    gScratchpadWindow = Scratchpad.openScratchpad();
+    gScratchpadWindow.addEventListener("load", runTests, false);
   }, true);
 
   content.location = "data:text/html,<title>foobarBug636725</title>" +
-    "<p>test inspect() in Workspace";
+    "<p>test inspect() in Scratchpad";
 }
 
 function runTests()
 {
-  gWorkspaceWindow.removeEventListener("load", arguments.callee, false);
+  gScratchpadWindow.removeEventListener("load", arguments.callee, false);
 
-  let ws = gWorkspaceWindow.Workspace;
+  let sp = gScratchpadWindow.Scratchpad;
 
-  ok(ws.textbox, "textbox exists");
-  ws.textbox.value = "document";
+  ok(sp.textbox, "textbox exists");
+  sp.textbox.value = "document";
 
-  ws.inspect();
+  sp.inspect();
 
-  let propPanel = document.querySelector(".workspace_propertyPanel");
+  let propPanel = document.querySelector(".scratchpad_propertyPanel");
   ok(propPanel, "property panel is open");
 
   propPanel.addEventListener("popupshown", function() {
@@ -56,8 +56,8 @@ function runTests()
     executeSoon(function() {
       propPanel.hidePopup();
 
-      gWorkspaceWindow.close();
-      gWorkspaceWindow = null;
+      gScratchpadWindow.close();
+      gScratchpadWindow = null;
       gBrowser.removeCurrentTab();
       finish();
     });
diff --git a/browser/base/content/test/browser_scratchpad_ui.js b/browser/base/content/test/browser_scratchpad_ui.js
new file mode 100644
index 000000000000..d6cf5b7b8daf
--- /dev/null
+++ b/browser/base/content/test/browser_scratchpad_ui.js
@@ -0,0 +1,81 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Reference to the Scratchpad chrome window object.
+let gScratchpadWindow;
+
+function test()
+{
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+
+    gScratchpadWindow = Scratchpad.openScratchpad();
+    gScratchpadWindow.addEventListener("load", runTests, false);
+  }, true);
+
+  content.location = "data:text/html,<title>foobarBug636725</title>" +
+    "<p>test inspect() in Scratchpad";
+}
+
+function runTests()
+{
+  gScratchpadWindow.removeEventListener("load", arguments.callee, false);
+
+  let sp = gScratchpadWindow.Scratchpad;
+  let doc = gScratchpadWindow.document;
+
+  let methodsAndItems = {
+    "sp-menu-newscratchpad": "openScratchpad",
+    "sp-menu-open": "openFile",
+    "sp-menu-save": "saveFile",
+    "sp-menu-saveas": "saveFileAs",
+    "sp-text-execute": "execute",
+    "sp-text-inspect": "inspect",
+    "sp-menu-content": "setContentContext",
+    "sp-menu-chrome": "setChromeContext",
+    "sp-menu-resetContext": "resetContext",
+    "sp-menu-errorConsole": "openErrorConsole",
+    "sp-menu-webConsole": "openWebConsole",
+  };
+
+  let lastMethodCalled = null;
+  sp.__noSuchMethod__ = function(aMethodName) {
+    lastMethodCalled = aMethodName;
+  };
+
+  for (let id in methodsAndItems) {
+    lastMethodCalled = null;
+
+    let methodName = methodsAndItems[id];
+    let oldMethod = sp[methodName];
+    ok(oldMethod, "found method " + methodName + " in Scratchpad object");
+
+    delete sp[methodName];
+
+    let menu = doc.getElementById(id);
+    ok(menu, "found menuitem #" + id);
+
+    try {
+      menu.doCommand();
+    }
+    catch (ex) {
+      ok(false, "exception thrown while executing the command of menuitem #" + id);
+    }
+
+    ok(lastMethodCalled == methodName,
+       "method " + methodName + " invoked by the associated menuitem");
+
+    sp[methodName] = oldMethod;
+  }
+
+  delete sp.__noSuchMethod__;
+
+  gScratchpadWindow.close();
+  gScratchpadWindow = null;
+  gBrowser.removeCurrentTab();
+  finish();
+}
diff --git a/browser/base/content/test/browser_workspace_contexts.js b/browser/base/content/test/browser_workspace_contexts.js
deleted file mode 100644
index 6cc8f18edaa3..000000000000
--- a/browser/base/content/test/browser_workspace_contexts.js
+++ /dev/null
@@ -1,125 +0,0 @@
-/* vim: set ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-// Reference to the Workspace chrome window object.
-let gWorkspaceWindow;
-
-function test()
-{
-  waitForExplicitFinish();
-
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function() {
-    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
-
-    gWorkspaceWindow = Workspace.openWorkspace();
-    gWorkspaceWindow.addEventListener("load", runTests, false);
-  }, true);
-
-  content.location = "data:text/html,test context switch in Workspace";
-}
-
-function runTests()
-{
-  gWorkspaceWindow.removeEventListener("load", arguments.callee, false);
-
-  let ws = gWorkspaceWindow.Workspace;
-
-  let contentMenu = gWorkspaceWindow.document.getElementById("ws-menu-content");
-  let chromeMenu = gWorkspaceWindow.document.getElementById("ws-menu-chrome");
-  let statusbar = ws.statusbarStatus;
-
-  ok(contentMenu, "found #ws-menu-content");
-  ok(chromeMenu, "found #ws-menu-chrome");
-  ok(statusbar, "found Workspace.statusbarStatus");
-
-  ws.setContentContext();
-
-  is(ws.executionContext, gWorkspaceWindow.WORKSPACE_CONTEXT_CONTENT,
-     "executionContext is content");
-
-  is(contentMenu.getAttribute("checked"), "true",
-     "content menuitem is checked");
-
-  ok(!chromeMenu.hasAttribute("checked"),
-     "chrome menuitem is not checked");
-
-  is(statusbar.getAttribute("label"), contentMenu.getAttribute("label"),
-     "statusbar label is correct");
-
-  ok(ws.textbox, "textbox exists");
-  ws.textbox.value = "window.foobarBug636725 = 'aloha';";
-
-  ok(!content.wrappedJSObject.foobarBug636725,
-     "no content.foobarBug636725");
-
-  ws.execute();
-
-  is(content.wrappedJSObject.foobarBug636725, "aloha",
-     "content.foobarBug636725 has been set");
-
-  ws.setChromeContext();
-
-  is(ws.executionContext, gWorkspaceWindow.WORKSPACE_CONTEXT_CHROME,
-     "executionContext is chrome");
-
-  is(chromeMenu.getAttribute("checked"), "true",
-     "chrome menuitem is checked");
-
-  ok(!contentMenu.hasAttribute("checked"),
-     "content menuitem is not checked");
-
-  is(statusbar.getAttribute("label"), chromeMenu.getAttribute("label"),
-     "statusbar label is correct");
-
-  ws.textbox.value = "window.foobarBug636725 = 'aloha2';";
-
-  ok(!window.foobarBug636725, "no window.foobarBug636725");
-
-  ws.execute();
-
-  is(window.foobarBug636725, "aloha2", "window.foobarBug636725 has been set");
-
-  ws.textbox.value = "window.gBrowser";
-
-  is(typeof ws.execute()[1].addTab, "function",
-     "chrome context has access to chrome objects");
-
-  // Check that the sandbox is cached.
-
-  ws.textbox.value = "typeof foobarBug636725cache;";
-  is(ws.execute()[1], "undefined", "global variable does not exist");
-
-  ws.textbox.value = "var foobarBug636725cache = 'foo';";
-  ws.execute();
-
-  ws.textbox.value = "typeof foobarBug636725cache;";
-  is(ws.execute()[1], "string",
-     "global variable exists across two different executions");
-
-  ws.resetContext();
-
-  is(ws.execute()[1], "undefined",
-     "global variable no longer exists after calling resetContext()");
-
-  ws.textbox.value = "var foobarBug636725cache2 = 'foo';";
-  ws.execute();
-
-  ws.textbox.value = "typeof foobarBug636725cache2;";
-  is(ws.execute()[1], "string",
-     "global variable exists across two different executions");
-
-  ws.setContentContext();
-
-  is(ws.executionContext, gWorkspaceWindow.WORKSPACE_CONTEXT_CONTENT,
-     "executionContext is content");
-
-  is(ws.execute()[1], "undefined",
-     "global variable no longer exists after changing the context");
-
-  gWorkspaceWindow.close();
-  gWorkspaceWindow = null;
-  gBrowser.removeCurrentTab();
-  finish();
-}
diff --git a/browser/base/content/test/browser_workspace_initialization.js b/browser/base/content/test/browser_workspace_initialization.js
deleted file mode 100644
index 3e0218215fc6..000000000000
--- a/browser/base/content/test/browser_workspace_initialization.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/* vim: set ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-// Reference to the Workspace chrome window object.
-let gWorkspaceWindow;
-
-function test()
-{
-  waitForExplicitFinish();
-
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function() {
-    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
-
-    ok(Workspace, "Workspace variable exists");
-
-    gWorkspaceWindow = Workspace.openWorkspace();
-    gWorkspaceWindow.addEventListener("load", runTests, false);
-  }, true);
-
-  content.location = "data:text/html,initialization test for Workspace";
-}
-
-function runTests()
-{
-  gWorkspaceWindow.removeEventListener("load", arguments.callee, false);
-
-  let ws = gWorkspaceWindow.Workspace;
-  ok(ws, "Workspace object exists in new window");
-  is(typeof ws.execute, "function", "Workspace.execute() exists");
-  is(typeof ws.inspect, "function", "Workspace.inspect() exists");
-  is(typeof ws.print, "function", "Workspace.print() exists");
-
-  let chromeContextMenu = gWorkspaceWindow.document.
-                          getElementById("ws-menu-chrome");
-  ok(chromeContextMenu, "Chrome context menuitem element exists");
-  is(chromeContextMenu.getAttribute("hidden"), "true",
-     "Chrome context menuitem is hidden");
-
-  let errorConsoleCommand = gWorkspaceWindow.document.
-                            getElementById("ws-cmd-errorConsole");
-  ok(errorConsoleCommand, "Error console command element exists");
-  is(errorConsoleCommand.getAttribute("disabled"), "true",
-     "Error console command is disabled");
-
-  let errorConsoleMenu = gWorkspaceWindow.document.
-                         getElementById("ws-menu-errorConsole");
-  ok(errorConsoleMenu, "Error console menu element exists");
-  is(errorConsoleMenu.getAttribute("hidden"), "true",
-     "Error console menu item is hidden");
-
-  let chromeContextCommand = gWorkspaceWindow.document.
-                            getElementById("ws-cmd-chromeContext");
-  ok(chromeContextCommand, "Chrome context command element exists");
-  is(chromeContextCommand.getAttribute("disabled"), "true",
-     "Chrome context command is disabled");
-
-  gWorkspaceWindow.close();
-  gWorkspaceWindow = null;
-  gBrowser.removeCurrentTab();
-  finish();
-}
diff --git a/browser/base/content/test/browser_workspace_ui.js b/browser/base/content/test/browser_workspace_ui.js
deleted file mode 100644
index b1af4447e148..000000000000
--- a/browser/base/content/test/browser_workspace_ui.js
+++ /dev/null
@@ -1,81 +0,0 @@
-/* vim: set ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-// Reference to the Workspace chrome window object.
-let gWorkspaceWindow;
-
-function test()
-{
-  waitForExplicitFinish();
-
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function() {
-    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
-
-    gWorkspaceWindow = Workspace.openWorkspace();
-    gWorkspaceWindow.addEventListener("load", runTests, false);
-  }, true);
-
-  content.location = "data:text/html,<title>foobarBug636725</title>" +
-    "<p>test inspect() in Workspace";
-}
-
-function runTests()
-{
-  gWorkspaceWindow.removeEventListener("load", arguments.callee, false);
-
-  let ws = gWorkspaceWindow.Workspace;
-  let doc = gWorkspaceWindow.document;
-
-  let methodsAndItems = {
-    "ws-menu-newworkspace": "openWorkspace",
-    "ws-menu-open": "openFile",
-    "ws-menu-save": "saveFile",
-    "ws-menu-saveas": "saveFileAs",
-    "ws-text-execute": "execute",
-    "ws-text-inspect": "inspect",
-    "ws-menu-content": "setContentContext",
-    "ws-menu-chrome": "setChromeContext",
-    "ws-menu-resetContext": "resetContext",
-    "ws-menu-errorConsole": "openErrorConsole",
-    "ws-menu-webConsole": "openWebConsole",
-  };
-
-  let lastMethodCalled = null;
-  ws.__noSuchMethod__ = function(aMethodName) {
-    lastMethodCalled = aMethodName;
-  };
-
-  for (let id in methodsAndItems) {
-    lastMethodCalled = null;
-
-    let methodName = methodsAndItems[id];
-    let oldMethod = ws[methodName];
-    ok(oldMethod, "found method " + methodName + " in Workspace object");
-
-    delete ws[methodName];
-
-    let menu = doc.getElementById(id);
-    ok(menu, "found menuitem #" + id);
-
-    try {
-      menu.doCommand();
-    }
-    catch (ex) {
-      ok(false, "exception thrown while executing the command of menuitem #" + id);
-    }
-
-    ok(lastMethodCalled == methodName,
-       "method " + methodName + " invoked by the associated menuitem");
-
-    ws[methodName] = oldMethod;
-  }
-
-  delete ws.__noSuchMethod__;
-
-  gWorkspaceWindow.close();
-  gWorkspaceWindow = null;
-  gBrowser.removeCurrentTab();
-  finish();
-}
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index c043b39a4bb3..fb931687155c 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -29,8 +29,8 @@ browser.jar:
 *       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
 *       content/browser/fullscreen-video.xhtml        (content/fullscreen-video.xhtml)
 *       content/browser/inspector.html                (content/inspector.html)
-*       content/browser/workspace.xul                 (content/workspace.xul)
-*       content/browser/workspace.js                  (content/workspace.js)
+*       content/browser/scratchpad.xul                (content/scratchpad.xul)
+*       content/browser/scratchpad.js                 (content/scratchpad.js)
 *       content/browser/pageinfo/pageInfo.xul         (content/pageinfo/pageInfo.xul)
 *       content/browser/pageinfo/pageInfo.js          (content/pageinfo/pageInfo.js)
 *       content/browser/pageinfo/pageInfo.css         (content/pageinfo/pageInfo.css)
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index fab3d751aecc..ff34cab7fc29 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -191,10 +191,20 @@ can reach it easily. -->
 <!ENTITY inspectMenu.accesskey        "T">
 <!ENTITY inspectMenu.commandkey       "I">
 
-<!ENTITY workspace.label               "Workspace">
-<!ENTITY workspace.accesskey           "O">
-<!ENTITY workspace.keycode             "VK_F4">
-<!ENTITY workspace.keytext             "F4">
+<!-- LOCALIZATION NOTE (scratchpad.label): This menu item label appears
+  -  in the Tools menu. See bug 653093.
+  -  The Scratchpad is intended to provide a simple text editor for creating
+  -  and evaluating bits of JavaScript code for the purposes of function
+  -  prototyping, experimentation and convenient scripting.
+  -
+  -  It's quite possible that you won't have a good analogue for the word
+  -  "Scratchpad" in your locale. You should feel free to find a close
+  -  approximation to it or choose a word (or words) that means
+  -  "simple discardable text editor". -->
+<!ENTITY scratchpad.label             "Scratchpad">
+<!ENTITY scratchpad.accesskey         "r">
+<!ENTITY scratchpad.keycode           "VK_F4">
+<!ENTITY scratchpad.keytext           "F4">
 
 <!ENTITY inspectPanelTitle.label      "HTML">
 <!ENTITY inspectButton.label          "Inspect">
diff --git a/browser/locales/en-US/chrome/browser/workspace.dtd b/browser/locales/en-US/chrome/browser/scratchpad.dtd
similarity index 82%
rename from browser/locales/en-US/chrome/browser/workspace.dtd
rename to browser/locales/en-US/chrome/browser/scratchpad.dtd
index 35589c1a83cc..1b2de5b849be 100644
--- a/browser/locales/en-US/chrome/browser/workspace.dtd
+++ b/browser/locales/en-US/chrome/browser/scratchpad.dtd
@@ -1,7 +1,16 @@
-<!-- LOCALIZATION NOTE : FILE This file contains the Workspace window strings -->
+<!-- LOCALIZATION NOTE : FILE This file contains the Scratchpad window strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
 
-<!ENTITY window.title                 "Workspace">
+<!-- LOCALIZATION NOTE (scratchpad.title):
+  -  The Scratchpad is intended to provide a simple text editor for creating
+  -  and evaluating bits of JavaScript code for the purposes of function
+  -  prototyping, experimentation and convenient scripting.
+  -
+  -  It's quite possible that you won't have a good analogue for the word
+  -  "Scratchpad" in your locale. You should feel free to find a close
+  -  approximation to it or choose a word (or words) that means
+  -  "simple discardable text editor". -->
+<!ENTITY window.title                 "Scratchpad">
 
 <!ENTITY fileMenu.label               "File">
 <!ENTITY fileMenu.accesskey           "F">
diff --git a/browser/locales/en-US/chrome/browser/workspace.properties b/browser/locales/en-US/chrome/browser/scratchpad.properties
similarity index 75%
rename from browser/locales/en-US/chrome/browser/workspace.properties
rename to browser/locales/en-US/chrome/browser/scratchpad.properties
index 3b0dbab5241c..916a2dcc82ae 100644
--- a/browser/locales/en-US/chrome/browser/workspace.properties
+++ b/browser/locales/en-US/chrome/browser/scratchpad.properties
@@ -1,5 +1,5 @@
 # LOCALIZATION NOTE  (propertyPanel.updateButton.label): Used in the Property
-# Panel that is opened by the Workspace window when inspecting an object. This
+# Panel that is opened by the Scratchpad window when inspecting an object. This
 # is the Update button label.
 propertyPanel.updateButton.label=Update
 propertyPanel.updateButton.accesskey=U
@@ -9,12 +9,12 @@ propertyPanel.updateButton.accesskey=U
 export.fileOverwriteConfirmation=File exists. Overwrite?
 
 # LOCALIZATION NOTE  (browserWindow.unavailable): This error message is shown
-# when Workspace does not find any recently active window of navigator:browser
+# when Scratchpad does not find any recently active window of navigator:browser
 # type.
-browserWindow.unavailable=Workspace cannot find any browser window where to execute the code.
+browserWindow.unavailable=Scratchpad cannot find any browser window to execute the code in.
 
 # LOCALIZATION NOTE  (openFile.title): This is the file picker title, when you
-# open a file from Workspace.
+# open a file from Scratchpad.
 openFile.title=Open File
 
 # LOCALIZATION NOTE  (openFile.failed): This is the message displayed when file
@@ -22,7 +22,7 @@ openFile.title=Open File
 openFile.failed=Failed to read the file.
 
 # LOCALIZATION NOTE  (saveFileAs): This is the file picker title, when you save
-# a file in Workspace.
+# a file in Scratchpad.
 saveFileAs=Save File As
 
 # LOCALIZATION NOTE  (saveFile.failed): This is the message displayed when file
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
index eb4e225e2472..97599b5d8a38 100644
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -15,8 +15,8 @@
     locale/browser/baseMenuOverlay.dtd             (%chrome/browser/baseMenuOverlay.dtd)
     locale/browser/browser.properties              (%chrome/browser/browser.properties)
     locale/browser/inspector.properties            (%chrome/browser/inspector.properties)
-    locale/browser/workspace.properties            (%chrome/browser/workspace.properties)
-    locale/browser/workspace.dtd                   (%chrome/browser/workspace.dtd)
+    locale/browser/scratchpad.properties           (%chrome/browser/scratchpad.properties)
+    locale/browser/scratchpad.dtd                  (%chrome/browser/scratchpad.dtd)
     locale/browser/openLocation.dtd                (%chrome/browser/openLocation.dtd)
     locale/browser/openLocation.properties         (%chrome/browser/openLocation.properties)
 *   locale/browser/pageInfo.dtd                    (%chrome/browser/pageInfo.dtd)

From aa0fd29ba0b0726e6baac55de014d4ef79786364 Mon Sep 17 00:00:00 2001
From: Rob Campbell <rcampbell@mozilla.com>
Date: Mon, 9 May 2011 11:51:52 -0300
Subject: [PATCH 19/20] Bug 653934 - Add a comment to point people to original
 Workspace repo to Scratchpad.js; r=gavin.sharp,gerv

---
 browser/base/content/scratchpad.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/browser/base/content/scratchpad.js b/browser/base/content/scratchpad.js
index 28215c6d9a12..054317b00c0f 100644
--- a/browser/base/content/scratchpad.js
+++ b/browser/base/content/scratchpad.js
@@ -39,6 +39,15 @@
  *
  * ***** END LICENSE BLOCK *****/
 
+/*
+ * Original version history can be found here:
+ * https://github.com/mozilla/workspace
+ *
+ * Copied and relicensed from the Public Domain.
+ * See bug 653934 for details.
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=653934
+ */
+
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;

From 76c76cf8c805d51ae2d20123d8dc21ec4c14d3a2 Mon Sep 17 00:00:00 2001
From: Rob Campbell <rcampbell@mozilla.com>
Date: Mon, 9 May 2011 11:51:52 -0300
Subject: [PATCH 20/20] Bug 653221 - Create Web Developer Sub-menu in the Tools
 menu; r=dao

---
 browser/base/content/browser-menubar.inc      | 64 ++++++++++---------
 browser/base/content/test/Makefile.in         |  1 +
 .../base/content/test/browser_webdev_menu.js  | 43 +++++++++++++
 .../locales/en-US/chrome/browser/browser.dtd  |  3 +
 4 files changed, 82 insertions(+), 29 deletions(-)
 create mode 100644 browser/base/content/test/browser_webdev_menu.js

diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index 19f4e4892177..4009ba4d5cc6 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -315,11 +315,6 @@
                 </menu>
 #include browser-charsetmenu.inc
                 <menuseparator/>
-                <menuitem id="menu_pageSource"
-                          accesskey="&pageSourceCmd.accesskey;"
-                          label="&pageSourceCmd.label;"
-                          key="key_viewSource"
-                          command="View:PageSource"/>
                 <menuitem id="fullScreenItem"
                           accesskey="&fullScreenCmd.accesskey;"
                           label="&fullScreenCmd.label;"
@@ -539,30 +534,41 @@
                         oncommand="gSyncUI.doSync(event);"/>
 #endif
               <menuseparator id="devToolsSeparator"/>
-              <menuitem id="menu_pageinspect"
-                        type="checkbox"
-                        hidden="true"
-                        label="&inspectMenu.label;"
-                        accesskey="&inspectMenu.accesskey;"
-                        key="key_inspect"
-                        command="Tools:Inspect"/>
-              <menuitem id="javascriptConsole"
-                        hidden="true"
-                        label="&errorConsoleCmd.label;"
-                        accesskey="&errorConsoleCmd.accesskey;"
-                        key="key_errorConsole"
-                        oncommand="toJavaScriptConsole();"/>
-              <menuitem id="webConsole"
-                        label="&webConsoleCmd.label;"
-                        accesskey="&webConsoleCmd.accesskey;"
-                        key="key_webConsole"
-                        oncommand="HUDConsoleUI.toggleHUD();"/>
-              <menuitem id="menu_scratchpad"
-                        hidden="true"
-                        label="&scratchpad.label;"
-                        accesskey="&scratchpad.accesskey;"
-                        key="key_scratchpad"
-                        command="Tools:Scratchpad"/>
+              <menu id="webDeveloperMenu"
+                    label="&webDeveloperMenu.label;"
+                    accesskey="webDeveloperMenu.accesskey;">
+                <menupopup id="menuWebDeveloperPopup">
+                  <menuitem id="webConsole"
+                            label="&webConsoleCmd.label;"
+                            accesskey="&webConsoleCmd.accesskey;"
+                            key="key_webConsole"
+                            oncommand="HUDConsoleUI.toggleHUD();"/>
+                  <menuitem id="menu_pageinspect"
+                            type="checkbox"
+                            hidden="true"
+                            label="&inspectMenu.label;"
+                            accesskey="&inspectMenu.accesskey;"
+                            key="key_inspect"
+                            command="Tools:Inspect"/>
+                  <menuitem id="menu_scratchpad"
+                            hidden="true"
+                            label="&scratchpad.label;"
+                            accesskey="&scratchpad.accesskey;"
+                            key="key_scratchpad"
+                            command="Tools:Scratchpad"/>
+                  <menuitem id="menu_pageSource"
+                            accesskey="&pageSourceCmd.accesskey;"
+                            label="&pageSourceCmd.label;"
+                            key="key_viewSource"
+                            command="View:PageSource"/>
+                  <menuitem id="javascriptConsole"
+                            hidden="true"
+                            label="&errorConsoleCmd.label;"
+                            accesskey="&errorConsoleCmd.accesskey;"
+                            key="key_errorConsole"
+                            oncommand="toJavaScriptConsole();"/>
+                </menupopup>
+              </menu>
               <menuitem id="menu_pageInfo"
                         accesskey="&pageInfoCmd.accesskey;"
                         label="&pageInfoCmd.label;"
diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index 6ac661849606..e8bc6f32657d 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -229,6 +229,7 @@ _BROWSER_FILES = \
                  browser_visibleTabs_bookmarkAllPages.js \
                  browser_visibleTabs_bookmarkAllTabs.js \
                  browser_visibleTabs_tabPreview.js \
+                 browser_webdev_menu.js \
                  bug592338.html \
                  disablechrome.html \
                  discovery.html \
diff --git a/browser/base/content/test/browser_webdev_menu.js b/browser/base/content/test/browser_webdev_menu.js
new file mode 100644
index 000000000000..793f171d7036
--- /dev/null
+++ b/browser/base/content/test/browser_webdev_menu.js
@@ -0,0 +1,43 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function menuTest()
+{
+  gBrowser.selectedBrowser.removeEventListener("load", menuTest, true);
+
+  let menuContents = [
+    "menu_pageinspect",
+    "webConsole",
+    "menu_scratchpad",
+    "menu_pageSource",
+    "javascriptConsole"
+  ];
+
+  let menu = document.getElementById("webDeveloperMenu");
+  ok(menu, "we have the menu");
+
+  let popup = menu.firstChild;
+  is(popup.id, "menuWebDeveloperPopup", "menu first child is menuWebDeveloperPopup");
+
+  is(popup.childNodes.length, menuContents.length, "popup childNodes.length matches");
+
+  for(let a = 0; a < popup.children.length; a++) {
+    isnot(menuContents.indexOf(popup.children[a].id), -1, "menuitem " + popup.children[a].id + " in popup");
+  };
+
+  gBrowser.removeCurrentTab();
+  finish();  
+}
+
+function test()
+{
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", menuTest, true);
+
+  content.location = "data:text/html,<title>Web Developer Menu Test</title>" +
+    "<p>testing the Web Developer Menu";
+}
+
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index ff34cab7fc29..ab3772e72f14 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -179,6 +179,9 @@ can reach it easily. -->
 <!ENTITY addons.accesskey             "A">
 <!ENTITY addons.commandkey            "A">
 
+<!ENTITY webDeveloperMenu.label       "Web Developer">
+<!ENTITY webDeveloperMenu.accesskey   "W">
+
 <!ENTITY errorConsoleCmd.label        "Error Console">
 <!ENTITY errorConsoleCmd.accesskey    "C">
 <!ENTITY errorConsoleCmd.commandkey   "j">