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

Side by Side Diff: frog/world.dart

Issue 10389097: Move dart:dom to dart:dom_deprecated (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, 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 /** The one true [World]. */ 5 /** The one true [World]. */
6 World world; 6 World world;
7 7
8 /** 8 /**
9 * Experimental phase to enable await, only set when using the 9 * Experimental phase to enable await, only set when using the
10 * await/awaitc.dart entrypoint. 10 * await/awaitc.dart entrypoint.
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 } else if (namedPri > existingPri) { 296 } else if (namedPri > existingPri) {
297 // New one takes priority over existing 297 // New one takes priority over existing
298 _renameJavascriptTopName(existing); 298 _renameJavascriptTopName(existing);
299 } else { 299 } else {
300 if (named.isNative) { 300 if (named.isNative) {
301 final msg = 'conflicting JS name "$name" of same ' 301 final msg = 'conflicting JS name "$name" of same '
302 + 'priority $existingPri: (already defined in) ' 302 + 'priority $existingPri: (already defined in) '
303 + '${existing.span.locationText} with priority $namedPri)'; 303 + '${existing.span.locationText} with priority $namedPri)';
304 // We trust that conflicting native names in builtin libraries are 304 // We trust that conflicting native names in builtin libraries are
305 // harmless. Most cases there are no conflicts, currently isolates 305 // harmless. Most cases there are no conflicts, currently isolates
306 // in coreimpl and dart:dom both define web workers to avoid adding a 306 // in coreimpl and dart:dom_deprecated both define web workers to avoid adding a
307 // dependency from corelib to dart:dom. 307 // dependency from corelib to dart:dom_deprecated.
308 world.info(msg, named.span, existing.span); 308 world.info(msg, named.span, existing.span);
309 } else { 309 } else {
310 // Conflicting js name in same library. This happens because 310 // Conflicting js name in same library. This happens because
311 // of two different type arguments with the same name but in 311 // of two different type arguments with the same name but in
312 // different libraries. 312 // different libraries.
313 _renameJavascriptTopName(existing); 313 _renameJavascriptTopName(existing);
314 } 314 }
315 } 315 }
316 } 316 }
317 317
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 if (library == null) { 464 if (library == null) {
465 library = new Library(readFile(filename)); 465 library = new Library(readFile(filename));
466 info('read library ${filename}'); 466 info('read library ${filename}');
467 if (!library.isCore && 467 if (!library.isCore &&
468 !library.imports.some((li) => li.library.isCore)) { 468 !library.imports.some((li) => li.library.isCore)) {
469 library.imports.add(new LibraryImport(corelib)); 469 library.imports.add(new LibraryImport(corelib));
470 } 470 }
471 libraries[filename] = library; 471 libraries[filename] = library;
472 _todo.add(library); 472 _todo.add(library);
473 473
474 if (filename == 'dart:dom') { 474 if (filename == 'dart:dom_deprecated') {
475 dom = library; 475 dom = library;
476 } else if (filename == 'dart:html') { 476 } else if (filename == 'dart:html') {
477 html = library; 477 html = library;
478 } else if (filename == 'dart:isolate') { 478 } else if (filename == 'dart:isolate') {
479 isolatelib = library; 479 isolatelib = library;
480 } 480 }
481 } 481 }
482 return library; 482 return library;
483 } 483 }
484 484
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 702
703 withTiming(String name, f()) { 703 withTiming(String name, f()) {
704 final sw = new Stopwatch(); 704 final sw = new Stopwatch();
705 sw.start(); 705 sw.start();
706 var result = f(); 706 var result = f();
707 sw.stop(); 707 sw.stop();
708 info('$name in ${sw.elapsedInMs()}msec'); 708 info('$name in ${sw.elapsedInMs()}msec');
709 return result; 709 return result;
710 } 710 }
711 } 711 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698