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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 625989fbfb5bbdc5259f62ebc0371422652ef9eb
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 19 15:44:35 2010 +0000

    2010-08-19  Pavel Podivilov  <podivilov at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Web Inspector: activate/deactivate breakpoints using v8 debugger flag.
            https://bugs.webkit.org/show_bug.cgi?id=44112
    
            * src/js/DebuggerScript.js:
            ():
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65674 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 128e759..f3d05b3 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-19  Pavel Podivilov  <podivilov at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: activate/deactivate breakpoints using v8 debugger flag.
+        https://bugs.webkit.org/show_bug.cgi?id=44112
+
+        * src/js/DebuggerScript.js:
+        ():
+
 2010-08-19  Andrei Popescu  <andreip at google.com>
 
         Reviewed by Jeremy Orlow.
diff --git a/WebKit/chromium/src/js/DebuggerScript.js b/WebKit/chromium/src/js/DebuggerScript.js
index 51787f6..5a8a7bf 100644
--- a/WebKit/chromium/src/js/DebuggerScript.js
+++ b/WebKit/chromium/src/js/DebuggerScript.js
@@ -32,7 +32,6 @@
 
 var DebuggerScript = {};
 DebuggerScript._breakpoints = {};
-DebuggerScript._breakpointsActivated = true;
 
 DebuggerScript.PauseOnExceptionsState = {
     DontPauseOnExceptions : 0,
@@ -95,7 +94,7 @@ DebuggerScript.setBreakpoint = function(execState, args)
 {
     args.lineNumber = DebuggerScript._webkitToV8LineNumber(args.lineNumber);
     var breakId = Debug.setScriptBreakPointById(args.scriptId, args.lineNumber, 0 /* column */, args.condition);
-    if (!args.enabled || !DebuggerScript._breakpointsActivated)
+    if (!args.enabled)
         Debug.disableScriptBreakPoint(breakId);
 
     var locations = Debug.findBreakPointActualLocations(breakId);
@@ -198,14 +197,7 @@ DebuggerScript.clearBreakpoints = function(execState, args)
 
 DebuggerScript.setBreakpointsActivated = function(execState, args)
 {
-    for (var key in DebuggerScript._breakpoints) {
-        var breakId = DebuggerScript._breakpoints[key];
-        if (args.enabled)
-            Debug.enableScriptBreakPoint(breakId);
-        else
-            Debug.disableScriptBreakPoint(breakId);
-    }
-    DebuggerScript._breakpointsActivated = args.enabled;
+    Debug.debuggerFlags().breakPointsActive.setValue(args.enabled);
 }
 
 DebuggerScript._frameMirrorToJSCallFrame = function(frameMirror, callerFrame)

-- 
WebKit Debian packaging