Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(638)

Unified Diff: runtime/bin/vmservice/observatory/lib/src/elements/observatory_element.dart

Issue 501583007: Treat null like the object it is in the Observatory and Service. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: runtime/bin/vmservice/observatory/lib/src/elements/observatory_element.dart
diff --git a/runtime/bin/vmservice/observatory/lib/src/elements/observatory_element.dart b/runtime/bin/vmservice/observatory/lib/src/elements/observatory_element.dart
index 63df40f0daffc3f9d0dc4792821505cd7372acc4..4d8b5750c4c421a0226e480b764f7c51b5132efa 100644
--- a/runtime/bin/vmservice/observatory/lib/src/elements/observatory_element.dart
+++ b/runtime/bin/vmservice/observatory/lib/src/elements/observatory_element.dart
@@ -112,46 +112,51 @@ class ObservatoryElement extends PolymerElement {
int parseInt(String value) => int.parse(value);
- bool isNull(String type) {
- return type == 'Null';
+ bool isNull(ref) {
+ return ref != null && ref.serviceType == 'Null' && ref.id == 'objects/null';
}
- bool isError(String type) {
- return type == 'Error';
+ bool isPseduoNull(ref) {
+ return ref != null && ref.serviceType == 'Null' && ref.id != 'objects/null';
}
- bool isInt(String type) {
- return (type == 'Smi' ||
- type == 'Mint' ||
- type == 'Bigint');
+ bool isError(ref) {
+ return ref != null && ref.serviceType == 'Error';
}
- bool isBool(String type) {
- return type == 'Bool';
+ bool isInt(ref) {
+ return ref != null && (ref.serviceType == 'Smi' ||
+ ref.serviceType == 'Mint' ||
+ ref.serviceType == 'Bigint');
}
- bool isString(String type) {
- return type == 'String';
+ bool isBool(ref) {
+ return ref != null && ref.serviceType == 'Bool';
}
- bool isInstance(String type) {
- return type == 'Instance';
+ bool isString(ref) {
+ return ref != null && ref.serviceType == 'String';
}
- bool isDouble(String type) {
- return type == 'Double';
+ bool isInstance(ref) {
+ return ref != null && ref.serviceType == 'Instance';
}
- bool isList(String type) {
- return (type == 'GrowableObjectArray' ||
- type == 'Array');
+ bool isDouble(ref) {
+ return ref != null && ref.serviceType == 'Double';
}
- bool isType(String type) {
- return (type == 'Type');
+ bool isList(ref) {
+ return ref != null && (ref.serviceType == 'GrowableObjectArray' ||
+ ref.serviceType == 'Array');
}
- bool isUnexpected(String type) {
+ bool isType(ref) {
+ return ref != null && (ref.serviceType == 'Type');
+ }
+
+ bool isUnexpected(ref) {
+ if (ref == null) return false;
return (!['Null',
'Smi',
'Mint',
@@ -163,6 +168,6 @@ class ObservatoryElement extends PolymerElement {
'GrowableObjectArray',
'Array',
'Type',
- 'Error'].contains(type));
+ 'Error'].contains(ref.serviceType));
}
}

Powered by Google App Engine
This is Rietveld 408576698