OLD | NEW |
1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2015, 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 part of vmservice_io; | 5 part of vmservice_io; |
6 | 6 |
7 _sanitizeWindowsPath(path) { | 7 _sanitizeWindowsPath(path) { |
8 // For Windows we need to massage the paths a bit according to | 8 // For Windows we need to massage the paths a bit according to |
9 // http://blogs.msdn.com/b/ie/archive/2006/12/06/file-uris-in-windows.aspx | 9 // http://blogs.msdn.com/b/ie/archive/2006/12/06/file-uris-in-windows.aspx |
10 // | 10 // |
(...skipping 1015 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1026 break; | 1026 break; |
1027 case _Dart_kInitLoader: | 1027 case _Dart_kInitLoader: |
1028 { | 1028 { |
1029 String packageRoot = request[4]; | 1029 String packageRoot = request[4]; |
1030 String packagesFile = request[5]; | 1030 String packagesFile = request[5]; |
1031 String workingDirectory = request[6]; | 1031 String workingDirectory = request[6]; |
1032 String rootScript = request[7]; | 1032 String rootScript = request[7]; |
1033 if (loaderState == null) { | 1033 if (loaderState == null) { |
1034 loaderState = new IsolateLoaderState(isolateId); | 1034 loaderState = new IsolateLoaderState(isolateId); |
1035 isolateEmbedderData[isolateId] = loaderState; | 1035 isolateEmbedderData[isolateId] = loaderState; |
| 1036 loaderState.init( |
| 1037 packageRoot, packagesFile, workingDirectory, rootScript); |
1036 } | 1038 } |
1037 loaderState.init( | |
1038 packageRoot, packagesFile, workingDirectory, rootScript); | |
1039 loaderState.sp = sp; | 1039 loaderState.sp = sp; |
1040 assert(isolateEmbedderData[isolateId] == loaderState); | 1040 assert(isolateEmbedderData[isolateId] == loaderState); |
1041 } | 1041 } |
1042 break; | 1042 break; |
1043 case _Dart_kResourceLoad: | 1043 case _Dart_kResourceLoad: |
1044 { | 1044 { |
1045 Uri uri = Uri.parse(request[4]); | 1045 Uri uri = Uri.parse(request[4]); |
1046 _handleResourceRequest( | 1046 _handleResourceRequest( |
1047 loaderState, sp, traceLoading, tag, uri, uri, null); | 1047 loaderState, sp, traceLoading, tag, uri, uri, null); |
1048 } | 1048 } |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1150 msg[2] = resolvedUri.toString(); | 1150 msg[2] = resolvedUri.toString(); |
1151 msg[3] = null; | 1151 msg[3] = null; |
1152 msg[4] = e.toString(); | 1152 msg[4] = e.toString(); |
1153 sp.send(msg); | 1153 sp.send(msg); |
1154 } | 1154 } |
1155 break; | 1155 break; |
1156 default: | 1156 default: |
1157 _log('Unknown loader request tag=$tag from $isolateId'); | 1157 _log('Unknown loader request tag=$tag from $isolateId'); |
1158 } | 1158 } |
1159 } | 1159 } |
OLD | NEW |