Skip to content

Commit b7368fd

Browse files
committed
Bug 1531826 Part 1 - View event handler sources by ID, r=ochameau.
UltraBlame original commit: 1e0ab7de952fe2a48d9a44bb0f01b60b437a3254
1 parent 84fde8e commit b7368fd

File tree

5 files changed

+93
-26
lines changed

5 files changed

+93
-26
lines changed

devtools/client/shared/view-source.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -402,19 +402,20 @@ jsdebugger
402402
const
403403
source
404404
=
405+
sourceId
406+
?
405407
dbg
406408
.
407-
getSourceByURL
409+
getSourceByActorId
408410
(
409-
sourceURL
411+
sourceId
410412
)
411-
|
412-
|
413+
:
413414
dbg
414415
.
415-
getSourceByActorId
416+
getSourceByURL
416417
(
417-
sourceId
418+
sourceURL
418419
)
419420
;
420421
if

devtools/client/shared/widgets/tooltip/EventTooltipHelper.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1417,6 +1417,11 @@ uri
14171417
listener
14181418
.
14191419
origin
1420+
sourceActor
1421+
:
1422+
listener
1423+
.
1424+
sourceActor
14201425
dom0
14211426
:
14221427
listener
@@ -1918,6 +1923,7 @@ nextElementSibling
19181923
;
19191924
const
19201925
{
1926+
sourceActor
19211927
uri
19221928
}
19231929
=
@@ -1990,6 +1996,7 @@ url
19901996
location
19911997
.
19921998
line
1999+
sourceActor
19932000
)
19942001
;
19952002
}

devtools/server/actors/inspector/event-collector.js

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3578,8 +3578,15 @@ EventCollector
35783578
{
35793579
constructor
35803580
(
3581+
targetActor
35813582
)
35823583
{
3584+
this
3585+
.
3586+
targetActor
3587+
=
3588+
targetActor
3589+
;
35833590
/
35843591
/
35853592
The
@@ -4471,6 +4478,12 @@ url
44714478
"
44724479
"
44734480
;
4481+
let
4482+
sourceActor
4483+
=
4484+
"
4485+
"
4486+
;
44744487
/
44754488
/
44764489
If
@@ -4700,6 +4713,32 @@ script
47004713
.
47014714
url
47024715
;
4716+
const
4717+
actor
4718+
=
4719+
this
4720+
.
4721+
targetActor
4722+
.
4723+
sources
4724+
.
4725+
getOrCreateSourceActor
4726+
(
4727+
script
4728+
.
4729+
source
4730+
)
4731+
;
4732+
sourceActor
4733+
=
4734+
actor
4735+
?
4736+
actor
4737+
.
4738+
actorID
4739+
:
4740+
null
4741+
;
47034742
/
47044743
/
47054744
Checking
@@ -5204,6 +5243,7 @@ hide
52045243
:
52055244
hide
52065245
native
5246+
sourceActor
52075247
}
52085248
;
52095249
/

devtools/server/actors/inspector/node.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -680,6 +680,11 @@ _eventCollector
680680
new
681681
EventCollector
682682
(
683+
this
684+
.
685+
walker
686+
.
687+
targetActor
683688
)
684689
;
685690
/

devtools/server/actors/utils/TabSources.js

Lines changed: 34 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -935,6 +935,39 @@ return
935935
sourceActor
936936
;
937937
}
938+
getOrCreateSourceActor
939+
(
940+
source
941+
)
942+
{
943+
if
944+
(
945+
this
946+
.
947+
hasSourceActor
948+
(
949+
source
950+
)
951+
)
952+
{
953+
return
954+
this
955+
.
956+
getSourceActor
957+
(
958+
source
959+
)
960+
;
961+
}
962+
return
963+
this
964+
.
965+
createSourceActor
966+
(
967+
source
968+
)
969+
;
970+
}
938971
getSourceActorByInternalSourceId
939972
:
940973
function
@@ -1014,29 +1047,10 @@ if
10141047
source
10151048
)
10161049
{
1017-
if
1018-
(
1019-
this
1020-
.
1021-
hasSourceActor
1022-
(
1023-
source
1024-
)
1025-
)
1026-
{
10271050
return
10281051
this
10291052
.
1030-
getSourceActor
1031-
(
1032-
source
1033-
)
1034-
;
1035-
}
1036-
return
1037-
this
1038-
.
1039-
createSourceActor
1053+
getOrCreateSourceActor
10401054
(
10411055
source
10421056
)

0 commit comments

Comments
 (0)