From 4de80e41282a000f3b26e5ee5c343fb036ab3087 Mon Sep 17 00:00:00 2001
From: Eddy Bruel <ejpbruel@mozilla.com>
Date: Tue, 1 Mar 2016 14:57:01 +0100
Subject: [PATCH] Bug 1119490 - Enable source maps for workers;r=jryans

---
 devtools/shared/client/main.js   | 3 ++-
 devtools/shared/worker/loader.js | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/devtools/shared/client/main.js b/devtools/shared/client/main.js
index ca47b67a934..ee0429afdc8 100644
--- a/devtools/shared/client/main.js
+++ b/devtools/shared/client/main.js
@@ -1450,7 +1450,8 @@ WorkerClient.prototype = {
 
       return this.request({
         to: connectReponse.threadActor,
-        type: "attach"
+        type: "attach",
+        options: aOptions
       }).then(attachResponse => {
         if (attachResponse.error) {
           aOnResponse(attachResponse, null);
diff --git a/devtools/shared/worker/loader.js b/devtools/shared/worker/loader.js
index f96a274c569..dcf76af8046 100644
--- a/devtools/shared/worker/loader.js
+++ b/devtools/shared/worker/loader.js
@@ -366,6 +366,7 @@ var loader = {
 
 var {
   Debugger,
+  URL,
   createSandbox,
   dump,
   rpc,
@@ -428,6 +429,7 @@ var {
 
     return {
       Debugger,
+      URL: this.URL,
       createSandbox,
       dump: this.dump,
       rpc,
@@ -465,6 +467,7 @@ var {
 
     return {
       Debugger: this.Debugger,
+      URL: this.URL,
       createSandbox: this.createSandbox,
       dump: this.dump,
       rpc: this.rpc,
@@ -494,7 +497,7 @@ this.worker = new WorkerDebuggerLoader({
     "Debugger": Debugger,
     "PromiseDebugging": PromiseDebugging,
     "Services": Object.create(null),
-    "URL": null,
+    "URL": URL,
     "chrome": chrome,
     "xpcInspector": xpcInspector
   },