diff -r 000000000000 -r 6474c204b198 browser/devtools/debugger/test/browser_dbg_blackboxing-04.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/browser/devtools/debugger/test/browser_dbg_blackboxing-04.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,61 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Test that we get a stack frame for each black boxed source, not a single one
+ * for all of them.
+ */
+
+const TAB_URL = EXAMPLE_URL + "doc_blackboxing.html";
+const BLACKBOXME_URL = EXAMPLE_URL + "code_blackboxing_blackboxme.js"
+
+let gTab, gDebuggee, gPanel, gDebugger;
+let gFrames;
+
+function test() {
+  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+    gTab = aTab;
+    gDebuggee = aDebuggee;
+    gPanel = aPanel;
+    gDebugger = gPanel.panelWin;
+    gFrames = gDebugger.DebuggerView.StackFrames;
+
+    waitForSourceShown(gPanel, BLACKBOXME_URL)
+      .then(blackBoxSources)
+      .then(testBlackBoxStack)
+      .then(() => resumeDebuggerThenCloseAndFinish(gPanel))
+      .then(null, aError => {
+        ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
+      });
+  });
+}
+
+function blackBoxSources() {
+  let finished = waitForThreadEvents(gPanel, "blackboxchange", 3);
+  toggleBlackBoxing(gPanel, EXAMPLE_URL + "code_blackboxing_one.js");
+  toggleBlackBoxing(gPanel, EXAMPLE_URL + "code_blackboxing_two.js");
+  toggleBlackBoxing(gPanel, EXAMPLE_URL + "code_blackboxing_three.js");
+  return finished;
+}
+
+function testBlackBoxStack() {
+  let finished = waitForSourceAndCaretAndScopes(gPanel, ".html", 21).then(() => {
+    is(gFrames.itemCount, 4,
+      "Should get 4 frames (one -> two -> three -> doDebuggerStatement).");
+    is(gDebugger.document.querySelectorAll(".dbg-stackframe-black-boxed").length, 3,
+      "And 'one', 'two', and 'three' should each have their own black boxed frame.");
+  });
+
+  // Spin the event loop before causing the debuggee to pause, to allow
+  // this function to return first.
+  executeSoon(() => gDebuggee.one());
+  return finished;
+}
+
+registerCleanupFunction(function() {
+  gTab = null;
+  gDebuggee = null;
+  gPanel = null;
+  gDebugger = null;
+  gFrames = null;
+});