Merge the Sky Engine changes from the SkyDart branch

sky/engine/web/Sky.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "sky/engine/config.h"
 #include "sky/engine/public/web/Sky.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/rand_util.h"
 #include "gen/sky/platform/RuntimeEnabledFeatures.h"
-#include "gin/public/v8_platform.h"
 #include "mojo/common/message_pump_mojo.h"
-#include "sky/engine/bindings/core/v8/V8Binding.h"
-#include "sky/engine/bindings/core/v8/V8GCController.h"
-#include "sky/engine/bindings/core/v8/V8Initializer.h"
-#include "sky/engine/core/Init.h"
 #include "sky/engine/core/animation/AnimationClock.h"
 #include "sky/engine/core/dom/Microtask.h"
 #include "sky/engine/core/frame/Settings.h"
+#include "sky/engine/core/Init.h"
 #include "sky/engine/core/page/Page.h"
+#include "sky/engine/core/script/dart_controller.h"
 #include "sky/engine/platform/LayoutTestSupport.h"
 #include "sky/engine/platform/Logging.h"
-#include "sky/engine/platform/graphics/ImageDecodingStore.h"
 #include "sky/engine/public/platform/Platform.h"
 #include "sky/engine/wtf/Assertions.h"
 #include "sky/engine/wtf/CryptographicallyRandomNumber.h"
 #include "sky/engine/wtf/MainThread.h"
-#include "sky/engine/wtf/WTF.h"
 #include "sky/engine/wtf/text/AtomicString.h"
 #include "sky/engine/wtf/text/TextEncoding.h"
-#include "v8/include/v8.h"
+#include "sky/engine/wtf/WTF.h"
 
 namespace blink {
 
 namespace {
 
 void willProcessTask()
 {
     AnimationClock::notifyTaskStart();
 }
 
 void didProcessTask()
 {
     Microtask::performCheckpoint();
-    V8GCController::reportDOMMemoryUsageToV8(mainThreadIsolate());
+    // FIXME: Report memory usage to dart?
 }
 
 class TaskObserver : public base::MessageLoop::TaskObserver {
 public:
     void WillProcessTask(const base::PendingTask& pending_task) override { willProcessTask(); }
     void DidProcessTask(const base::PendingTask& pending_task) override { didProcessTask(); }
 };
 
 class SignalObserver : public mojo::common::MessagePumpMojo::Observer {
 public:
@@ skipping 29 matching lines @@
     delete s_signalObserver;
     s_signalObserver = 0;
 }
 
 } // namespace
 
 // Make sure we are not re-initialized in the same address space.
 // Doing so may cause hard to reproduce crashes.
 static bool s_webKitInitialized = false;
 
-void initialize(Platform* platform)
-{
-    initializeWithoutV8(platform);
-
-    V8Initializer::initializeMainThreadIfNeeded();
-
-    addMessageLoopObservers();
-}
-
-v8::Isolate* mainThreadIsolate()
-{
-    return V8PerIsolateData::mainThreadIsolate();
-}
-
 static void cryptographicallyRandomValues(unsigned char* buffer, size_t length)
 {
     base::RandBytes(buffer, length);
 }
 
-void initializeWithoutV8(Platform* platform)
+void initialize(Platform* platform)
 {
     ASSERT(!s_webKitInitialized);
     s_webKitInitialized = true;
 
     ASSERT(platform);
     Platform::initialize(platform);
 
     WTF::setRandomSource(cryptographicallyRandomValues);
     WTF::initialize();
     WTF::initializeMainThread();
 
     DEFINE_STATIC_LOCAL(CoreInitializer, initializer, ());
     initializer.init();
 
     // There are some code paths (for example, running WebKit in the browser
     // process and calling into LocalStorage before anything else) where the
     // UTF8 string encoding tables are used on a background thread before
     // they're set up.  This is a problem because their set up routines assert
     // they're running on the main WebKitThread.  It might be possible to make
     // the initialization thread-safe, but given that so many code paths use
     // this, initializing this lazily probably doesn't buy us much.
     WTF::UTF8Encoding();
+
+    DartController::InitVM();
+
+    addMessageLoopObservers();
 }
 
 void shutdown()
 {
     removeMessageLoopObservers();
 
-    v8::Isolate* isolate = V8PerIsolateData::mainThreadIsolate();
-    V8PerIsolateData::dispose(isolate);
+    // FIXME: Shutdown dart?
 
-    shutdownWithoutV8();
-}
-
-void shutdownWithoutV8()
-{
     CoreInitializer::shutdown();
     WTF::shutdown();
     Platform::shutdown();
 }
 
 void setLayoutTestMode(bool value)
 {
     LayoutTestSupport::setIsRunningLayoutTest(value);
 }
 
@@ skipping 15 matching lines @@
 void enableLogChannel(const char* name)
 {
 #if !LOG_DISABLED
     WTFLogChannel* channel = getChannelFromName(name);
     if (channel)
         channel->state = WTFLogChannelOn;
 #endif // !LOG_DISABLED
 }
 
 } // namespace blink