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

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

Issue 5997002: Merge 74261 - 2010-12-17 Pavel Podivilov <podivilov@chromium.org>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/597/
Patch Set: Created 10 years 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 | « no previous file | WebCore/inspector/front-end/SourceFrame.js » ('j') | 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 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 { 238 {
239 var script = new WebInspector.Script(sourceID, sourceURL, source, starti ngLine, errorLine, errorMessage, scriptWorldType); 239 var script = new WebInspector.Script(sourceID, sourceURL, source, starti ngLine, errorLine, errorMessage, scriptWorldType);
240 this._sourceIDMap[sourceID] = script; 240 this._sourceIDMap[sourceID] = script;
241 241
242 var resource = WebInspector.resourceForURL(sourceURL); 242 var resource = WebInspector.resourceForURL(sourceURL);
243 if (resource) { 243 if (resource) {
244 if (resource.finished) { 244 if (resource.finished) {
245 // Resource is finished, bind the script right away. 245 // Resource is finished, bind the script right away.
246 resource.addScript(script); 246 resource.addScript(script);
247 this._sourceIDMap[sourceID] = resource; 247 this._sourceIDMap[sourceID] = resource;
248 var view = WebInspector.ResourceManager.existingResourceViewForR esource(resource);
249 if (view && view.sourceFrame)
250 view.sourceFrame.addScript(script);
248 } else { 251 } else {
249 // Resource is not finished, bind the script later. 252 // Resource is not finished, bind the script later.
250 if (!resource._scriptsPendingResourceLoad) { 253 if (!resource._scriptsPendingResourceLoad) {
251 resource._scriptsPendingResourceLoad = []; 254 resource._scriptsPendingResourceLoad = [];
252 resource.addEventListener("finished", this._resourceLoadingF inished, this); 255 resource.addEventListener("finished", this._resourceLoadingF inished, this);
253 } 256 }
254 resource._scriptsPendingResourceLoad.push(script); 257 resource._scriptsPendingResourceLoad.push(script);
255 } 258 }
256 } 259 }
257 this._addScriptToFilesMenu(script); 260 this._addScriptToFilesMenu(script);
(...skipping 832 matching lines...) Expand 10 before | Expand all | Expand 10 after
1090 showGoToLineDialog: function(e) 1093 showGoToLineDialog: function(e)
1091 { 1094 {
1092 var view = this.visibleView; 1095 var view = this.visibleView;
1093 if (view) 1096 if (view)
1094 WebInspector.GoToLineDialog.show(view); 1097 WebInspector.GoToLineDialog.show(view);
1095 } 1098 }
1096 } 1099 }
1097 1100
1098 WebInspector.ScriptsPanel.prototype.__proto__ = WebInspector.Panel.prototype; 1101 WebInspector.ScriptsPanel.prototype.__proto__ = WebInspector.Panel.prototype;
1099 1102
OLDNEW
« no previous file with comments | « no previous file | WebCore/inspector/front-end/SourceFrame.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698