Model each Dart library as its own ScriptState when devtools are enabled.

Source/bindings/v8/custom/V8InjectedScriptHostCustom.cpp

 /*
  * Copyright (C) 2007-2011 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 19 matching lines @@
 
 #include "config.h"
 #include "V8InjectedScriptHost.h"
 
 #include "V8Database.h"
 #include "V8HTMLAllCollection.h"
 #include "V8HTMLCollection.h"
 #include "V8Node.h"
 #include "V8NodeList.h"
 #include "V8Storage.h"
+#include "bindings/dart/DartController.h"
 #include "bindings/dart/DartHandleProxy.h"
+#include "bindings/dart/DartScriptState.h"
+#include "bindings/dart/V8Converter.h"
 #include "bindings/v8/BindingSecurity.h"
 #include "bindings/v8/ScriptDebugServer.h"
 #include "bindings/v8/ScriptValue.h"
 #include "bindings/v8/V8AbstractEventListener.h"
 #include "bindings/v8/V8Binding.h"
 #include "bindings/v8/V8HiddenPropertyName.h"
+#include "bindings/v8/V8RecursionScope.h"
 #include "bindings/v8/V8ScriptRunner.h"
 #include "bindings/v8/custom/V8Float32ArrayCustom.h"
 #include "bindings/v8/custom/V8Float64ArrayCustom.h"
 #include "bindings/v8/custom/V8Int16ArrayCustom.h"
 #include "bindings/v8/custom/V8Int32ArrayCustom.h"
 #include "bindings/v8/custom/V8Int8ArrayCustom.h"
 #include "bindings/v8/custom/V8Uint16ArrayCustom.h"
 #include "bindings/v8/custom/V8Uint32ArrayCustom.h"
 #include "bindings/v8/custom/V8Uint8ArrayCustom.h"
 #include "bindings/v8/custom/V8Uint8ClampedArrayCustom.h"
@@ skipping 291 matching lines @@
         return;
     }
 
     v8::Handle<v8::String> expression = args[0]->ToString();
     if (expression.IsEmpty()) {
         v8::ThrowException(v8::Exception::Error(v8::String::New("The argument must be a string.")));
         return;
     }
 
     ASSERT(!v8::Context::GetCurrent().IsEmpty());
+

[vsm, 2013/09/30 22:08:03]

Can this code be refactored to be a call back into bindings/dart?

[Jacob, 2013/10/01 00:07:05]

Moved it to a new file called DartInjectedScriptHost.

+    ScriptState* currentScriptState = 0;
+    v8::Local<v8::Value> scriptStateWrapper = args.Holder()->GetHiddenValue(V8HiddenPropertyName::scriptState());
+    if (!scriptStateWrapper.IsEmpty() && scriptStateWrapper->IsExternal())
+        currentScriptState = static_cast<ScriptState*>(v8::External::Cast(*scriptStateWrapper)->Value());
+    else
+        currentScriptState = ScriptState::current();
+
+    ScriptExecutionContext* scriptExecutionContext = currentScriptState->scriptExecutionContext();
+    ASSERT(scriptExecutionContext);
+
+    if (!currentScriptState->isJavaScript()) {
+        DartScriptState* dartScriptState = static_cast<DartScriptState*>(currentScriptState);
+        DartIsolateScope scope(dartScriptState->isolate());
+        DartApiScope apiScope;
+
+        Dart_Handle target = Dart_GetLibraryFromId(dartScriptState->libraryId());
+        v8SetReturnValue(args, DartHandleProxy::evaluate(target, V8Converter::stringToDart(expression), Dart_Null()));
+        return;
+    }
+
+    ASSERT(!v8::Context::GetCurrent().IsEmpty());
     v8::TryCatch tryCatch;
     v8::Handle<v8::Value> result = V8ScriptRunner::compileAndRunInternalScript(expression, args.GetIsolate());
     if (tryCatch.HasCaught()) {
         v8SetReturnValue(args, tryCatch.ReThrow());
         return;
     }
     v8SetReturnValue(args, result);
 }
 
 void V8InjectedScriptHost::setFunctionVariableValueMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ skipping 75 matching lines @@
     int lineNumber;
     int columnNumber;
     if (!getFunctionLocation(args, &scriptId, &lineNumber, &columnNumber))
         return;
 
     InjectedScriptHost* host = V8InjectedScriptHost::toNative(args.Holder());
     host->unmonitorFunction(scriptId, lineNumber, columnNumber);
 }
 
 } // namespace WebCore