Title: [131886] trunk/Source/WebCore
- Revision
- 131886
- Author
- [email protected]
- Date
- 2012-10-19 03:58:35 -0700 (Fri, 19 Oct 2012)
Log Message
Web Inspector: Get rid of isSnippetEvaluation flag on UISourceCode
https://bugs.webkit.org/show_bug.cgi?id=99823
Reviewed by Yury Semikhatsky.
Replaced isSnippetEvaluation flag with a pair of isSnippet and isTemporary set.
* inspector/front-end/ResourceScriptMapping.js:
(WebInspector.ResourceScriptMapping.prototype._getOrCreateTemporaryUISourceCode):
* inspector/front-end/ScriptSnippetModel.js:
(WebInspector.ScriptSnippetModel.prototype._releasedUISourceCodes):
(WebInspector.ScriptSnippetModel.prototype._createUISourceCodeForScript):
* inspector/front-end/ScriptsNavigator.js:
(WebInspector.ScriptsNavigator.prototype._snippetsNavigatorViewForUISourceCode):
(WebInspector.ScriptsNavigator.prototype.revealUISourceCode):
* inspector/front-end/ScriptsPanel.js:
(WebInspector.ScriptsPanel.prototype._createSourceFrame):
* inspector/front-end/Workspace.js:
(WebInspector.Project.prototype.addTemporaryUISourceCode):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (131885 => 131886)
--- trunk/Source/WebCore/ChangeLog 2012-10-19 10:57:07 UTC (rev 131885)
+++ trunk/Source/WebCore/ChangeLog 2012-10-19 10:58:35 UTC (rev 131886)
@@ -1,3 +1,25 @@
+2012-10-19 Vsevolod Vlasov <[email protected]>
+
+ Web Inspector: Get rid of isSnippetEvaluation flag on UISourceCode
+ https://bugs.webkit.org/show_bug.cgi?id=99823
+
+ Reviewed by Yury Semikhatsky.
+
+ Replaced isSnippetEvaluation flag with a pair of isSnippet and isTemporary set.
+
+ * inspector/front-end/ResourceScriptMapping.js:
+ (WebInspector.ResourceScriptMapping.prototype._getOrCreateTemporaryUISourceCode):
+ * inspector/front-end/ScriptSnippetModel.js:
+ (WebInspector.ScriptSnippetModel.prototype._releasedUISourceCodes):
+ (WebInspector.ScriptSnippetModel.prototype._createUISourceCodeForScript):
+ * inspector/front-end/ScriptsNavigator.js:
+ (WebInspector.ScriptsNavigator.prototype._snippetsNavigatorViewForUISourceCode):
+ (WebInspector.ScriptsNavigator.prototype.revealUISourceCode):
+ * inspector/front-end/ScriptsPanel.js:
+ (WebInspector.ScriptsPanel.prototype._createSourceFrame):
+ * inspector/front-end/Workspace.js:
+ (WebInspector.Project.prototype.addTemporaryUISourceCode):
+
2012-10-19 Alexander Pavlov <[email protected]>
Web Inspector: Invalid Regex in SASSSourceMapping/didRequestContent, breaks Support for Sass experiment
Modified: trunk/Source/WebCore/inspector/front-end/ResourceScriptMapping.js (131885 => 131886)
--- trunk/Source/WebCore/inspector/front-end/ResourceScriptMapping.js 2012-10-19 10:57:07 UTC (rev 131885)
+++ trunk/Source/WebCore/inspector/front-end/ResourceScriptMapping.js 2012-10-19 10:58:35 UTC (rev 131886)
@@ -209,7 +209,6 @@
var isDynamicScript = this._isDynamicScript(script);
var url = "" ? "" : script.sourceURL;
temporaryUISourceCode = new WebInspector.UISourceCode(url, contentProvider, false);
- temporaryUISourceCode.isTemporary = true;
for (var i = 0; i < scripts.length; ++i)
this._temporaryUISourceCodeForScriptId[scripts[i].scriptId] = temporaryUISourceCode;
this._bindUISourceCodeToScripts(temporaryUISourceCode, scripts);
Modified: trunk/Source/WebCore/inspector/front-end/ScriptSnippetModel.js (131885 => 131886)
--- trunk/Source/WebCore/inspector/front-end/ScriptSnippetModel.js 2012-10-19 10:57:07 UTC (rev 131885)
+++ trunk/Source/WebCore/inspector/front-end/ScriptSnippetModel.js 2012-10-19 10:58:35 UTC (rev 131886)
@@ -289,7 +289,7 @@
var result = [];
for (var scriptId in this._uiSourceCodeForScriptId) {
var uiSourceCode = this._uiSourceCodeForScriptId[scriptId];
- if (!uiSourceCode.isSnippet)
+ if (uiSourceCode.isTemporary)
result.push(uiSourceCode);
}
return result;
@@ -322,10 +322,9 @@
_createUISourceCodeForScript: function(script)
{
var uiSourceCode = new WebInspector.UISourceCode(script.sourceURL, script, false);
+ uiSourceCode.isSnippet = true;
+ this._workspace.project().addTemporaryUISourceCode(uiSourceCode);
uiSourceCode.setSourceMapping(this._snippetScriptMapping);
- // FIXME: Should be added to workspace as temporary.
- uiSourceCode.isTemporary = true;
- uiSourceCode.isSnippetEvaluation = true;
this._uiSourceCodeForScriptId[script.scriptId] = uiSourceCode;
this._scriptForUISourceCode.put(uiSourceCode, script);
script.setSourceMapping(this._snippetScriptMapping);
Modified: trunk/Source/WebCore/inspector/front-end/ScriptsNavigator.js (131885 => 131886)
--- trunk/Source/WebCore/inspector/front-end/ScriptsNavigator.js 2012-10-19 10:57:07 UTC (rev 131885)
+++ trunk/Source/WebCore/inspector/front-end/ScriptsNavigator.js 2012-10-19 10:58:35 UTC (rev 131886)
@@ -84,7 +84,7 @@
{
if (uiSourceCode.isContentScript)
return this._contentScriptsView;
- else if (uiSourceCode.isSnippet || uiSourceCode.isSnippetEvaluation)
+ else if (uiSourceCode.isSnippet)
return this._snippetsView;
else
return this._scriptsView;
@@ -123,7 +123,7 @@
this._snippetsNavigatorViewForUISourceCode(uiSourceCode).revealUISourceCode(uiSourceCode);
if (uiSourceCode.isContentScript)
this._tabbedPane.selectTab(WebInspector.ScriptsNavigator.ContentScriptsTab);
- else if (uiSourceCode.isSnippet || uiSourceCode.isSnippetEvaluation)
+ else if (uiSourceCode.isSnippet)
this._tabbedPane.selectTab(WebInspector.ScriptsNavigator.SnippetsTab);
else
this._tabbedPane.selectTab(WebInspector.ScriptsNavigator.ScriptsTab);
Modified: trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js (131885 => 131886)
--- trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js 2012-10-19 10:57:07 UTC (rev 131885)
+++ trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js 2012-10-19 10:58:35 UTC (rev 131886)
@@ -442,7 +442,7 @@
var sourceFrame;
switch (uiSourceCode.contentType()) {
case WebInspector.resourceTypes.Script:
- if (uiSourceCode.isSnippet)
+ if (uiSourceCode.isSnippet && !uiSourceCode.isTemporary)
sourceFrame = new WebInspector.SnippetJavaScriptSourceFrame(this, uiSourceCode);
else
sourceFrame = new WebInspector._javascript_SourceFrame(this, uiSourceCode);
Modified: trunk/Source/WebCore/inspector/front-end/Workspace.js (131885 => 131886)
--- trunk/Source/WebCore/inspector/front-end/Workspace.js 2012-10-19 10:57:07 UTC (rev 131885)
+++ trunk/Source/WebCore/inspector/front-end/Workspace.js 2012-10-19 10:58:35 UTC (rev 131886)
@@ -89,6 +89,7 @@
*/
addTemporaryUISourceCode: function(uiSourceCode)
{
+ uiSourceCode.isTemporary = true;
this._workspace.dispatchEventToListeners(WebInspector.UISourceCodeProvider.Events.TemporaryUISourceCodeAdded, uiSourceCode);
},
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
