[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[pfeldman at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit ccdfbb805c8a75266e58bad8f09d1297557e21a6
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jul 18 16:32:16 2010 +0000

    2010-07-16  Pavel Podivilov  <podivilov at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            [V8] Web Inspector: get actual breakpoint location from v8 and pass it
            to ScripDebugServer.
            https://bugs.webkit.org/show_bug.cgi?id=42452
    
            * src/js/DebuggerScript.js:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63626 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 4b89209..3ec7e29 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-16  Pavel Podivilov  <podivilov at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        [V8] Web Inspector: get actual breakpoint location from v8 and pass it
+        to ScripDebugServer.
+        https://bugs.webkit.org/show_bug.cgi?id=42452
+
+        * src/js/DebuggerScript.js:
+
 2010-07-17  John Gregg  <johnnyg at google.com>
 
         Reviewed by Kent Tamura.
diff --git a/WebKit/chromium/src/js/DebuggerScript.js b/WebKit/chromium/src/js/DebuggerScript.js
index 70c2fbe..8558469 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) {

-- 
WebKit Debian packaging