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

Source/core/inspector/PageRuntimeAgent.cpp

 /*
  * Copyright (C) 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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/inspector/PageRuntimeAgent.h"
 
+#include "bindings/dart/DartController.h"
+#include "bindings/dart/DartHandleProxy.h"
 #include "bindings/v8/DOMWrapperWorld.h"
 #include "bindings/v8/ScriptController.h"
 #include "core/inspector/InjectedScript.h"
 #include "core/inspector/InjectedScriptManager.h"
 #include "core/inspector/InspectorPageAgent.h"
 #include "core/inspector/InspectorState.h"
 #include "core/inspector/InstrumentingAgents.h"
 #include "core/page/Frame.h"
 #include "core/page/Page.h"
 #include "core/page/PageConsole.h"
 #include "weborigin/SecurityOrigin.h"
 
+#include <dart_api.h>

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

We should really avoid including this outside of bindings/dart.  

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

Worse... I didn't even use this import anymore. I wish blink had a lint tool for
unused C++ includes.

+
 using WebCore::TypeBuilder::Runtime::ExecutionContextDescription;
 
 namespace WebCore {
 
 namespace PageRuntimeAgentState {
 static const char runtimeEnabled[] = "runtimeEnabled";
 };
 
 PageRuntimeAgent::PageRuntimeAgent(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* state, InjectedScriptManager* injectedScriptManager, ScriptDebugServer* scriptDebugServer, Page* page, InspectorPageAgent* pageAgent)
     : InspectorRuntimeAgent(instrumentingAgents, state, injectedScriptManager, scriptDebugServer)
@@ skipping 105 matching lines @@
 void PageRuntimeAgent::reportExecutionContextCreation()
 {
     Vector<std::pair<ScriptState*, SecurityOrigin*> > isolatedContexts;
     for (Frame* frame = m_inspectedPage->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
         if (!frame->script()->canExecuteScripts(NotAboutToExecuteScript))
             continue;
         String frameId = m_pageAgent->frameId(frame);
 
         ScriptState* scriptState = mainWorldScriptState(frame);
         notifyContextCreated(frameId, scriptState, 0, true);
+        notifyDartContextCreated(frameId, scriptState);
+
         frame->script()->collectIsolatedContexts(isolatedContexts);
         if (isolatedContexts.isEmpty())
             continue;
         for (size_t i = 0; i< isolatedContexts.size(); i++)
             notifyContextCreated(frameId, isolatedContexts[i].first, isolatedContexts[i].second, false);
         isolatedContexts.clear();
     }
 }
 
+void PageRuntimeAgent::notifyDartContextCreated(const String& frameId, ScriptState* v8ScriptState)
+{
+    ScriptExecutionContext* scriptExecutionContext = v8ScriptState->scriptExecutionContext();
+    DartController* dartController = DartController::retrieve(scriptExecutionContext);
+    if (dartController) {
+        Vector<ScriptState*> scriptStates;
+        dartController->collectScriptStates(v8ScriptState, scriptStates);
+        for (size_t i = 0; i< scriptStates.size(); i++)
+            notifyContextCreated(frameId, scriptStates[i], 0, false);
+    }
+}
+
 void PageRuntimeAgent::notifyContextCreated(const String& frameId, ScriptState* scriptState, SecurityOrigin* securityOrigin, bool isPageContext)
 {
-    ASSERT(securityOrigin || isPageContext);
+    // FIXME: should Dart scripts have a security origin?
+    ASSERT(securityOrigin || isPageContext || !scriptState->isJavaScript());
     int executionContextId = injectedScriptManager()->injectedScriptIdFor(scriptState);
-    String name = securityOrigin ? securityOrigin->toRawString() : "";
+    String name = scriptState->name() ? *scriptState->name() : (securityOrigin ? securityOrigin->toRawString() : "");
+
     m_frontend->executionContextCreated(ExecutionContextDescription::create()
         .setId(executionContextId)
         .setIsPageContext(isPageContext)
         .setName(name)
         .setFrameId(frameId)
         .release());
 }
 
 } // namespace WebCore