- Fix loading of dart:html. - Remove debug print in VM service.

runtime/bin/builtin.h

 // 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.
 
 #ifndef BIN_BUILTIN_H_
 #define BIN_BUILTIN_H_
 
 #include <stdio.h>
 #include <stdlib.h>
 
@@ skipping 10 matching lines @@
   { ""#name, FUNCTION_NAME(name), count },
 #define DECLARE_FUNCTION(name, count)                                          \
   extern void FUNCTION_NAME(name)(Dart_NativeArguments args);
 
 
 class Builtin {
  public:
   // Note: Changes to this enum should be accompanied with changes to
   // the builtin_libraries_ array in builtin.cc and builtin_nolib.cc.
   enum BuiltinLibraryId {
+    kInvalidLibrary = -1,
     kBuiltinLibrary = 0,
-    kIOLibrary,
-#if defined(DART_NO_SNAPSHOT)
-    // Only include these libraries in the dart_bootstrap case for now.
-    kHTMLLibrary,
-    kHTMLCommonLibrary,
-    kJSLibrary,
-    kBlinkLibrary,
-    kIndexedDbLibrary,
-    kCachedPatchesLibrary,
-    kWebGlLibrary,
-    kMetaDataLibrary,
-    kWebSqlLibrary,
-    kSvgLibrary,
-    kWebAudioLibrary,
-#endif  // defined(DART_NO_SNAPSHOT)
-    kInvalidLibrary,
+    kIOLibrary
   };
 
   // Get source corresponding to built in library specified in 'id'.
   static Dart_Handle Source(BuiltinLibraryId id);
 
   // Get source of part file specified in 'uri'.
   static Dart_Handle PartSource(BuiltinLibraryId id, const char* part_uri);
 
   // Setup native resolver method built in library specified in 'id'.
   static void SetNativeResolver(BuiltinLibraryId id);
@@ skipping 28 matching lines @@
   static const char* blink_source_paths_[];
   static const char* indexeddb_source_paths_[];
   static const char* cached_patches_source_paths_[];
   static const char* web_gl_source_paths_[];
   static const char* metadata_source_paths_[];
   static const char* websql_source_paths_[];
   static const char* svg_source_paths_[];
   static const char* webaudio_source_paths_[];
 
   static Dart_Port load_port_;
+  static const int num_libs_;
 
   typedef struct {
     const char* url_;
     const char** source_paths_;
     const char* patch_url_;
     const char** patch_paths_;
     bool has_natives_;
   } builtin_lib_props;
   static builtin_lib_props builtin_libraries_[];
 
   DISALLOW_ALLOCATION();
   DISALLOW_IMPLICIT_CONSTRUCTORS(Builtin);
 };
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // BIN_BUILTIN_H_