Add data-URI support class to dart:core (next to Uri).

runtime/bin/dartutils.cc

 // Copyright (c) 2012, 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.
 
 #include "bin/dartutils.h"
 
 #include "include/dart_api.h"
 #include "include/dart_tools_api.h"
 #include "include/dart_native_api.h"
 
@@ skipping 731 matching lines @@
     result = Dart_Invoke(builtin_lib,
                          NewString("_loadPackagesMap"),
                          kNumArgs,
                          dart_args);
     RETURN_IF_ERROR(result);
   }
   return Dart_True();
 }
 
 
-Dart_Handle DartUtils::PrepareCoreLibrary(Dart_Handle core_lib,
-                                          Dart_Handle builtin_lib,
-                                          bool is_service_isolate) {
+Dart_Handle DartUtils::PrepareUriLibrary(Dart_Handle uri_lib,
+                                         Dart_Handle builtin_lib,
+                                         bool is_service_isolate) {
   if (!is_service_isolate) {
-    // Setup the 'Uri.base' getter in dart:core.
+    // Setup the 'Uri.base' getter in dart:uri.
     Dart_Handle uri_base = Dart_Invoke(
         builtin_lib, NewString("_getUriBaseClosure"), 0, NULL);
     RETURN_IF_ERROR(uri_base);
-    Dart_Handle result = Dart_SetField(core_lib,
+    Dart_Handle result = Dart_SetField(uri_lib,
                                        NewString("_uriBaseClosure"),
                                        uri_base);
     RETURN_IF_ERROR(result);
   }
   return Dart_True();
 }
 
 
 Dart_Handle DartUtils::PrepareAsyncLibrary(Dart_Handle async_lib,
                                            Dart_Handle isolate_lib) {
@@ skipping 36 matching lines @@
   url = NewString(kIsolateLibURL);
   RETURN_IF_ERROR(url);
   Dart_Handle isolate_lib = Dart_LookupLibrary(url);
   RETURN_IF_ERROR(isolate_lib);
   url = NewString(kInternalLibURL);
   RETURN_IF_ERROR(url);
   Dart_Handle internal_lib = Dart_LookupLibrary(url);
   RETURN_IF_ERROR(internal_lib);
   Dart_Handle io_lib = Builtin::LoadAndCheckLibrary(Builtin::kIOLibrary);
   RETURN_IF_ERROR(io_lib);
+  url = NewString(kUriLibURL);
+  RETURN_IF_ERROR(url);
+  Dart_Handle uri_lib = Dart_LookupLibrary(url);
+  RETURN_IF_ERROR(uri_lib);
 
   // We need to ensure that all the scripts loaded so far are finalized
   // as we are about to invoke some Dart code below to setup closures.
   Dart_Handle result = Dart_FinalizeLoading(false);
   RETURN_IF_ERROR(result);
 
   result = PrepareBuiltinLibrary(builtin_lib,
                                  internal_lib,
                                  is_service_isolate,
                                  trace_loading,
                                  package_root,
                                  package_map,
                                  packages_file);
   RETURN_IF_ERROR(result);
 
   RETURN_IF_ERROR(PrepareAsyncLibrary(async_lib, isolate_lib));
-  RETURN_IF_ERROR(PrepareCoreLibrary(
-      core_lib, builtin_lib, is_service_isolate));
+  RETURN_IF_ERROR(PrepareUriLibrary(
+      uri_lib, builtin_lib, is_service_isolate));
   RETURN_IF_ERROR(PrepareIsolateLibrary(isolate_lib));
   RETURN_IF_ERROR(PrepareIOLibrary(io_lib));
   return result;
 }
 
 
 Dart_Handle DartUtils::SetupIOLibrary(const char* script_uri) {
   Dart_Handle io_lib_url = NewString(kIOLibURL);
   RETURN_IF_ERROR(io_lib_url);
   Dart_Handle io_lib = Dart_LookupLibrary(io_lib_url);
@@ skipping 449 matching lines @@
       new CObjectString(CObject::NewString(os_error->message()));
   CObjectArray* result = new CObjectArray(CObject::NewArray(3));
   result->SetAt(0, new CObjectInt32(CObject::NewInt32(kOSError)));
   result->SetAt(1, new CObjectInt32(CObject::NewInt32(os_error->code())));
   result->SetAt(2, error_message);
   return result;
 }
 
 }  // namespace bin
 }  // namespace dart