Bug 1532362 - Lookup sources by actor URL instead of source URL, r=lsmyth.

marco-c · marco-c · commit 55aa6cd4e8da · 2019-10-04T09:38:38.000Z
UltraBlame original commit: a52dffe6d7beee0a0ad9dca59ab504593018d00d
diff --git a/devtools/client/debugger/new/test/mochitest/browser.ini b/devtools/client/debugger/new/test/mochitest/browser.ini
@@ -10088,6 +10088,15 @@ eval
 throw
 .
 html
+examples
+/
+doc
+-
+sourceURL
+-
+breakpoint
+.
+html
 [
 browser_dbg
 -
@@ -11280,3 +11289,12 @@ throw
 .
 js
 ]
+[
+browser_dbg
+-
+sourceURL
+-
+breakpoint
+.
+js
+]
diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-sourceURL-breakpoint.js b/devtools/client/debugger/new/test/mochitest/browser_dbg-sourceURL-breakpoint.js
@@ -0,0 +1,71 @@
+add_task
+(
+async
+function
+(
+)
+{
+const
+dbg
+=
+await
+initDebugger
+(
+"
+doc
+-
+sourceURL
+-
+breakpoint
+.
+html
+"
+"
+my
+-
+foo
+.
+js
+"
+)
+;
+await
+addBreakpoint
+(
+dbg
+"
+my
+-
+foo
+.
+js
+"
+2
+)
+;
+invokeInTab
+(
+"
+foo
+"
+)
+;
+await
+waitForPaused
+(
+dbg
+)
+;
+ok
+(
+true
+"
+paused
+at
+breakpoint
+"
+)
+;
+}
+)
+;
diff --git a/devtools/client/debugger/new/test/mochitest/examples/doc-sourceURL-breakpoint.html b/devtools/client/debugger/new/test/mochitest/examples/doc-sourceURL-breakpoint.html
@@ -0,0 +1,49 @@
+<
+body
+>
+<
+script
+>
+var
+script
+=
+function
+foo
+(
+)
+{
+console
+.
+log
+(
+'
+called
+foo
+'
+)
+;
+}
+/
+/
+#
+sourceURL
+=
+my
+-
+foo
+.
+js
+;
+eval
+(
+script
+)
+;
+<
+/
+script
+>
+<
+/
+body
+>
diff --git a/devtools/server/actors/utils/TabSources.js b/devtools/server/actors/utils/TabSources.js
@@ -719,7 +719,6 @@ for
 (
 const
 [
-source
 actor
 ]
 of
@@ -730,7 +729,7 @@ _sourceActors
 {
 if
 (
-source
+actor
 .
 url
 =

Original file line number	Diff line number	Diff line change
`@@ -10088,6 +10088,15 @@ eval`
`10088`	`10088`	`throw`
`10089`	`10089`	`.`
`10090`	`10090`	`html`
	`10091`	`+examples`
	`10092`	`+/`
	`10093`	`+doc`
	`10094`	`+-`
	`10095`	`+sourceURL`
	`10096`	`+-`
	`10097`	`+breakpoint`
	`10098`	`+.`
	`10099`	`+html`
`10091`	`10100`	`[`
`10092`	`10101`	`browser_dbg`
`10093`	`10102`	`-`
`@@ -11280,3 +11289,12 @@ throw`
`11280`	`11289`	`.`
`11281`	`11290`	`js`
`11282`	`11291`	`]`
	`11292`	`+[`
	`11293`	`+browser_dbg`
	`11294`	`+-`
	`11295`	`+sourceURL`
	`11296`	`+-`
	`11297`	`+breakpoint`
	`11298`	`+.`
	`11299`	`+js`
	`11300`	`+]`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,49 @@ @@
 +<
 +body
 +>
 +<
 +script
 +>
 +var
 +script
 +=
 +function
 +foo
 +(
 +)
 +{
 +console
 +.
 +log
 +(
 +'
 +called
 +foo
 +'
 +)
 +;
 +}
 +/
 +/
 +#
 +sourceURL
 +=
 +my
 +-
 +foo
 +.
 +js
 +;
 +eval
 +(
 +script
 +)
 +;
 +<
 +/
 +script
 +>
 +<
 +/
 +body
 +>
Original file line number	Diff line number	Diff line change
`@@ -719,7 +719,6 @@ for`
`719`	`719`	`(`
`720`	`720`	`const`
`721`	`721`	`[`
`722`		`-source`
`723`	`722`	`actor`
`724`	`723`	`]`
`725`	`724`	`of`
`@@ -730,7 +729,7 @@ _sourceActors`
`730`	`729`	`{`
`731`	`730`	`if`
`732`	`731`	`(`
`733`		`-source`
	`732`	`+actor`
`734`	`733`	`.`
`735`	`734`	`url`
`736`	`735`	`=`