Merge the Sky Engine changes from the SkyDart branch

sky/engine/public/web/WebFrameClient.h

 /*
  * Copyright (C) 2011, 2012 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 21 matching lines @@
 #define SKY_ENGINE_PUBLIC_WEB_WEBFRAMECLIENT_H_
 
 #include "../platform/WebColor.h"
 #include "sky/engine/public/platform/WebCommon.h"
 #include "sky/engine/public/platform/WebURLError.h"
 #include "sky/engine/public/platform/WebURLRequest.h"
 #include "sky/engine/public/web/WebFrame.h"
 #include "sky/engine/public/web/WebNavigationPolicy.h"
 #include "sky/engine/public/web/WebNavigationType.h"
 #include "sky/engine/public/web/WebTextDirection.h"
-#include "v8/include/v8.h"
+
+typedef struct _Dart_Isolate* Dart_Isolate;
 
 namespace mojo {
 class View;
 }
 
 namespace blink {
 
 class WebCachedURLRequest;
 class WebInputEvent;
 class WebNode;
@@ skipping 26 matching lines @@
     virtual void frameFocused() { }
 
     // This frame is about to be closed. This is called after frameDetached,
     // when the document is being unloaded, due to new one committing.
     virtual void willClose(WebFrame*) { }
 
     // FIXME(sky): remove.
     // Called when a watched CSS selector matches or stops matching.
     virtual void didMatchCSS(WebLocalFrame*, const WebVector<WebString>& newlyMatchingSelectors, const WebVector<WebString>& stoppedMatchingSelectors) { }
 
+    virtual void didCreateIsolate(WebLocalFrame*, Dart_Isolate isolate) {}
 
     // Console messages ----------------------------------------------------
 
     // Whether or not we should report a detailed message for the given source.
     virtual bool shouldReportDetailedMessageForSource(const WebString& source) { return false; }
 
     // A new message was added to the console.
     virtual void didAddMessageToConsole(const WebConsoleMessage&, const WebString& sourceName, unsigned sourceLine, const WebString& stackTrace) { }
 
 
@@ skipping 90 matching lines @@
         WebLocalFrame* webFrame, unsigned identifier, const WebURLRequest::Priority& priority, int) { }
 
     // The resource request given by identifier succeeded.
     virtual void didFinishResourceLoad(
         WebLocalFrame*, unsigned identifier) { }
 
     // The specified request was satified from WebCore's memory cache.
     virtual void didLoadResourceFromMemoryCache(
         WebLocalFrame*, const WebURLRequest&, const WebURLResponse&) { }
 
-    // Script notifications ------------------------------------------------
-
-    // Notifies that a new script context has been created for this frame.
-    // This is similar to didClearWindowObject but only called once per
-    // frame context.
-    virtual void didCreateScriptContext(WebLocalFrame*, v8::Handle<v8::Context>) { }
-
-    // WebKit is about to release its reference to a v8 context for a frame.
-    virtual void willReleaseScriptContext(WebLocalFrame*, v8::Handle<v8::Context>) { }
-
 
     // Geometry notifications ----------------------------------------------
 
     // The main frame scrolled.
     virtual void didChangeScrollOffset(WebLocalFrame*) { }
 
 
     // Find-in-page notifications ------------------------------------------
 
     // Notifies how many matches have been found so far, for a given
@@ skipping 19 matching lines @@
     // Extensions3D.h in WebCore/platform/graphics).
     virtual void didLoseWebGLContext(WebLocalFrame*, int) { }
 
 protected:
     virtual ~WebFrameClient() { }
 };
 
 } // namespace blink
 
 #endif  // SKY_ENGINE_PUBLIC_WEB_WEBFRAMECLIENT_H_