Chromium Code Reviews| 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 694 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 705 var executionContext = WebInspector.context.flavor(WebInspector.Executio nContext); | 705 var executionContext = WebInspector.context.flavor(WebInspector.Executio nContext); |
| 706 if (!executionContext) | 706 if (!executionContext) |
| 707 return; | 707 return; |
| 708 var callFrame = executionContext.debuggerModel.selectedCallFrame(); | 708 var callFrame = executionContext.debuggerModel.selectedCallFrame(); |
| 709 if (!callFrame) | 709 if (!callFrame) |
| 710 return; | 710 return; |
| 711 | 711 |
| 712 var localScope = callFrame.localScope(); | 712 var localScope = callFrame.localScope(); |
| 713 var functionLocation = callFrame.functionLocation(); | 713 var functionLocation = callFrame.functionLocation(); |
| 714 if (localScope && functionLocation) | 714 if (localScope && functionLocation) |
| 715 localScope.object().getAllProperties(false, this._prepareScopeVariab les.bind(this, callFrame)); | 715 WebInspector.sourceMapNamesResolver.resolveScopeInObject(localScope) .getAllProperties(false, this._prepareScopeVariables.bind(this, callFrame)); |
|
dgozman
2016/02/22 17:24:56
Can we avoid global singleton?
sergeyv
2016/02/22 21:42:54
Done. Made static function
| |
| 716 | 716 |
| 717 if (this._clearValueWidgetsTimer) { | 717 if (this._clearValueWidgetsTimer) { |
| 718 clearTimeout(this._clearValueWidgetsTimer); | 718 clearTimeout(this._clearValueWidgetsTimer); |
| 719 delete this._clearValueWidgetsTimer; | 719 delete this._clearValueWidgetsTimer; |
| 720 } | 720 } |
| 721 }, | 721 }, |
| 722 | 722 |
| 723 /** | 723 /** |
| 724 * @param {!WebInspector.DebuggerModel.CallFrame} callFrame | 724 * @param {!WebInspector.DebuggerModel.CallFrame} callFrame |
| 725 * @param {?Array.<!WebInspector.RemoteObjectProperty>} properties | 725 * @param {?Array.<!WebInspector.RemoteObjectProperty>} properties |
| (...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1112 this.uiSourceCode().removeEventListener(WebInspector.UISourceCode.Events .WorkingCopyChanged, this._workingCopyChanged, this); | 1112 this.uiSourceCode().removeEventListener(WebInspector.UISourceCode.Events .WorkingCopyChanged, this._workingCopyChanged, this); |
| 1113 this.uiSourceCode().removeEventListener(WebInspector.UISourceCode.Events .WorkingCopyCommitted, this._workingCopyCommitted, this); | 1113 this.uiSourceCode().removeEventListener(WebInspector.UISourceCode.Events .WorkingCopyCommitted, this._workingCopyCommitted, this); |
| 1114 this.uiSourceCode().removeEventListener(WebInspector.UISourceCode.Events .TitleChanged, this._showBlackboxInfobarIfNeeded, this); | 1114 this.uiSourceCode().removeEventListener(WebInspector.UISourceCode.Events .TitleChanged, this._showBlackboxInfobarIfNeeded, this); |
| 1115 WebInspector.moduleSetting("skipStackFramesPattern").removeChangeListene r(this._showBlackboxInfobarIfNeeded, this); | 1115 WebInspector.moduleSetting("skipStackFramesPattern").removeChangeListene r(this._showBlackboxInfobarIfNeeded, this); |
| 1116 WebInspector.moduleSetting("skipContentScripts").removeChangeListener(th is._showBlackboxInfobarIfNeeded, this); | 1116 WebInspector.moduleSetting("skipContentScripts").removeChangeListener(th is._showBlackboxInfobarIfNeeded, this); |
| 1117 WebInspector.UISourceCodeFrame.prototype.dispose.call(this); | 1117 WebInspector.UISourceCodeFrame.prototype.dispose.call(this); |
| 1118 }, | 1118 }, |
| 1119 | 1119 |
| 1120 __proto__: WebInspector.UISourceCodeFrame.prototype | 1120 __proto__: WebInspector.UISourceCodeFrame.prototype |
| 1121 } | 1121 } |
| OLD | NEW |