Fix more inspector compile errors from merge as well as a ScriptState compile error.

Source/bindings/core/dart/DartScriptDebugServer.cpp

 /*
  * Copyright (C) 2014 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 290 matching lines @@
     lastColumnNumber = DartUtilities::toInteger(Dart_ListGetAt(info, infoLength - 1), exception);
     ASSERT(!exception);
 
     script.startLine = 0;
     script.startColumn = 0;
     script.endLine = lastLineNumber + 1;
     script.endColumn = !lastLineNumber ? lastColumnNumber : 0;
     script.isContentScript = false;
     script.language = String("Dart");
     script.libraryId = libraryId;
-    m_listener->didParseSource(sourceID, script);
+    m_listener->didParseSource(sourceID, script, CompileResult::CompileSuccess);
 }
 
 String DartPageDebug::getScriptId(const String& url)
 {
     HashMap<String, String>::iterator it = m_scriptUrlToIdMap.find(url);
     if (it == m_scriptUrlToIdMap.end()) {
         String id = String::format("{\"dartScript\":%d,\"page\":%d}", m_nextScriptId, m_pageId);
         m_nextScriptId++;
         m_scriptUrlToIdMap.set(url, id);
         m_idToScriptUrlMap.set(id, url);
@@ skipping 360 matching lines @@
 int DartScriptDebugServer::frameCount()
 {
     ASSERT(isPaused());
     intptr_t length = 0;
     Dart_StackTraceLength(m_executionState, &length);
     return length;
 }
 
 StackTrace DartScriptDebugServer::currentCallFrames()
 {
-    return StackTrace(m_executionState);
+    return StackTrace(m_executionState, DartUtilities::currentScriptState());
 }
 
 StackTrace DartScriptDebugServer::currentCallFramesForAsyncStack()
 {
     // FIXMEDART: implement propertly. These are the regular not Async call frames.
-    return StackTrace(m_executionState);
+    return StackTrace(m_executionState, DartUtilities::currentScriptState());
+}
+
+ScriptCallFrame DartScriptDebugServer::callFrameNoScopes(int index)
+{
+    if (!isPaused())
+        return ScriptCallFrame();
+    DartIsolateScope scope(m_pausedIsolate);
+    DartApiScope apiScope;
+    return getScriptCallFrameHelper(index);
 }
 
 bool DartScriptDebugServer::isPaused()
 {
     return !!m_executionState;
 }
 
 void DartScriptDebugServer::clearCompiledScripts()
 {
     // FIXMEDART: is this meaningful for Dart?
@@ skipping 359 matching lines @@
     ASSERT(!Dart_IsError(result));
     result = Dart_ActivationFrameGetLocation(frame, 0, 0, &location);
     ASSERT(!Dart_IsError(result));
     handleProgramBreak(isolate, trace, ILLEGAL_BREAKPOINT_ID, exception, location);
 }
 
 void DartScriptDebugServer::runScript(ScriptState* scriptState, const String& scriptId, ScriptValue* result, bool* wasThrown, String* exceptionDetailsText, int* lineNumber, int* columnNumber, RefPtrWillBeRawPtr<ScriptCallStack>* stackTrace)
 {
 }
 
-
-ScriptCallFrame DartScriptDebugServer::topCallFrameNoScopes()
+ScriptCallFrame DartScriptDebugServer::getScriptCallFrameHelper(int frameIndex)
 {
-    if (!isPaused())
-        return ScriptCallFrame();
-    DartIsolateScope scope(m_pausedIsolate);
-    DartApiScope apiScope;
-
-    // FIXME: move this to a shared helper method.
     Dart_ActivationFrame frame = 0;
-    Dart_Handle result = Dart_GetActivationFrame(0, 0, &frame);
+    Dart_Handle result = Dart_GetActivationFrame(0, frameIndex, &frame);
     ASSERT(!Dart_IsError(result));
     if (Dart_IsError(result)) return ScriptCallFrame();
     Dart_Handle functionName = 0;
     Dart_Handle function = 0;
     Dart_CodeLocation location;
     Dart_ActivationFrameGetLocation(frame, &functionName, &function, &location);
     const String& url = DartUtilities::toString(location.script_url);
     intptr_t line = 0;
     intptr_t column = 0;
     Dart_ActivationFrameInfo(frame, 0, 0, &line, &column);
 
     Dart_Handle exception = 0;
     String functionString = DartUtilities::dartToString(functionName, exception);
     ASSERT(!exception);
     if (exception)
         functionString = "Unknown function";
     return ScriptCallFrame(functionString, getScriptId(url, Dart_CurrentIsolate()), url, line - 1, column - 1, false);
 }
 
+ScriptCallFrame DartScriptDebugServer::topCallFrameNoScopes()
+{
+    if (!isPaused())
+        return ScriptCallFrame();
+    DartIsolateScope scope(m_pausedIsolate);
+    DartApiScope apiScope;
+    return getScriptCallFrameHelper(0);
+}
+
 UnifiedScriptDebugServer::UnifiedScriptDebugServer(DartScriptDebugServer* dartScriptDebugServer, PageScriptDebugServer* scriptDebugServer)
 {
     m_v8 = scriptDebugServer;
     m_dart = dartScriptDebugServer;
     m_v8->setPeer(m_dart);
     m_dart->setPeer(m_v8);
 }
 
 UnifiedScriptDebugServer& UnifiedScriptDebugServer::shared()
 {
@@ skipping 133 matching lines @@
 
 StackTrace UnifiedScriptDebugServer::currentCallFramesForAsyncStack()
 {
     // FIXMEDART: we need to figure out how to interleave stack traces where possible.
     StackTrace v8StackTrace = m_v8->currentCallFramesForAsyncStack();
     if (!v8StackTrace.isNull())
         return v8StackTrace;
     return m_dart->currentCallFramesForAsyncStack();
 }
 
+ScriptCallFrame UnifiedScriptDebugServer::callFrameNoScopes(int index)
+{
+    if (m_v8->isPaused())
+        return m_v8->callFrameNoScopes(index);
+
+    return m_dart->callFrameNoScopes(index);
+}
 
 bool UnifiedScriptDebugServer::isPaused()
 {
     return m_v8->isPaused() || m_dart->isPaused();
 }
 
 bool UnifiedScriptDebugServer::runningNestedMessageLoop()
 {
     return m_dart->runningNestedMessageLoop() || m_v8->runningNestedMessageLoop();
 }
@@ skipping 65 matching lines @@
     MessageQueue<ScriptDebugServer::Task>& tasks = debugTaskQueue();
     tasks.append(task);
     // The first VM interrupt method triggered will drain the task queue.
     // FIXMEDART: refactor the V8 code to have an interruptAndRunAllTasks
     // method.
     PageScriptDebugServer::interruptAndRun(adoptPtr(new DrainQueueTask(&tasks)));
     DartScriptDebugServer::interruptAndRunAllTasks();
 }
 
 }