Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(554)

Side by Side Diff: Source/WebCore/inspector/front-end/ScriptsPanel.js

Issue 9958020: Merge 112379 - Web Inspector: breakpoints are not shown in sidebar pane after reload. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « LayoutTests/inspector/debugger/set-breakpoint-expected.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.
3 * Copyright (C) 2011 Google Inc. All rights reserved. 3 * Copyright (C) 2011 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 if (this._outlineWorker) { 249 if (this._outlineWorker) {
250 this._outlineWorker.terminate(); 250 this._outlineWorker.terminate();
251 delete this._outlineWorker; 251 delete this._outlineWorker;
252 } 252 }
253 } 253 }
254 }, 254 },
255 255
256 _uiSourceCodeAdded: function(event) 256 _uiSourceCodeAdded: function(event)
257 { 257 {
258 var uiSourceCode = /** @type {WebInspector.UISourceCode} */ event.data; 258 var uiSourceCode = /** @type {WebInspector.UISourceCode} */ event.data;
259
260 var breakpoints = uiSourceCode.breakpoints();
261 for (var lineNumber in breakpoints)
262 this._uiBreakpointAdded({ data: breakpoints[lineNumber] });
259 this._addBreakpointListeners(uiSourceCode); 263 this._addBreakpointListeners(uiSourceCode);
260 264
261 if (!uiSourceCode.url || uiSourceCode.isSnippetEvaluation) { 265 if (!uiSourceCode.url || uiSourceCode.isSnippetEvaluation) {
262 // Anonymous sources and snippets evaluations are shown only when st epping. 266 // Anonymous sources and snippets evaluations are shown only when st epping.
263 return; 267 return;
264 } 268 }
265 269
266 this._addUISourceCode(uiSourceCode); 270 this._addUISourceCode(uiSourceCode);
267 }, 271 },
268 272
(...skipping 1478 matching lines...) Expand 10 before | Expand all | Expand 10 after
1747 if (this._currentSourceFrame) 1751 if (this._currentSourceFrame)
1748 this._currentSourceFrame.detach(); 1752 this._currentSourceFrame.detach();
1749 this._currentSourceFrame = null; 1753 this._currentSourceFrame = null;
1750 this._currentFile = null; 1754 this._currentFile = null;
1751 delete this._initialViewSelectionProcessed; 1755 delete this._initialViewSelectionProcessed;
1752 delete this._userSelectedFiles; 1756 delete this._userSelectedFiles;
1753 } 1757 }
1754 } 1758 }
1755 1759
1756 WebInspector.ScriptsPanel.SingleFileEditorContainer.prototype.__proto__ = WebIns pector.Object.prototype; 1760 WebInspector.ScriptsPanel.SingleFileEditorContainer.prototype.__proto__ = WebIns pector.Object.prototype;
OLDNEW
« no previous file with comments | « LayoutTests/inspector/debugger/set-breakpoint-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698