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

Side by Side Diff: runtime/bin/builtin.dart

Issue 539863002: Fix handling of Windows paths after cleanup. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 library builtin; 5 library builtin;
6 import 'dart:io'; 6 import 'dart:io';
7 import 'dart:async'; 7 import 'dart:async';
8 import 'dart:convert'; 8 import 'dart:convert';
9 // import 'root_library'; happens here from C Code 9 // import 'root_library'; happens here from C Code
10 10
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 _asyncLoadErrorCallback(uri, libraryUri, error); 277 _asyncLoadErrorCallback(uri, libraryUri, error);
278 if (_numOutstandingLoadRequests == 0) { 278 if (_numOutstandingLoadRequests == 0) {
279 _signalDoneLoading(); 279 _signalDoneLoading();
280 _cleanup(); 280 _cleanup();
281 } 281 }
282 } 282 }
283 283
284 284
285 // Asynchronously loads script data through a http or file uri. 285 // Asynchronously loads script data through a http or file uri.
286 _loadDataAsync(int tag, String uri, String libraryUri) { 286 _loadDataAsync(int tag, String uri, String libraryUri) {
287 var filePath = _filePathFromUri(uri); 287 var filePath;
288 Uri sourceUri; 288 Uri sourceUri;
289 if (tag == null) { 289 if (tag == null) {
290 uri = _resolveScriptUri(uri); 290 uri = _resolveScriptUri(uri);
291 sourceUri = Uri.parse(uri); 291 sourceUri = Uri.parse(uri);
292 filePath = _filePathFromUri(uri);
292 } else { 293 } else {
294 filePath = _filePathFromUri(uri);
293 sourceUri = Uri.parse(filePath); 295 sourceUri = Uri.parse(filePath);
294 } 296 }
295 _numOutstandingLoadRequests++; 297 _numOutstandingLoadRequests++;
296 _logResolution("_loadDataAsync($uri), " 298 _logResolution("_loadDataAsync($uri), "
297 "${_numOutstandingLoadRequests} requests outstanding"); 299 "${_numOutstandingLoadRequests} requests outstanding");
298 if (sourceUri.scheme == 'http') { 300 if (sourceUri.scheme == 'http') {
299 _httpGet(sourceUri, libraryUri, (data) { 301 _httpGet(sourceUri, libraryUri, (data) {
300 _loadScript(tag, uri, libraryUri, data); 302 _loadScript(tag, uri, libraryUri, data);
301 }); 303 });
302 } else { 304 } else {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 } else if (Platform.isWindows) { 350 } else if (Platform.isWindows) {
349 filename = '$name.dll'; 351 filename = '$name.dll';
350 } else { 352 } else {
351 _logResolution( 353 _logResolution(
352 'Native extensions not supported on ${Platform.operatingSystem}'); 354 'Native extensions not supported on ${Platform.operatingSystem}');
353 throw 'Native extensions not supported on ${Platform.operatingSystem}'; 355 throw 'Native extensions not supported on ${Platform.operatingSystem}';
354 } 356 }
355 357
356 return [path, filename, name]; 358 return [path, filename, name];
357 } 359 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698