Changeset 117065 in webkit
- Timestamp:
- May 15, 2012 7:37:01 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 6 added
- 3 deleted
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r117063 r117065 1 2012-05-15 Vsevolod Vlasov <vsevik@chromium.org> 2 3 Web Inspector: Refactor SnippetsModel: extract SnippetStorage, make SnippetScriptMapping delegate calls to ScriptSnippetModel and provide public interface on ScriptSnippetModel in terms of uiSourceCodes 4 https://bugs.webkit.org/show_bug.cgi?id=86477 5 6 Reviewed by Pavel Feldman. 7 8 * inspector/debugger/script-snippet-model-expected.txt: Added. 9 * inspector/debugger/script-snippet-model.html: Added. 10 * inspector/debugger/snippets-model-expected.txt: Removed. 11 * inspector/debugger/snippets-model.html: Removed. 12 * inspector/snippet-storage-expected.txt: Added. 13 * inspector/snippet-storage.html: Added. 14 1 15 2012-05-15 Csaba Osztrogonác <ossy@webkit.org> 2 16 -
trunk/Source/WebCore/ChangeLog
r117064 r117065 1 2012-05-15 Vsevolod Vlasov <vsevik@chromium.org> 2 3 Web Inspector: Refactor SnippetsModel: extract SnippetStorage, make SnippetScriptMapping delegate calls to ScriptSnippetModel and provide public interface on ScriptSnippetModel in terms of uiSourceCodes 4 https://bugs.webkit.org/show_bug.cgi?id=86477 5 6 Reviewed by Pavel Feldman. 7 8 Extracted SnippetStorage to be reused for other snippet types. 9 Made SnippetScriptMapping delegate all calls to ScriptSnippetModel and injected it in DebuggerPresentationModel. 10 ScriptSnippetModel now provides public interface for ScriptsPanel in terms of uiSourceCodes. 11 12 Tests: inspector/debugger/script-snippet-model.html 13 inspector/snippet-storage.html 14 15 * WebCore.gypi: 16 * WebCore.vcproj/WebCore.vcproj: 17 * inspector/compile-front-end.py: 18 * inspector/front-end/DebuggerPresentationModel.js: 19 (WebInspector.DebuggerPresentationModel): 20 * inspector/front-end/ScriptSnippetModel.js: Added. 21 (WebInspector.ScriptSnippetModel): 22 (WebInspector.ScriptSnippetModel.prototype.get scriptMapping): 23 (WebInspector.ScriptSnippetModel.prototype.createScriptSnippet): 24 (WebInspector.ScriptSnippetModel.prototype._addScriptSnippet): 25 (WebInspector.ScriptSnippetModel.prototype._rawLocationToUILocation): 26 (WebInspector.ScriptSnippetModel.prototype._uiLocationToRawLocation.get if): 27 (WebInspector.ScriptSnippetModel.prototype._uiLocationToRawLocation): 28 (WebInspector.ScriptSnippetModel.prototype._uiSourceCodeList): 29 (WebInspector.ScriptSnippetModel.prototype._releasedUISourceCodes): 30 (WebInspector.ScriptSnippetModel.prototype._createUISourceCodeForScript): 31 (WebInspector.ScriptSnippetModel.prototype._sourceURLForSnippet): 32 (WebInspector.ScriptSnippetModel.prototype._snippetIdForSourceURL): 33 (WebInspector.ScriptSnippetModel.prototype._snippetForSourceURL): 34 (WebInspector.ScriptSnippetModel.prototype._reset): 35 (WebInspector.SnippetScriptMapping): 36 (WebInspector.SnippetScriptMapping.prototype.rawLocationToUILocation): 37 (WebInspector.SnippetScriptMapping.prototype.uiLocationToRawLocation): 38 (WebInspector.SnippetScriptMapping.prototype.uiSourceCodeList): 39 (WebInspector.SnippetScriptMapping.prototype.snippetIdForSourceURL): 40 (WebInspector.SnippetScriptMapping.prototype.addScript): 41 (WebInspector.SnippetScriptMapping.prototype._uiSourceCodesAdded): 42 (WebInspector.SnippetScriptMapping.prototype._uiSourceCodesRemoved): 43 (WebInspector.SnippetScriptMapping.prototype.reset): 44 (WebInspector.SnippetContentProvider): 45 * inspector/front-end/SnippetStorage.js: Added. 46 (WebInspector.SnippetStorage): 47 (WebInspector.SnippetStorage.prototype.get namePrefix): 48 (WebInspector.SnippetStorage.prototype._saveSettings): 49 (WebInspector.SnippetStorage.prototype.set snippets): 50 (WebInspector.SnippetStorage.prototype.snippetForId): 51 (WebInspector.SnippetStorage.prototype.deleteSnippet): 52 (WebInspector.SnippetStorage.prototype._snippetAdded): 53 (WebInspector.SnippetStorage.prototype.reset.set this): 54 (WebInspector.Snippet): 55 (WebInspector.Snippet.fromObject): 56 (WebInspector.Snippet.prototype.get id): 57 (WebInspector.Snippet.prototype.get name): 58 (WebInspector.Snippet.prototype.set name): 59 (WebInspector.Snippet.prototype.get content): 60 (WebInspector.Snippet.prototype.set content): 61 (WebInspector.Snippet.prototype.serializeToObject): 62 * inspector/front-end/SnippetsModel.js: Removed. 63 * inspector/front-end/WebKit.qrc: 64 * inspector/front-end/inspector.html: 65 * inspector/front-end/inspector.js: 66 1 67 2012-05-15 Pavel Feldman <pfeldman@chromium.org> 2 68 -
trunk/Source/WebCore/WebCore.gypi
r117055 r117065 6465 6465 'inspector/front-end/ScriptFormatterWorker.js', 6466 6466 'inspector/front-end/ScriptMapping.js', 6467 'inspector/front-end/ScriptSnippetModel.js', 6467 6468 'inspector/front-end/ScriptsNavigator.js', 6468 6469 'inspector/front-end/ScriptsPanel.js', … … 6477 6478 'inspector/front-end/SidebarPane.js', 6478 6479 'inspector/front-end/SidebarTreeElement.js', 6479 'inspector/front-end/Snippet sModel.js',6480 'inspector/front-end/SnippetStorage.js', 6480 6481 'inspector/front-end/SoftContextMenu.js', 6481 6482 'inspector/front-end/SourceCSSTokenizer.js', -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r117029 r117065 74706 74706 </File> 74707 74707 <File 74708 RelativePath="..\inspector\front-end\ScriptSnippetModel.js" 74709 > 74710 </File> 74711 <File 74708 74712 RelativePath="..\inspector\front-end\scriptsPanel.css" 74709 74713 > … … 74754 74758 </File> 74755 74759 <File 74756 RelativePath="..\inspector\front-end\Snippet sModel.js"74760 RelativePath="..\inspector\front-end\SnippetStorage.js" 74757 74761 > 74758 74762 </File> -
trunk/Source/WebCore/inspector/compile-front-end.py
r116843 r117065 85 85 "ScriptFormatter.js", 86 86 "ScriptMapping.js", 87 "SnippetsModel.js", 87 "ScriptSnippetModel.js", 88 "SnippetStorage.js", 88 89 "TimelineManager.js", 89 90 "TimelineModel.js", -
trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js
r116843 r117065 41 41 this._compilerMapping = new WebInspector.CompilerScriptMapping(); 42 42 this._mappings.push(this._compilerMapping); 43 this._snippet sMapping = new WebInspector.SnippetsScriptMapping();44 this._mappings.push(this._snippet sMapping);43 this._snippetMapping = WebInspector.scriptSnippetModel.scriptMapping; 44 this._mappings.push(this._snippetMapping); 45 45 46 46 for (var i = 0; i < this._mappings.length; ++i) … … 110 110 { 111 111 if (WebInspector.experimentsSettings.snippetsSupport.isEnabled()) { 112 if ( WebInspector.snippetsModel.snippetIdForSourceURL(script.sourceURL))113 return this._snippet sMapping;112 if (this._snippetMapping && this._snippetMapping.snippetIdForSourceURL(script.sourceURL)) 113 return this._snippetMapping; 114 114 } 115 115 -
trunk/Source/WebCore/inspector/front-end/WebKit.qrc
r117055 r117065 133 133 <file>ScriptFormatterWorker.js</file> 134 134 <file>ScriptMapping.js</file> 135 <file>ScriptSnippetModel.js</file> 135 136 <file>ScriptsPanel.js</file> 136 137 <file>ScriptsNavigator.js</file> … … 145 146 <file>SidebarPane.js</file> 146 147 <file>SidebarTreeElement.js</file> 147 <file>Snippet sModel.js</file>148 <file>SnippetStorage.js</file> 148 149 <file>SoftContextMenu.js</file> 149 150 <file>SourceCSSTokenizer.js</file> -
trunk/Source/WebCore/inspector/front-end/inspector.html
r116854 r117065 212 212 <script type="text/javascript" src="HandlerRegistry.js"></script> 213 213 <script type="text/javascript" src="MemoryStatistics.js"></script> 214 <script type="text/javascript" src="SnippetsModel.js"></script> 214 <script type="text/javascript" src="SnippetStorage.js"></script> 215 <script type="text/javascript" src="ScriptSnippetModel.js"></script> 215 216 <script type="text/javascript" src="StylesPanel.js"></script> 216 217 </head> -
trunk/Source/WebCore/inspector/front-end/inspector.js
r116957 r117065 381 381 382 382 this.debuggerModel = new WebInspector.DebuggerModel(); 383 this.s nippetsModel = new WebInspector.SnippetsModel();383 this.scriptSnippetModel = new WebInspector.ScriptSnippetModel(); 384 384 this.breakpointManager = new WebInspector.BreakpointManager(WebInspector.settings.breakpoints, this.debuggerModel); 385 385 this.debuggerPresentationModel = new WebInspector.DebuggerPresentationModel();
Note: See TracChangeset
for help on using the changeset viewer.