Standalone: Use new support in dart:core for decoding data uris.

runtime/bin/vmservice/loader.dart

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of vmservice_io;
 
 _log(msg) {
   print("% $msg");
 }
 
@@ skipping 44 matching lines @@
   var sourceFile = new File(path);
   sourceFile.readAsBytes().then((data) {
     _sendResourceResponse(sp, id, data);
   },
   onError: (e) {
     var err = "Error loading $uri:\n  $e";
     _sendResourceResponse(sp, id, err);
   });
 }
 
-var dataUriRegex = new RegExp(
-    r"data:([\w-]+/[\w-]+)?(;charset=([\w-]+))?(;base64)?,(.*)");
-
 void _loadDataUri(SendPort sp, int id, Uri uri) {
   try {
-    var match = dataUriRegex.firstMatch(uri.toString());
-    if (match == null) throw "Malformed data uri";
-
-    var mimeType = match.group(1);
-    var encoding = match.group(3);
-    var maybeBase64 = match.group(4);
-    var encodedData = match.group(5);
-
-    if (mimeType != "application/dart") {
+    if (uri.data.mimeType != "application/dart") {
       throw "MIME-type must be application/dart";
     }
-    if (encoding != "utf-8") {
-      // Default is ASCII. The C++ portion of the embedder assumes UTF-8.
+    if (uri.data.charset != "utf-8") {
+      // The C++ portion of the embedder assumes UTF-8.
       throw "Only utf-8 encoding is supported";
     }
-    if (maybeBase64 != null) {
-      throw "Only percent encoding is supported";
-    }
-
-    var data = UTF8.encode(Uri.decodeComponent(encodedData));
-    _sendResourceResponse(sp, id, data);
+    _sendResourceResponse(sp, id, uri.data.contentAsBytes());
   } catch (e) {
     _sendResourceResponse(sp, id, "Invalid data uri ($uri):\n  $e");
   }
 }
 
 _handleResourceRequest(SendPort sp, bool traceLoading, int id, Uri resource) {
   if (resource.scheme == 'file') {
     _loadFile(sp, id, resource);
   } else if ((resource.scheme == 'http') || (resource.scheme == 'https')) {
     _loadHttp(sp, id, resource);
@@ skipping 341 matching lines @@
   assert(id != null);
   String resource = request[3];
   assert(resource != null);
   var uri = Uri.parse(resource);
   if (id >= 0) {
     _handleResourceRequest(sp, traceLoading, id, uri);
   } else {
     _handlePackagesRequest(sp, traceLoading, id, uri);
   }
 }