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 1017 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1028 _handleResourceRequest( | 1028 _handleResourceRequest( |
1029 loaderState, sp, traceLoading, tag, uri, uri, libraryUrl); | 1029 loaderState, sp, traceLoading, tag, uri, uri, libraryUrl); |
1030 } | 1030 } |
1031 break; | 1031 break; |
1032 case _Dart_kInitLoader: | 1032 case _Dart_kInitLoader: |
1033 { | 1033 { |
1034 String packageRoot = request[4]; | 1034 String packageRoot = request[4]; |
1035 String packagesFile = request[5]; | 1035 String packagesFile = request[5]; |
1036 String workingDirectory = request[6]; | 1036 String workingDirectory = request[6]; |
1037 String rootScript = request[7]; | 1037 String rootScript = request[7]; |
| 1038 bool isReloading = request[8]; |
1038 if (loaderState == null) { | 1039 if (loaderState == null) { |
1039 loaderState = new IsolateLoaderState(isolateId); | 1040 loaderState = new IsolateLoaderState(isolateId); |
1040 isolateEmbedderData[isolateId] = loaderState; | 1041 isolateEmbedderData[isolateId] = loaderState; |
1041 loaderState.init( | 1042 loaderState.init( |
1042 packageRoot, packagesFile, workingDirectory, rootScript); | 1043 packageRoot, packagesFile, workingDirectory, rootScript); |
1043 } else { | 1044 } else if (isReloading) { |
1044 loaderState.updatePackageMap(packagesFile); | 1045 loaderState.updatePackageMap(packagesFile); |
1045 } | 1046 } |
1046 loaderState.sp = sp; | 1047 loaderState.sp = sp; |
1047 assert(isolateEmbedderData[isolateId] == loaderState); | 1048 assert(isolateEmbedderData[isolateId] == loaderState); |
1048 } | 1049 } |
1049 break; | 1050 break; |
1050 case _Dart_kResourceLoad: | 1051 case _Dart_kResourceLoad: |
1051 { | 1052 { |
1052 Uri uri = Uri.parse(request[4]); | 1053 Uri uri = Uri.parse(request[4]); |
1053 _handleResourceRequest( | 1054 _handleResourceRequest( |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1159 msg[3] = null; | 1160 msg[3] = null; |
1160 msg[4] = e.toString(); | 1161 msg[4] = e.toString(); |
1161 sp.send(msg); | 1162 sp.send(msg); |
1162 } | 1163 } |
1163 }); | 1164 }); |
1164 break; | 1165 break; |
1165 default: | 1166 default: |
1166 _log('Unknown loader request tag=$tag from $isolateId'); | 1167 _log('Unknown loader request tag=$tag from $isolateId'); |
1167 } | 1168 } |
1168 } | 1169 } |
OLD | NEW |