OLD | NEW |
1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file |
2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
5 #include "vm/service_event.h" | 5 #include "vm/service_event.h" |
6 | 6 |
7 #include "vm/message_handler.h" | 7 #include "vm/message_handler.h" |
8 | 8 |
9 namespace dart { | 9 namespace dart { |
10 | 10 |
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
190 } | 190 } |
191 } else { | 191 } else { |
192 if (breakpoint() != NULL) { | 192 if (breakpoint() != NULL) { |
193 jsobj.AddProperty("breakpoint", breakpoint()); | 193 jsobj.AddProperty("breakpoint", breakpoint()); |
194 } | 194 } |
195 } | 195 } |
196 if (kind() == kDebuggerSettingsUpdate) { | 196 if (kind() == kDebuggerSettingsUpdate) { |
197 JSONObject jssettings(&jsobj, "_debuggerSettings"); | 197 JSONObject jssettings(&jsobj, "_debuggerSettings"); |
198 isolate()->debugger()->PrintSettingsToJSONObject(&jssettings); | 198 isolate()->debugger()->PrintSettingsToJSONObject(&jssettings); |
199 } | 199 } |
200 if (top_frame() != NULL) { | 200 if ((top_frame() != NULL) && Isolate::Current()->compilation_allowed()) { |
201 JSONObject jsFrame(&jsobj, "topFrame"); | 201 JSONObject jsFrame(&jsobj, "topFrame"); |
202 top_frame()->PrintToJSONObject(&jsFrame); | 202 top_frame()->PrintToJSONObject(&jsFrame); |
203 intptr_t index = 0; // Avoid ambiguity in call to AddProperty. | 203 intptr_t index = 0; // Avoid ambiguity in call to AddProperty. |
204 jsFrame.AddProperty("index", index); | 204 jsFrame.AddProperty("index", index); |
205 } | 205 } |
206 if (exception() != NULL) { | 206 if (exception() != NULL) { |
207 jsobj.AddProperty("exception", *(exception())); | 207 jsobj.AddProperty("exception", *(exception())); |
208 } | 208 } |
209 if (async_continuation() != NULL && !async_continuation()->IsNull()) { | 209 if (async_continuation() != NULL && !async_continuation()->IsNull()) { |
210 jsobj.AddProperty("_asyncContinuation", *(async_continuation())); | 210 jsobj.AddProperty("_asyncContinuation", *(async_continuation())); |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
242 if (kind() == kVMUpdate) { | 242 if (kind() == kVMUpdate) { |
243 jsobj->AddPropertyVM("vm"); | 243 jsobj->AddPropertyVM("vm"); |
244 } else { | 244 } else { |
245 jsobj->AddProperty("isolate", isolate()); | 245 jsobj->AddProperty("isolate", isolate()); |
246 } | 246 } |
247 ASSERT(timestamp_ != -1); | 247 ASSERT(timestamp_ != -1); |
248 jsobj->AddPropertyTimeMillis("timestamp", timestamp_); | 248 jsobj->AddPropertyTimeMillis("timestamp", timestamp_); |
249 } | 249 } |
250 | 250 |
251 } // namespace dart | 251 } // namespace dart |
OLD | NEW |