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

Unified Diff: Source/bindings/v8/custom/V8InjectedScriptHostCustom.cpp

Issue 300393002: Merge DevTools Refactor CL to Blink36 (Closed) Base URL: svn://svn.chromium.org/blink/branches/dart/1985
Patch Set: PTAL Created 6 years, 6 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 | « Source/bindings/v8/ScriptDebugServer.cpp ('k') | Source/core/inspector/AsyncCallStackTracker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/bindings/v8/custom/V8InjectedScriptHostCustom.cpp
diff --git a/Source/bindings/v8/custom/V8InjectedScriptHostCustom.cpp b/Source/bindings/v8/custom/V8InjectedScriptHostCustom.cpp
index f9d29c65cf38796b2d77ef295427266b67c7d65b..96837c8eb606255dada37771502d2de639b0b80a 100644
--- a/Source/bindings/v8/custom/V8InjectedScriptHostCustom.cpp
+++ b/Source/bindings/v8/custom/V8InjectedScriptHostCustom.cpp
@@ -40,7 +40,6 @@
#include "V8Storage.h"
#include "bindings/common/ScriptValue.h"
#include "bindings/dart/DartHandleProxy.h"
-#include "bindings/dart/DartInjectedScriptHostHelper.h"
#include "bindings/v8/BindingSecurity.h"
#include "bindings/v8/ScriptDebugServer.h"
#include "bindings/v8/V8AbstractEventListener.h"
@@ -191,6 +190,7 @@ void V8InjectedScriptHost::typeMethodCustom(const v8::FunctionCallbackInfo<v8::V
v8SetReturnValue(info, v8AtomicString(isolate, "array"));
return;
}
+ // FIXMEDART: remove this.
if (DartHandleProxy::isDartProxy(value)) {
const char* type = DartHandleProxy::getJavaScriptType(value);
if (type)
@@ -346,14 +346,6 @@ void V8InjectedScriptHost::evaluateMethodCustom(const v8::FunctionCallbackInfo<v
return;
}
- // FIXME(dartbug.com/13804): refactor DartInjectedScriptHostHelper to instead
- // subclass InjectedScriptHost.
- v8::Handle<v8::Value> dartResult = DartInjectedScriptHostHelper::evaluateIfDartContext(info.Holder(), expression);
- if (!dartResult.IsEmpty()) {
- v8SetReturnValue(info, dartResult);
- return;
- }
-
ASSERT(!isolate->GetCurrentContext().IsEmpty());
v8::TryCatch tryCatch;
v8::Handle<v8::Value> result = V8ScriptRunner::compileAndRunInternalScript(expression, info.GetIsolate());
« no previous file with comments | « Source/bindings/v8/ScriptDebugServer.cpp ('k') | Source/core/inspector/AsyncCallStackTracker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698