Merge 86963 - 2011-05-20 Pavel Podivilov <podivilov@chromium.org>

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

 /*
  * 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 45 matching lines @@
     BreakpointAdded: "breakpoint-added",
     BreakpointRemoved: "breakpoint-removed",
     DebuggerPaused: "debugger-paused",
     DebuggerResumed: "debugger-resumed",
     CallFrameSelected: "call-frame-selected"
 }
 
 WebInspector.DebuggerPresentationModel.prototype = {
     _debuggerWasEnabled: function()
     {
+        if (this._breakpointsRestored)
+            return;
         this._restoreBreakpointsFromSettings();
+        this._breakpointsRestored = true;
     },
 
     sourceFile: function(sourceFileId)
     {
         return this._sourceFiles[sourceFileId];
     },
 
     sourceFileForScriptURL: function(scriptURL)
     {
         return this._sourceFiles[scriptURL];
@@ skipping 413 matching lines @@
 
             for (var lineNumber in sourceFile.breakpoints)
                 serializedBreakpoints.push(sourceFile.breakpoints[lineNumber].serialize());
         }
 
         // Store not added breakpoints.
         for (var sourceFileId in this._breakpointsWithoutSourceFile)
             serializedBreakpoints = serializedBreakpoints.concat(this._breakpointsWithoutSourceFile[sourceFileId]);
 
         // Sanitize debugger ids.
-        for (var i = 0; i < serializedBreakpoints.length; ++i)
-            delete serializedBreakpoints[i].debuggerId;
+        for (var i = 0; i < serializedBreakpoints.length; ++i) {
+            var breakpoint = serializedBreakpoints[i];
+            var breakpointCopy = {};
+            for (var property in breakpoint) {
+                if (property !== "debuggerId")
+                    breakpointCopy[property] = breakpoint[property];
+            }
+            serializedBreakpoints[i] = breakpointCopy;
+        }
 
         WebInspector.settings.breakpoints = serializedBreakpoints;
     },
 
     _debuggerPaused: function()
     {
         var callFrames = WebInspector.debuggerModel.callFrames;
         this._presentationCallFrames = [];
         for (var i = 0; i < callFrames.length; ++i) {
             var callFrame = callFrames[i];
@@ skipping 234 matching lines @@
             if (!error) {
                 this._presentationModel._updateBreakpointsAfterLiveEdit(sourceFile.id, oldContent, content);
                 sourceFile.reload();
             }
         }
         this._presentationModel.editScriptSource(sourceFile.id, content, callback.bind(this));
     }
 }
 
 WebInspector.DebuggerPresentationModelResourceBinding.prototype.__proto__ = WebInspector.ResourceDomainModelBinding.prototype;