Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
09ca3c18
Commit
09ca3c18
authored
Apr 18, 2018
by
Alexander Aprelev
Committed by
Mikkel Nygaard Ravn
Apr 18, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the way how stream event subscription is handled. (#16698)
parent
eaf3a664
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
tracing.dart
packages/flutter_tools/lib/src/tracing.dart
+1
-1
vmservice.dart
packages/flutter_tools/lib/src/vmservice.dart
+7
-7
No files found.
packages/flutter_tools/lib/src/tracing.dart
View file @
09ca3c18
...
@@ -43,7 +43,7 @@ class Tracing {
...
@@ -43,7 +43,7 @@ class Tracing {
}
else
{
}
else
{
final
Completer
<
Null
>
whenFirstFrameRendered
=
new
Completer
<
Null
>();
final
Completer
<
Null
>
whenFirstFrameRendered
=
new
Completer
<
Null
>();
vmService
.
onTimelineEvent
.
listen
((
ServiceEvent
timelineEvent
)
{
(
await
vmService
.
onTimelineEvent
)
.
listen
((
ServiceEvent
timelineEvent
)
{
final
List
<
Map
<
String
,
dynamic
>>
events
=
timelineEvent
.
timelineEvents
;
final
List
<
Map
<
String
,
dynamic
>>
events
=
timelineEvent
.
timelineEvents
;
for
(
Map
<
String
,
dynamic
>
event
in
events
)
{
for
(
Map
<
String
,
dynamic
>
event
in
events
)
{
if
(
event
[
'name'
]
==
_kFirstUsefulFrameEventName
)
if
(
event
[
'name'
]
==
_kFirstUsefulFrameEventName
)
...
...
packages/flutter_tools/lib/src/vmservice.dart
View file @
09ca3c18
...
@@ -175,16 +175,16 @@ class VMService {
...
@@ -175,16 +175,16 @@ class VMService {
Future
<
Null
>
get
done
=>
_peer
.
done
;
Future
<
Null
>
get
done
=>
_peer
.
done
;
// Events
// Events
Stream
<
ServiceEvent
>
get
onDebugEvent
=>
onEvent
(
'Debug'
);
Future
<
Stream
<
ServiceEvent
>
>
get
onDebugEvent
=>
onEvent
(
'Debug'
);
Stream
<
ServiceEvent
>
get
onExtensionEvent
=>
onEvent
(
'Extension'
);
Future
<
Stream
<
ServiceEvent
>
>
get
onExtensionEvent
=>
onEvent
(
'Extension'
);
// IsolateStart, IsolateRunnable, IsolateExit, IsolateUpdate, ServiceExtensionAdded
// IsolateStart, IsolateRunnable, IsolateExit, IsolateUpdate, ServiceExtensionAdded
Stream
<
ServiceEvent
>
get
onIsolateEvent
=>
onEvent
(
'Isolate'
);
Future
<
Stream
<
ServiceEvent
>
>
get
onIsolateEvent
=>
onEvent
(
'Isolate'
);
Stream
<
ServiceEvent
>
get
onTimelineEvent
=>
onEvent
(
'Timeline'
);
Future
<
Stream
<
ServiceEvent
>
>
get
onTimelineEvent
=>
onEvent
(
'Timeline'
);
// TODO(johnmccutchan): Add FlutterView events.
// TODO(johnmccutchan): Add FlutterView events.
// Listen for a specific event name.
// Listen for a specific event name.
Stream
<
ServiceEvent
>
onEvent
(
String
streamId
)
{
Future
<
Stream
<
ServiceEvent
>>
onEvent
(
String
streamId
)
async
{
_streamListen
(
streamId
);
await
_streamListen
(
streamId
);
return
_getEventController
(
streamId
).
stream
;
return
_getEventController
(
streamId
).
stream
;
}
}
...
@@ -1328,7 +1328,7 @@ class FlutterView extends ServiceObject {
...
@@ -1328,7 +1328,7 @@ class FlutterView extends ServiceObject {
// When this completer completes the isolate is running.
// When this completer completes the isolate is running.
final
Completer
<
Null
>
completer
=
new
Completer
<
Null
>();
final
Completer
<
Null
>
completer
=
new
Completer
<
Null
>();
final
StreamSubscription
<
ServiceEvent
>
subscription
=
final
StreamSubscription
<
ServiceEvent
>
subscription
=
owner
.
vm
.
vmService
.
onIsolateEvent
.
listen
((
ServiceEvent
event
)
{
(
await
owner
.
vm
.
vmService
.
onIsolateEvent
)
.
listen
((
ServiceEvent
event
)
{
// TODO(johnmccutchan): Listen to the debug stream and catch initial
// TODO(johnmccutchan): Listen to the debug stream and catch initial
// launch errors.
// launch errors.
if
(
event
.
kind
==
ServiceEvent
.
kIsolateRunnable
)
{
if
(
event
.
kind
==
ServiceEvent
.
kIsolateRunnable
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment