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

Unified Diff: frog/world.dart

Issue 8999030: frog isolate fixes: minor changes to the isolate library + architecture.py (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: '' Created 9 years 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 | « frog/minfrog ('k') | tests/isolate/isolate.status » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: frog/world.dart
diff --git a/frog/world.dart b/frog/world.dart
index 9b6bcfe43307d8c66b52c31db3670434b3c430a5..01b8e613e8f73d34dc849a8c56cabd7442c43dde 100644
--- a/frog/world.dart
+++ b/frog/world.dart
@@ -216,12 +216,19 @@ class World {
// New one takes priority over existing
_renameJavascriptTopName(existing);
} else {
- // Two conflicting native names or names in corelib. Libraries need
- // to be fixed.
- world.internalError('conflicting JS name "$name" of same '
+ final msg = 'conflicting JS name "$name" of same '
+ 'priority $existingPri: (already defined in) '
- + '${existing.span.locationText} with priority $namedPri)',
- named.span, existing.span);
+ + '${existing.span.locationText} with priority $namedPri)';
+ if (named.isNative) {
+ // We trust that conflicting native names in builtin libraries are
+ // harmless. Most cases there are no conflicts, currently isolates
+ // in coreimpl and dart:dom define web workers to avoid adding a
+ // dependency from corelib to dart:dom.
+ world.info(msg, named.span, existing.span);
+ } else {
+ // Conflicting name in corelib needs to be fixed.
+ world.internalError(msg, named.span, existing.span);
+ }
}
} else {
// No one was using the name. Take it for ourselves.
« no previous file with comments | « frog/minfrog ('k') | tests/isolate/isolate.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698