Get SkV8Example running again.

experimental/SkV8Example/SkV8Example.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  */
 #include <v8.h>
-
-using namespace v8;
+#include <include/libplatform/libplatform.h>
 
 #include "SkV8Example.h"
 #include "Global.h"
 #include "JsContext.h"
 #include "Path2D.h"
 
 #include "gl/GrGLUtil.h"
 #include "gl/GrGLDefines.h"
 #include "gl/GrGLInterface.h"
 #include "GrRenderTarget.h"
@@ skipping 81 matching lines @@
 
         SkSafeUnref(fCurRenderTarget);
         fCurRenderTarget = fCurContext->wrapBackendRenderTarget(desc);
         SkSafeUnref(fCurSurface);
         fCurSurface = SkSurface::NewRenderTargetDirect(fCurRenderTarget);
     }
 }
 #endif
 
 #if SK_SUPPORT_GPU
-SkCanvas* SkV8ExampleWindow::createCanvas() {
+SkSurface* SkV8ExampleWindow::createSurface() {
     if (FLAGS_gpu) {
-        SkCanvas* c = fCurSurface->getCanvas();
-        // Increase the ref count since the surface keeps a reference
-        // to the canvas, but callers of createCanvas put the results
-        // in a SkAutoTUnref.
-        c->ref();
-        return c;
+        // Increase the ref count since callers of createSurface put the
+        // results in a SkAutoTUnref.
+        fCurSurface->ref();
+        return fCurSurface;
     } else {
-        return this->INHERITED::createCanvas();
+        return this->INHERITED::createSurface();
     }
 }
 #endif
 
 void SkV8ExampleWindow::onSizeChange() {
     this->INHERITED::onSizeChange();
 
 #if SK_SUPPORT_GPU
     this->windowSizeChanged();
 #endif
@@ skipping 23 matching lines @@
 void SkV8ExampleWindow::onHandleInval(const SkIRect& rect) {
     RECT winRect;
     winRect.top = rect.top();
     winRect.bottom = rect.bottom();
     winRect.right = rect.right();
     winRect.left = rect.left();
     InvalidateRect((HWND)this->getHWND(), &winRect, false);
 }
 #endif
 
+
 SkOSWindow* create_sk_window(void* hwnd, int argc, char** argv) {
     printf("Started\n");
 
     SkCommandLineFlags::Parse(argc, argv);
 
-    // Get the default Isolate created at startup.
-    Isolate* isolate = Isolate::GetCurrent();
+    v8::V8::InitializeICU();
+    v8::Platform* platform = v8::platform::CreateDefaultPlatform();
+    v8::V8::InitializePlatform(platform);
+    v8::V8::Initialize();
+
+    v8::Isolate* isolate = v8::Isolate::New();
+    v8::Isolate::Scope isolate_scope(isolate);
+    v8::HandleScope handle_scope(isolate);
+    isolate->Enter();
+
     Global* global = new Global(isolate);
 
 
     // Set up things to look like a browser by creating
     // a console object that invokes our print function.
     const char* startupScript =
             "function Console() {};                   \n"
             "Console.prototype.log = function() {     \n"
             "  var args = Array.prototype.slice.call(arguments).join(' '); \n"
             "  print(args);                      \n"
@@ skipping 33 matching lines @@
 
     if (!jsContext->initialize()) {
         printf("Failed to initialize.\n");
         exit(1);
     }
     SkV8ExampleWindow* win = new SkV8ExampleWindow(hwnd, jsContext);
     global->setWindow(win);
 
     return win;
 }