diff options
Diffstat (limited to 'Source/WebCore/bindings/v8/ScriptDebugServer.cpp')
-rw-r--r-- | Source/WebCore/bindings/v8/ScriptDebugServer.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/Source/WebCore/bindings/v8/ScriptDebugServer.cpp b/Source/WebCore/bindings/v8/ScriptDebugServer.cpp index 1c70a0e..cc7fba8 100644 --- a/Source/WebCore/bindings/v8/ScriptDebugServer.cpp +++ b/Source/WebCore/bindings/v8/ScriptDebugServer.cpp @@ -143,7 +143,7 @@ void ScriptDebugServer::removeListener(ScriptDebugListener* listener, Page* page // FIXME: Remove all breakpoints set by the agent. } -String ScriptDebugServer::setBreakpoint(const String& sourceID, unsigned lineNumber, const String& condition, bool enabled, unsigned* actualLineNumber) +String ScriptDebugServer::setBreakpoint(const String& sourceID, const ScriptBreakpoint& scriptBreakpoint, int* actualLineNumber, int* actualColumnNumber) { v8::HandleScope scope; v8::Local<v8::Context> debuggerContext = v8::Debug::GetDebugContext(); @@ -151,15 +151,17 @@ String ScriptDebugServer::setBreakpoint(const String& sourceID, unsigned lineNum v8::Local<v8::Object> args = v8::Object::New(); args->Set(v8::String::New("scriptId"), v8String(sourceID)); - args->Set(v8::String::New("lineNumber"), v8::Integer::New(lineNumber)); - args->Set(v8::String::New("condition"), v8String(condition)); - args->Set(v8::String::New("enabled"), v8::Boolean::New(enabled)); + args->Set(v8::String::New("lineNumber"), v8::Integer::New(scriptBreakpoint.lineNumber)); + args->Set(v8::String::New("columnNumber"), v8::Integer::New(scriptBreakpoint.columnNumber)); + args->Set(v8::String::New("condition"), v8String(scriptBreakpoint.condition)); + args->Set(v8::String::New("enabled"), v8::Boolean::New(scriptBreakpoint.enabled)); v8::Handle<v8::Function> setBreakpointFunction = v8::Local<v8::Function>::Cast(m_debuggerScript.get()->Get(v8::String::New("setBreakpoint"))); v8::Handle<v8::Value> breakpointId = v8::Debug::Call(setBreakpointFunction, args); if (!breakpointId->IsString()) return ""; *actualLineNumber = args->Get(v8::String::New("lineNumber"))->Int32Value(); + *actualColumnNumber = args->Get(v8::String::New("columnNumber"))->Int32Value(); return v8StringToWebCoreString(breakpointId->ToString()); } @@ -340,11 +342,6 @@ void ScriptDebugServer::setEnabled(bool value) m_enabled = value; } -bool ScriptDebugServer::isDebuggerAlwaysEnabled() -{ - return m_enabled; -} - void ScriptDebugServer::interruptAndRun(PassOwnPtr<Task> task) { v8::Debug::DebugBreakForCommand(new ClientDataImpl(task)); |