Merge the Sky Engine changes from the SkyDart branch

sky/engine/bindings2/builtin_natives.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sky/engine/config.h"
 #include "sky/engine/bindings2/builtin_natives.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "dart/runtime/include/dart_api.h"
 #include "sky/engine/bindings2/builtin.h"
 #include "sky/engine/core/dom/Microtask.h"
 #include "sky/engine/core/script/dom_dart_state.h"
 #include "sky/engine/tonic/dart_api_scope.h"
+#include "sky/engine/tonic/dart_builtin.h"
 #include "sky/engine/tonic/dart_error.h"
 #include "sky/engine/tonic/dart_isolate_scope.h"
 #include "sky/engine/tonic/dart_state.h"
 #include "sky/engine/tonic/dart_value.h"
 #include "sky/engine/wtf/text/WTFString.h"
 
 namespace blink {
 
 #define REGISTER_FUNCTION(name, count)                                         \
   { "" #name, name, count },
@@ skipping 51 matching lines @@
   Dart_Handle getter_name = ToDart(name);
   Dart_Handle closure = Dart_Invoke(builtin_library, getter_name, 0, nullptr);
   DART_CHECK_VALID(closure);
   return closure;
 }
 
 static void InitDartInternal(Dart_Handle builtin_library) {
   Dart_Handle print = GetClosure(builtin_library, "_getPrintClosure");
   Dart_Handle timer = GetClosure(builtin_library, "_getCreateTimerClosure");
 
-  Dart_Handle internal_library = DartBuiltin::LookupLibrary("dart:_internal")
+  Dart_Handle internal_library = DartBuiltin::LookupLibrary("dart:_internal");
 
   DART_CHECK_VALID(Dart_SetField(
       internal_library, ToDart("_printClosure"), print));
 
   Dart_Handle vm_hooks_name = ToDart("VMLibraryHooks");
   Dart_Handle vm_hooks = Dart_GetClass(internal_library, vm_hooks_name);
   DART_CHECK_VALID(vm_hooks);
   Dart_Handle timer_name = ToDart("timerFactory");
   DART_CHECK_VALID(Dart_SetField(vm_hooks, timer_name, timer));
 }
 
 static void InitAsync(Dart_Handle builtin_library) {
   Dart_Handle schedule_microtask =
       GetClosure(builtin_library, "_getScheduleMicrotaskClosure");
-  Dart_Handle internal_library = DartBuiltin::LookupLibrary("dart:async")
+  Dart_Handle async_library = DartBuiltin::LookupLibrary("dart:async");
   Dart_Handle set_schedule_microtask = ToDart("_setScheduleImmediateClosure");
   DART_CHECK_VALID(Dart_Invoke(async_library, set_schedule_microtask, 1,
                                &schedule_microtask));
 }
 
 void BuiltinNatives::Init() {
   Dart_Handle builtin = Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
   DART_CHECK_VALID(builtin);
   InitDartInternal(builtin);
   InitAsync(builtin);
@@ skipping 58 matching lines @@
 
 void Timer_cancel(Dart_NativeArguments args) {
   int64_t timer_id = 0;
   DART_CHECK_VALID(Dart_GetNativeIntegerArgument(args, 0, &timer_id));
 
   DOMDartState* state = DOMDartState::Current();
   DOMTimer::removeByID(state->document(), timer_id);
 }
 
 }  // namespace blink