Index: Source/bindings/v8/custom/V8InjectedScriptHostCustom.cpp |
diff --git a/Source/bindings/v8/custom/V8InjectedScriptHostCustom.cpp b/Source/bindings/v8/custom/V8InjectedScriptHostCustom.cpp |
index 933985e8e317ab47e7c87590f2e61d7adcc7b083..0a82b1bad8867dc721650078cb79df6c537fb6bd 100644 |
--- a/Source/bindings/v8/custom/V8InjectedScriptHostCustom.cpp |
+++ b/Source/bindings/v8/custom/V8InjectedScriptHostCustom.cpp |
@@ -38,6 +38,7 @@ |
#include "V8NodeList.h" |
#include "V8Storage.h" |
#include "bindings/dart/DartHandleProxy.h" |
+#include "bindings/dart/DartInjectedScriptHost.h" |
#include "bindings/v8/BindingSecurity.h" |
#include "bindings/v8/ScriptDebugServer.h" |
#include "bindings/v8/ScriptValue.h" |
@@ -354,6 +355,12 @@ void V8InjectedScriptHost::evaluateMethodCustom(const v8::FunctionCallbackInfo<v |
return; |
} |
+ v8::Handle<v8::Value> dartResult = DartInjectedScriptHost::evaluateIfDartContext(args.Holder(), expression); |
vsm
2013/10/03 17:59:31
It'd be nice to make this a virtual method on some
jacob314
2013/10/03 20:43:15
I agree this is the right long term solution. Add
|
+ if (!dartResult.IsEmpty()) { |
+ v8SetReturnValue(args, dartResult); |
+ return; |
+ } |
+ |
ASSERT(!v8::Context::GetCurrent().IsEmpty()); |
v8::TryCatch tryCatch; |
v8::Handle<v8::Value> result = V8ScriptRunner::compileAndRunInternalScript(expression, args.GetIsolate()); |