Title: [112541] trunk/Source/WebCore
- Revision
- 112541
- Author
- [email protected]
- Date
- 2012-03-29 09:45:55 -0700 (Thu, 29 Mar 2012)
Log Message
Web Inspector: SnippetsScriptMapping should process existing snippets on load.
https://bugs.webkit.org/show_bug.cgi?id=82619
Reviewed by Pavel Feldman.
SnippetsScriptMapping now loads existing snippets on creation.
Otherwise scripts panel shows snippets created during current session only.
Drive-by ScriptsNavigator closure compilation fix.
* inspector/front-end/SnippetsModel.js:
(WebInspector.SnippetsModel.prototype.set get snippets):
(WebInspector.SnippetsScriptMapping):
(WebInspector.SnippetsScriptMapping.prototype._handleSnippetAdded):
(WebInspector.SnippetsScriptMapping.prototype._snippetAdded):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (112540 => 112541)
--- trunk/Source/WebCore/ChangeLog 2012-03-29 16:25:24 UTC (rev 112540)
+++ trunk/Source/WebCore/ChangeLog 2012-03-29 16:45:55 UTC (rev 112541)
@@ -1,3 +1,20 @@
+2012-03-29 Vsevolod Vlasov <[email protected]>
+
+ Web Inspector: SnippetsScriptMapping should process existing snippets on load.
+ https://bugs.webkit.org/show_bug.cgi?id=82619
+
+ Reviewed by Pavel Feldman.
+
+ SnippetsScriptMapping now loads existing snippets on creation.
+ Otherwise scripts panel shows snippets created during current session only.
+ Drive-by ScriptsNavigator closure compilation fix.
+
+ * inspector/front-end/SnippetsModel.js:
+ (WebInspector.SnippetsModel.prototype.set get snippets):
+ (WebInspector.SnippetsScriptMapping):
+ (WebInspector.SnippetsScriptMapping.prototype._handleSnippetAdded):
+ (WebInspector.SnippetsScriptMapping.prototype._snippetAdded):
+
2012-03-29 Yury Semikhatsky <[email protected]>
Web Inspector: check more likely condition first in HeapSnapshot._buildAggregates
Modified: trunk/Source/WebCore/inspector/front-end/ScriptsNavigator.js (112540 => 112541)
--- trunk/Source/WebCore/inspector/front-end/ScriptsNavigator.js 2012-03-29 16:25:24 UTC (rev 112540)
+++ trunk/Source/WebCore/inspector/front-end/ScriptsNavigator.js 2012-03-29 16:45:55 UTC (rev 112541)
@@ -356,6 +356,7 @@
/**
* @param {WebInspector.UISourceCode} uiSourceCode
+ * @param {function()=} callback
*/
rename: function(uiSourceCode, callback)
{
@@ -383,7 +384,8 @@
function afterEditing()
{
WebInspector.markBeingEdited(scriptTreeElement.treeOutline.element, false);
- callback();
+ if (callback)
+ callback();
}
var editingConfig = new WebInspector.EditingConfig(commitHandler.bind(this), cancelHandler.bind(this));
Modified: trunk/Source/WebCore/inspector/front-end/SnippetsModel.js (112540 => 112541)
--- trunk/Source/WebCore/inspector/front-end/SnippetsModel.js 2012-03-29 16:25:24 UTC (rev 112540)
+++ trunk/Source/WebCore/inspector/front-end/SnippetsModel.js 2012-03-29 16:45:55 UTC (rev 112541)
@@ -59,6 +59,17 @@
this._snippetsSetting.set(savedSnippets);
},
+ /**
+ * @type {Array.<WebInspector.Snippet>}
+ */
+ get snippets()
+ {
+ var result = [];
+ for (var id in this._snippets)
+ result.push(this._snippets[id]);
+ return result;
+ },
+
_loadSettings: function()
{
var savedSnippets = this._snippetsSetting.get();
@@ -277,9 +288,11 @@
this._scriptForUISourceCode = new Map();
this._uiSourceCodeForSnippet = new Map();
- WebInspector.snippetsModel.addEventListener(WebInspector.SnippetsModel.EventTypes.SnippetAdded, this._snippetAdded.bind(this));
+ WebInspector.snippetsModel.addEventListener(WebInspector.SnippetsModel.EventTypes.SnippetAdded, this._handleSnippetAdded.bind(this));
WebInspector.snippetsModel.addEventListener(WebInspector.SnippetsModel.EventTypes.SnippetWillBeEvaluated, this._snippetWillBeEvaluated.bind(this));
WebInspector.snippetsModel.addEventListener(WebInspector.SnippetsModel.EventTypes.SnippetRemoved, this._snippetRemoved.bind(this));
+ for (var i = 0; i < WebInspector.snippetsModel.snippets.length; ++i)
+ this._snippetAdded(WebInspector.snippetsModel.snippets[i]);
}
WebInspector.SnippetsScriptMapping.prototype = {
@@ -368,9 +381,17 @@
/**
* @param {WebInspector.Event} event
*/
- _snippetAdded: function(event)
+ _handleSnippetAdded: function(event)
{
var snippet = /** @type {WebInspector.Snippet} */ event.data;
+ this._snippetAdded(snippet);
+ },
+
+ /**
+ * @param {WebInspector.Snippet} snippet
+ */
+ _snippetAdded: function(snippet)
+ {
var uiSourceCodeId = ""; // FIXME: to be implemented.
var uiSourceCodeURL = ""; // FIXME: to be implemented.
var uiSourceCode = new WebInspector.UISourceCodeImpl(uiSourceCodeId, uiSourceCodeURL, new WebInspector.SnippetContentProvider(snippet));
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
