Title: [133746] trunk/Source/WebCore
- Revision
- 133746
- Author
- vse...@chromium.org
- Date
- 2012-11-07 05:51:00 -0800 (Wed, 07 Nov 2012)
Log Message
Web Inspector: [Regression] Snippets evaluations should not appear in Sources tab of navigator.
https://bugs.webkit.org/show_bug.cgi?id=101354
Reviewed by Pavel Feldman.
* inspector/front-end/DebuggerScriptMapping.js:
* inspector/front-end/NetworkUISourceCodeProvider.js:
(WebInspector.NetworkUISourceCodeProvider.prototype._parsedScriptSource):
* inspector/front-end/Script.js:
(WebInspector.Script.prototype.isSnippet):
* inspector/front-end/ScriptSnippetModel.js:
(WebInspector.ScriptSnippetModel.prototype._snippetIdForSourceURL):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (133745 => 133746)
--- trunk/Source/WebCore/ChangeLog 2012-11-07 13:50:22 UTC (rev 133745)
+++ trunk/Source/WebCore/ChangeLog 2012-11-07 13:51:00 UTC (rev 133746)
@@ -1,3 +1,18 @@
+2012-11-07 Vsevolod Vlasov <vse...@chromium.org>
+
+ Web Inspector: [Regression] Snippets evaluations should not appear in Sources tab of navigator.
+ https://bugs.webkit.org/show_bug.cgi?id=101354
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/front-end/DebuggerScriptMapping.js:
+ * inspector/front-end/NetworkUISourceCodeProvider.js:
+ (WebInspector.NetworkUISourceCodeProvider.prototype._parsedScriptSource):
+ * inspector/front-end/Script.js:
+ (WebInspector.Script.prototype.isSnippet):
+ * inspector/front-end/ScriptSnippetModel.js:
+ (WebInspector.ScriptSnippetModel.prototype._snippetIdForSourceURL):
+
2012-11-07 Dan Carney <dcar...@google.com>
[V8] Cleanup V8DOMWrapper::getCachedWrapper
Modified: trunk/Source/WebCore/inspector/front-end/DebuggerScriptMapping.js (133745 => 133746)
--- trunk/Source/WebCore/inspector/front-end/DebuggerScriptMapping.js 2012-11-07 13:50:22 UTC (rev 133745)
+++ trunk/Source/WebCore/inspector/front-end/DebuggerScriptMapping.js 2012-11-07 13:51:00 UTC (rev 133746)
@@ -65,10 +65,8 @@
*/
_mappingForScript: function(script)
{
- if (WebInspector.experimentsSettings.snippetsSupport.isEnabled()) {
- if (this._snippetMapping && this._snippetMapping.snippetIdForSourceURL(script.sourceURL))
- return this._snippetMapping;
- }
+ if (WebInspector.experimentsSettings.snippetsSupport.isEnabled() && script.isSnippet())
+ return this._snippetMapping;
if (WebInspector.settings.sourceMapsEnabled.get() && script.sourceMapURL) {
if (this._compilerMapping.loadSourceMapForScript(script))
Modified: trunk/Source/WebCore/inspector/front-end/NetworkUISourceCodeProvider.js (133745 => 133746)
--- trunk/Source/WebCore/inspector/front-end/NetworkUISourceCodeProvider.js 2012-11-07 13:50:22 UTC (rev 133745)
+++ trunk/Source/WebCore/inspector/front-end/NetworkUISourceCodeProvider.js 2012-11-07 13:51:00 UTC (rev 133746)
@@ -70,6 +70,8 @@
var script = /** @type {WebInspector.Script} */ (event.data);
if (!script.sourceURL || script.isInlineScript())
return;
+ if (WebInspector.experimentsSettings.snippetsSupport.isEnabled() && script.isSnippet())
+ return;
var isDynamicAnonymousScript;
// Only add uiSourceCodes for
// - content scripts;
Modified: trunk/Source/WebCore/inspector/front-end/Script.js (133745 => 133746)
--- trunk/Source/WebCore/inspector/front-end/Script.js 2012-11-07 13:50:22 UTC (rev 133745)
+++ trunk/Source/WebCore/inspector/front-end/Script.js 2012-11-07 13:51:00 UTC (rev 133746)
@@ -50,6 +50,8 @@
this._locations = [];
}
+WebInspector.Script.snippetSourceURLPrefix = "snippets:///";
+
WebInspector.Script.prototype = {
/**
* @return {string}
@@ -170,6 +172,14 @@
},
/**
+ * @return {boolean}
+ */
+ isSnippet: function()
+ {
+ return this.sourceURL && this.sourceURL.startsWith(WebInspector.Script.snippetSourceURLPrefix);
+ },
+
+ /**
* @param {number} lineNumber
* @param {number=} columnNumber
* @return {WebInspector.UILocation}
Modified: trunk/Source/WebCore/inspector/front-end/ScriptSnippetModel.js (133745 => 133746)
--- trunk/Source/WebCore/inspector/front-end/ScriptSnippetModel.js 2012-11-07 13:50:22 UTC (rev 133745)
+++ trunk/Source/WebCore/inspector/front-end/ScriptSnippetModel.js 2012-11-07 13:51:00 UTC (rev 133746)
@@ -51,8 +51,6 @@
this._loadSnippets();
}
-WebInspector.ScriptSnippetModel.snippetSourceURLPrefix = "snippets:///";
-
WebInspector.ScriptSnippetModel.prototype = {
/**
* @return {WebInspector.SnippetScriptMapping}
@@ -302,6 +300,8 @@
_addScript: function(script)
{
var snippetId = this._snippetIdForSourceURL(script.sourceURL);
+ if (!snippetId)
+ return;
var uiSourceCode = this._uiSourceCodeForSnippetId[snippetId];
if (!uiSourceCode || this._evaluationSourceURL(uiSourceCode) !== script.sourceURL) {
@@ -381,10 +381,9 @@
*/
_evaluationSourceURL: function(uiSourceCode)
{
- var snippetPrefix = WebInspector.ScriptSnippetModel.snippetSourceURLPrefix;
var evaluationSuffix = "_" + uiSourceCode._evaluationIndex;
var snippetId = this._snippetIdForUISourceCode.get(uiSourceCode);
- return snippetPrefix + snippetId + evaluationSuffix;
+ return WebInspector.Script.snippetSourceURLPrefix + snippetId + evaluationSuffix;
},
/**
@@ -393,7 +392,7 @@
*/
_snippetIdForSourceURL: function(sourceURL)
{
- var snippetPrefix = WebInspector.ScriptSnippetModel.snippetSourceURLPrefix;
+ var snippetPrefix = WebInspector.Script.snippetSourceURLPrefix;
if (!sourceURL.startsWith(snippetPrefix))
return null;
var splittedURL = sourceURL.substring(snippetPrefix.length).split("_");
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
