Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(605)

Unified Diff: sky/engine/web/FrameLoaderClientImpl.cpp

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/web/FrameLoaderClientImpl.h ('k') | sky/engine/web/Sky.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/web/FrameLoaderClientImpl.cpp
diff --git a/sky/engine/web/FrameLoaderClientImpl.cpp b/sky/engine/web/FrameLoaderClientImpl.cpp
index b17a2eb078d994cb94f215a5947d529e8f8696fe..9486414f84e4c4addaa4e8e9ffde5d3488d41d6b 100644
--- a/sky/engine/web/FrameLoaderClientImpl.cpp
+++ b/sky/engine/web/FrameLoaderClientImpl.cpp
@@ -33,7 +33,6 @@
#include "sky/engine/web/FrameLoaderClientImpl.h"
#include "gen/sky/platform/RuntimeEnabledFeatures.h"
-#include "sky/engine/bindings/core/v8/ScriptController.h"
#include "sky/engine/core/dom/Document.h"
#include "sky/engine/core/frame/FrameView.h"
#include "sky/engine/core/frame/Settings.h"
@@ -59,7 +58,6 @@
#include "sky/engine/wtf/StringExtras.h"
#include "sky/engine/wtf/text/CString.h"
#include "sky/engine/wtf/text/WTFString.h"
-#include "v8/include/v8.h"
namespace blink {
@@ -78,22 +76,6 @@ void FrameLoaderClientImpl::documentElementAvailable()
m_webFrame->client()->didCreateDocumentElement(m_webFrame);
}
-void FrameLoaderClientImpl::didCreateScriptContext(v8::Handle<v8::Context> context)
-{
- // FIXME: We shouldn't need separate debugger ids in sky since
- // we should have at most one DocumentView per process, no?
- m_webFrame->frame()->script().setWorldDebugId(1);
-
- if (m_webFrame->client())
- m_webFrame->client()->didCreateScriptContext(m_webFrame, context);
-}
-
-void FrameLoaderClientImpl::willReleaseScriptContext(v8::Handle<v8::Context> context)
-{
- if (m_webFrame->client())
- m_webFrame->client()->willReleaseScriptContext(m_webFrame, context);
-}
-
void FrameLoaderClientImpl::detachedFromParent()
{
// Alert the client that the frame is being detached. This is the last
@@ -270,4 +252,9 @@ void FrameLoaderClientImpl::dispatchDidChangeManifest()
m_webFrame->client()->didChangeManifest(m_webFrame);
}
+void FrameLoaderClientImpl::didCreateIsolate(Dart_Isolate isolate) {
+ if (m_webFrame->client())
+ m_webFrame->client()->didCreateIsolate(m_webFrame, isolate);
+}
+
} // namespace blink
« no previous file with comments | « sky/engine/web/FrameLoaderClientImpl.h ('k') | sky/engine/web/Sky.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698