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

Unified Diff: pkg/serialization/lib/src/serialization_rule.dart

Issue 63363003: Cascaded mirror removal revert. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 1 month 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
« no previous file with comments | « pkg/observe/lib/src/observable.dart ('k') | pkg/unittest/lib/mirror_matchers.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/serialization/lib/src/serialization_rule.dart
diff --git a/pkg/serialization/lib/src/serialization_rule.dart b/pkg/serialization/lib/src/serialization_rule.dart
index d5853215a9f9466567ec26a7f88fdf4e534ea6b6..49e42ae7885db2724f4bb509a7f85c5a81af7a65 100644
--- a/pkg/serialization/lib/src/serialization_rule.dart
+++ b/pkg/serialization/lib/src/serialization_rule.dart
@@ -410,18 +410,13 @@ class MirrorRule extends NamedObjectRule {
if (name.contains(":")) {
var uri = Uri.parse(name);
var libMirror = currentMirrorSystem().libraries[uri];
- var result = libMirror.declarations[new Symbol(type)];
- return result is ClassMirror ? result : null;
+ return libMirror.classes[new Symbol(type)];
} else {
var symbol = new Symbol(name);
var typeSymbol = new Symbol(type);
- var libMirror = currentMirrorSystem().libraries.values.firstWhere((lib) {
- if (lib.simpleName != symbol) return false;
- var candidate = lib.declarations[typeSymbol];
- return candidate != null && candidate is ClassMirror;
- });
- var result = libMirror.declarations[typeSymbol];
- return result is ClassMirror ? result : null;
+ var libMirror = currentMirrorSystem().libraries.values.firstWhere(
+ (lib) => lib.simpleName == symbol && lib.classes[typeSymbol] != null);
+ return libMirror.classes[typeSymbol];
}
}
}
« no previous file with comments | « pkg/observe/lib/src/observable.dart ('k') | pkg/unittest/lib/mirror_matchers.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698