Merge webkit.org at r60469 : Initial merge by git.

Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234

1 files changed, 20 insertions, 23 deletions

diff --git a/WebCore/inspector/front-end/ScriptsPanel.js b/WebCore/inspector/front-end/ScriptsPanel.js
index 6c817ac..755daff 100644
--- a/WebCore/inspector/front-end/ScriptsPanel.js
+++ b/WebCore/inspector/front-end/ScriptsPanel.js
@@ -164,12 +164,17 @@ WebInspector.ScriptsPanel = function()
     this._pauseOnExceptionButton = new WebInspector.StatusBarButton("", "scripts-pause-on-exceptions-status-bar-item", 3);
     this._pauseOnExceptionButton.addEventListener("click", this._togglePauseOnExceptions.bind(this), false);
     this._pauseOnExceptionButton.state = WebInspector.ScriptsPanel.PauseOnExceptionsState.DontPauseOnExceptions;
+    this._pauseOnExceptionButton.title = WebInspector.UIString("Don't pause on exceptions.\nClick to Pause on all exceptions."); 
 
     this._registerShortcuts();
 
     this._debuggerEnabled = Preferences.debuggerAlwaysEnabled;
     if (Preferences.debuggerAlwaysEnabled)
         this._attachDebuggerWhenShown = true;
+
+    WebInspector.breakpointManager.addEventListener("breakpoint-added", this._breakpointAdded, this);
+    WebInspector.breakpointManager.addEventListener("breakpoint-removed", this._breakpointRemoved, this);
+
     this.reset();
 }
 
@@ -284,13 +289,13 @@ WebInspector.ScriptsPanel.prototype = {
         delete resource._scriptsPendingResourceLoad;
     },
 
-    addBreakpoint: function(breakpoint)
+    _breakpointAdded: function(event)
     {
+        var breakpoint = event.data;
+
         if (!this.breakpointsActivated)
             this._toggleBreakpointsClicked();
 
-        this.sidebarPanes.breakpoints.addBreakpoint(breakpoint);
-
         var sourceFrame;
         if (breakpoint.url) {
             var resource = WebInspector.resourceURLMap[breakpoint.url];
@@ -307,9 +312,9 @@ WebInspector.ScriptsPanel.prototype = {
             sourceFrame.addBreakpoint(breakpoint);
     },
 
-    removeBreakpoint: function(breakpoint)
+    _breakpointRemoved: function(event)
     {
-        this.sidebarPanes.breakpoints.removeBreakpoint(breakpoint);
+        var breakpoint = event.data;
 
         var sourceFrame;
         if (breakpoint.url) {
@@ -338,22 +343,18 @@ WebInspector.ScriptsPanel.prototype = {
             return;
 
         // Need to clear breakpoints and re-create them later when editing source.
-        var breakpointsPanel = this.sidebarPanes.breakpoints;
-        var newBreakpoints = [];
-        for (var id in breakpointsPanel.breakpoints) {
-            var breakpoint = breakpointsPanel.breakpoints[id];
-            breakpointsPanel.removeBreakpoint(breakpoint);
-            newBreakpoints.push(breakpoint);
-        }
+        var breakpoints = WebInspector.breakpointManager.breakpointsForSourceID(sourceID);
+        for (var i = 0; i < breakpoints.length; ++i)
+            WebInspector.breakpointManager.removeBreakpoint(breakpoints[i]);
 
         function mycallback(newBody)
         {
             callback(newBody);
-            for (var i = 0; i < newBreakpoints.length; ++i) {
-                var breakpoint = newBreakpoints[i];
+            for (var i = 0; i < breakpoints.length; ++i) {
+                var breakpoint = breakpoints[i];
                 if (breakpoint.line >= line)
                     breakpoint.line += linesCountToShift;
-                this.addBreakpoint(breakpoint);
+                WebInspector.breakpointManager.addBreakpoint(breakpoint);
             }
         };
         var callbackId = WebInspector.Callback.wrap(mycallback.bind(this))
@@ -611,14 +612,10 @@ WebInspector.ScriptsPanel.prototype = {
                 return null;
             view = WebInspector.panels.resources.resourceViewForResource(scriptOrResource);
             view.headersVisible = false;
-            var breakpoints = this.sidebarPanes.breakpoints.breakpoints;
-            for (var breakpointId in breakpoints) {
-                var breakpoint = breakpoints[breakpointId];
-                if (breakpoint.url === scriptOrResource.url) {
-                    var sourceFrame = this._sourceFrameForScriptOrResource(scriptOrResource);
-                    sourceFrame.addBreakpoint(breakpoint);
-                }
-            }
+            var sourceFrame = this._sourceFrameForScriptOrResource(scriptOrResource);
+            var breakpoints = WebInspector.breakpointManager.breakpointsForURL(scriptOrResource.url);
+            for (var i = 0; i < breakpoints.length; ++i)
+                sourceFrame.addBreakpoint(breakpoints[i]);
         } else if (scriptOrResource instanceof WebInspector.Script)
             view = this.scriptViewForScript(scriptOrResource);