| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 /** | 218 /** |
| 219 * @param {string} expression | 219 * @param {string} expression |
| 220 */ | 220 */ |
| 221 _evaluateInConsole: function(expression) | 221 _evaluateInConsole: function(expression) |
| 222 { | 222 { |
| 223 var currentExecutionContext = WebInspector.context.flavor(WebInspector.E
xecutionContext); | 223 var currentExecutionContext = WebInspector.context.flavor(WebInspector.E
xecutionContext); |
| 224 if (currentExecutionContext) | 224 if (currentExecutionContext) |
| 225 WebInspector.ConsoleModel.evaluateCommandInConsole(currentExecutionC
ontext, expression); | 225 WebInspector.ConsoleModel.evaluateCommandInConsole(currentExecutionC
ontext, expression); |
| 226 }, | 226 }, |
| 227 | 227 |
| 228 // View events | 228 /** |
| 229 * @override |
| 230 */ |
| 229 wasShown: function() | 231 wasShown: function() |
| 230 { | 232 { |
| 231 WebInspector.UISourceCodeFrame.prototype.wasShown.call(this); | 233 WebInspector.UISourceCodeFrame.prototype.wasShown.call(this); |
| 232 if (this._executionLocation && this.loaded) | 234 if (this._executionLocation && this.loaded) { |
| 233 this._generateValuesInSource(); | 235 // We need CodeMirrorTextEditor to be initialized prior to this call
. @see crbug.com/499889 |
| 236 setImmediate(this._generateValuesInSource.bind(this)); |
| 237 } |
| 234 }, | 238 }, |
| 235 | 239 |
| 240 /** |
| 241 * @override |
| 242 */ |
| 236 willHide: function() | 243 willHide: function() |
| 237 { | 244 { |
| 238 WebInspector.UISourceCodeFrame.prototype.willHide.call(this); | 245 WebInspector.UISourceCodeFrame.prototype.willHide.call(this); |
| 239 this._popoverHelper.hidePopover(); | 246 this._popoverHelper.hidePopover(); |
| 240 }, | 247 }, |
| 241 | 248 |
| 242 onUISourceCodeContentChanged: function() | 249 onUISourceCodeContentChanged: function() |
| 243 { | 250 { |
| 244 this._removeAllBreakpoints(); | 251 this._removeAllBreakpoints(); |
| 245 WebInspector.UISourceCodeFrame.prototype.onUISourceCodeContentChanged.ca
ll(this); | 252 WebInspector.UISourceCodeFrame.prototype.onUISourceCodeContentChanged.ca
ll(this); |
| (...skipping 870 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1116 this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.
WorkingCopyChanged, this._workingCopyChanged, this); | 1123 this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.
WorkingCopyChanged, this._workingCopyChanged, this); |
| 1117 this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.
WorkingCopyCommitted, this._workingCopyCommitted, this); | 1124 this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.
WorkingCopyCommitted, this._workingCopyCommitted, this); |
| 1118 this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.
TitleChanged, this._showBlackboxInfobarIfNeeded, this); | 1125 this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.
TitleChanged, this._showBlackboxInfobarIfNeeded, this); |
| 1119 WebInspector.moduleSetting("skipStackFramesPattern").removeChangeListene
r(this._showBlackboxInfobarIfNeeded, this); | 1126 WebInspector.moduleSetting("skipStackFramesPattern").removeChangeListene
r(this._showBlackboxInfobarIfNeeded, this); |
| 1120 WebInspector.moduleSetting("skipContentScripts").removeChangeListener(th
is._showBlackboxInfobarIfNeeded, this); | 1127 WebInspector.moduleSetting("skipContentScripts").removeChangeListener(th
is._showBlackboxInfobarIfNeeded, this); |
| 1121 WebInspector.UISourceCodeFrame.prototype.dispose.call(this); | 1128 WebInspector.UISourceCodeFrame.prototype.dispose.call(this); |
| 1122 }, | 1129 }, |
| 1123 | 1130 |
| 1124 __proto__: WebInspector.UISourceCodeFrame.prototype | 1131 __proto__: WebInspector.UISourceCodeFrame.prototype |
| 1125 } | 1132 } |
| OLD | NEW |