Merge 112841 - Web Inspector: breakpoints are not shown in sidebar pane after switching pretty-prin…

Source/WebCore/inspector/front-end/ScriptsPanel.js

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 580 matching lines @@
         var oldUISourceCodeList = /** @type {Array.<WebInspector.UISourceCode>} */ event.data.oldUISourceCodeList;
         var uiSourceCodeList = /** @type {Array.<WebInspector.UISourceCode>} */ event.data.uiSourceCodeList;
 
         this._fileSelector.replaceUISourceCodes(oldUISourceCodeList, uiSourceCodeList);
         this._editorContainer.replaceFiles(oldUISourceCodeList, uiSourceCodeList);
         for (var i = 0; i < oldUISourceCodeList.length; ++i)
             this._removeSourceFrame(oldUISourceCodeList[i]);
 
         for (var i = 0; i < oldUISourceCodeList.length; ++i)
             this._removeBreakpointListeners(oldUISourceCodeList[i]);
-        for (var i = 0; i < uiSourceCodeList.length; ++i)
-            this._addBreakpointListeners(uiSourceCodeList[i]);
+        for (var i = 0; i < uiSourceCodeList.length; ++i) {
+            var uiSourceCode = uiSourceCodeList[i];
+            var breakpoints = uiSourceCode.breakpoints();
+            for (var lineNumber in breakpoints)
+                this._uiBreakpointAdded({ data: breakpoints[lineNumber] });
+            this._addBreakpointListeners(uiSourceCode);
+        }
     },
 
     _sourceFrameLoaded: function(event)
     {
         var sourceFrame = /** @type {WebInspector.JavaScriptSourceFrame} */ event.target;
         var uiSourceCode = sourceFrame._uiSourceCode;
 
         var messages = this._presentationModel.messagesForUISourceCode(uiSourceCode);
         for (var i = 0; i < messages.length; ++i) {
             var message = messages[i];
@@ skipping 1138 matching lines @@
         if (this._currentSourceFrame)
             this._currentSourceFrame.detach();
         this._currentSourceFrame = null;
         this._currentFile = null;
         delete this._initialViewSelectionProcessed;
         delete this._userSelectedFiles;
     }
 }
 
 WebInspector.ScriptsPanel.SingleFileEditorContainer.prototype.__proto__ = WebInspector.Object.prototype;