diff options
| author | Ben Murdoch <benm@google.com> | 2010-07-22 15:37:06 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-07-27 10:20:25 +0100 |
| commit | 967717af5423377c967781471ee106e2bb4e11c8 (patch) | |
| tree | 1e701dc0a12f7f07cce1df4a7681717de77a211b /WebKit/chromium/src/js/DebuggerScript.js | |
| parent | dcc30a9fca45f634b1d3a12b276d3a0ccce99fc3 (diff) | |
| download | external_webkit-967717af5423377c967781471ee106e2bb4e11c8.zip external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.gz external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.bz2 | |
Merge WebKit at r63859 : Initial merge by git.
Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
Diffstat (limited to 'WebKit/chromium/src/js/DebuggerScript.js')
| -rw-r--r-- | WebKit/chromium/src/js/DebuggerScript.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebKit/chromium/src/js/DebuggerScript.js b/WebKit/chromium/src/js/DebuggerScript.js index 70c2fbe..7181d74 100644 --- a/WebKit/chromium/src/js/DebuggerScript.js +++ b/WebKit/chromium/src/js/DebuggerScript.js @@ -97,7 +97,8 @@ DebuggerScript.setBreakpoint = function(execState, args) if (!args.enabled) Debug.disableScriptBreakPoint(breakId); - var actualLineNumber = args.lineNumber; // TODO: replace with real stuff after v8 roll. + var locations = Debug.findBreakPointActualLocations(breakId); + var actualLineNumber = locations.length ? locations[0].line : args.lineNumber; var key = args.scriptId + ":" + actualLineNumber; if (key in DebuggerScript._breakpoints) { @@ -181,7 +182,7 @@ DebuggerScript.editScriptSource = function(scriptId, newSource) throw("Script not found"); var changeLog = []; - Debug.LiveEdit.SetScriptSource(scriptToEdit, newSource, changeLog); + Debug.LiveEdit.SetScriptSource(scriptToEdit, newSource, false, changeLog); return scriptToEdit.source; } |