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

podivilov at chromium.org podivilov at chromium.org
Wed Dec 22 14:06:19 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit e64278c865ca0c0394656a07536bfc651dff663e
Author: podivilov at chromium.org <podivilov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 4 17:00:50 2010 +0000

    2010-10-04  Pavel Podivilov  <podivilov at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: do not show breakpoint in front-end if it was not set in v8
            https://bugs.webkit.org/show_bug.cgi?id=46749
    
            * bindings/v8/DebuggerScript.js:
            ():
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69019 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6597a38..df92166 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-04  Pavel Podivilov  <podivilov at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: do not show breakpoint in front-end if it was not set in v8
+        https://bugs.webkit.org/show_bug.cgi?id=46749
+
+        * bindings/v8/DebuggerScript.js:
+        ():
+
 2010-10-04  Alejandro G. Castro  <alex at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebCore/bindings/v8/DebuggerScript.js b/WebCore/bindings/v8/DebuggerScript.js
index 0222296..6026214 100644
--- a/WebCore/bindings/v8/DebuggerScript.js
+++ b/WebCore/bindings/v8/DebuggerScript.js
@@ -98,7 +98,9 @@ DebuggerScript.setBreakpoint = function(execState, args)
         Debug.disableScriptBreakPoint(breakId);
 
     var locations = Debug.findBreakPointActualLocations(breakId);
-    var actualLineNumber = locations.length ? locations[0].line : args.lineNumber;
+    if (!locations.length)
+        return undefined;
+    var actualLineNumber = locations[0].line;
 
     var key = args.scriptId + ":" + actualLineNumber;
     if (key in DebuggerScript._breakpoints) {

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list