DevTools: Show detailed information for exceptions during snippet execution.

Source/bindings/v8/ScriptDebugServer.cpp

 /*
  * Copyright (c) 2010-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 16 matching lines @@
  * (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 "bindings/v8/ScriptDebugServer.h"
 
 #include "DebuggerScriptSource.h"
 #include "V8JavaScriptCallFrame.h"
 #include "bindings/v8/ScopedPersistent.h"
+#include "bindings/v8/ScriptCallStackFactory.h"
 #include "bindings/v8/ScriptController.h"
 #include "bindings/v8/ScriptObject.h"
 #include "bindings/v8/ScriptSourceCode.h"
 #include "bindings/v8/V8Binding.h"
 #include "bindings/v8/V8ScriptRunner.h"
 #include "core/inspector/JavaScriptCallFrame.h"
 #include "core/inspector/ScriptDebugListener.h"
 #include "platform/JSONValues.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/Vector.h"
@@ skipping 546 matching lines @@
     };
     return callDebuggerMethod("setFunctionVariableValue", 4, argv);
 }
 
 
 bool ScriptDebugServer::isPaused()
 {
     return !m_executionState.isEmpty();
 }
 
-void ScriptDebugServer::compileScript(ScriptState* scriptState, const String& expression, const String& sourceURL, String* scriptId, String* exceptionMessage)
+void ScriptDebugServer::compileScript(ScriptState* scriptState, const String& expression, const String& sourceURL, String* scriptId, String* exceptionMessage, int* lineNumber, int* columnNumber, RefPtr<ScriptCallStack>* stackTrace)
 {
     if (scriptState->contextIsEmpty())
         return;
     ScriptState::Scope scope(scriptState);
 
     v8::Handle<v8::String> source = v8String(m_isolate, expression);
     v8::TryCatch tryCatch;
     v8::Local<v8::Script> script = V8ScriptRunner::compileScript(source, sourceURL, TextPosition(), 0, m_isolate);
     if (tryCatch.HasCaught()) {
         v8::Local<v8::Message> message = tryCatch.Message();
-        if (!message.IsEmpty())
+        if (!message.IsEmpty()) {
             *exceptionMessage = toCoreStringWithUndefinedOrNullCheck(message->Get());
+            if (lineNumber)

[vsevik, 2014/05/19 12:40:23]

This won't be needed once default parameters are removed. We assume these should
always be passed in here.

+                *lineNumber   = message->GetLineNumber();

[vsevik, 2014/05/19 12:40:23]

extra space

+            if (columnNumber)
+                *columnNumber = message->GetStartColumn();
+            if (stackTrace)
+                *stackTrace = createScriptCallStack(message->GetStackTrace(), ScriptCallStack::maxCallStackSizeToCapture, m_isolate);
+        }
         return;
     }
     if (script.IsEmpty())
         return;
 
     *scriptId = String::number(script->GetId());
     m_compiledScripts.set(*scriptId, adoptPtr(new ScopedPersistent<v8::Script>(m_isolate, script)));
 }
 
 void ScriptDebugServer::clearCompiledScripts()
 {
     m_compiledScripts.clear();
 }
 
-void ScriptDebugServer::runScript(ScriptState* scriptState, const String& scriptId, ScriptValue* result, bool* wasThrown, String* exceptionMessage)
+void ScriptDebugServer::runScript(ScriptState* scriptState, const String& scriptId, ScriptValue* result, bool* wasThrown, String* exceptionMessage, int* lineNumber, int* columnNumber, RefPtr<ScriptCallStack>* stackTrace)
 {
     if (!m_compiledScripts.contains(scriptId))
         return;
     v8::HandleScope handleScope(m_isolate);
     ScopedPersistent<v8::Script>* scriptHandle = m_compiledScripts.get(scriptId);
     v8::Local<v8::Script> script = scriptHandle->newLocal(m_isolate);
     m_compiledScripts.remove(scriptId);
     if (script.IsEmpty())
         return;
 
     if (scriptState->contextIsEmpty())
         return;
     ScriptState::Scope scope(scriptState);
     v8::TryCatch tryCatch;
     v8::Local<v8::Value> value = V8ScriptRunner::runCompiledScript(script, scriptState->executionContext(), m_isolate);
     *wasThrown = false;
     if (tryCatch.HasCaught()) {
         *wasThrown = true;
         *result = ScriptValue(scriptState, tryCatch.Exception());
         v8::Local<v8::Message> message = tryCatch.Message();
-        if (!message.IsEmpty())
+        if (!message.IsEmpty()) {
             *exceptionMessage = toCoreStringWithUndefinedOrNullCheck(message->Get());
+            if (lineNumber)
+                *lineNumber   = message->GetLineNumber();

[vsevik, 2014/05/19 12:40:23]

ditto

+            if (columnNumber)
+                *columnNumber = message->GetStartColumn();
+            if (stackTrace)
+                *stackTrace = createScriptCallStack(message->GetStackTrace(), ScriptCallStack::maxCallStackSizeToCapture, m_isolate);
+        }
     } else {
         *result = ScriptValue(scriptState, value);
     }
 }
 
 PassOwnPtr<ScriptSourceCode> ScriptDebugServer::preprocess(LocalFrame*, const ScriptSourceCode&)
 {
     return PassOwnPtr<ScriptSourceCode>();
 }
 
 String ScriptDebugServer::preprocessEventListener(LocalFrame*, const String& source, const String& url, const String& functionName)
 {
     return source;
 }
 
 } // namespace WebCore