Diff
Modified: trunk/LayoutTests/ChangeLog (117570 => 117571)
--- trunk/LayoutTests/ChangeLog 2012-05-18 09:49:01 UTC (rev 117570)
+++ trunk/LayoutTests/ChangeLog 2012-05-18 10:10:52 UTC (rev 117571)
@@ -1,3 +1,15 @@
+2012-05-18 Pavel Feldman <[email protected]>
+
+ Web Inspector: add ContentProvider::contentType and use it when rendering navigator tree.
+ https://bugs.webkit.org/show_bug.cgi?id=86833
+
+ Reviewed by Vsevolod Vlasov.
+
+ * http/tests/inspector/search/search-in-static.html:
+ * inspector/debugger/scripts-file-selector.html:
+ * inspector/debugger/scripts-panel.html:
+ * inspector/debugger/scripts-sorting.html:
+
2012-05-18 Ryosuke Niwa <[email protected]>
Unreviewed, rolling out r117559.
Modified: trunk/LayoutTests/http/tests/inspector/search/search-in-static.html (117570 => 117571)
--- trunk/LayoutTests/http/tests/inspector/search/search-in-static.html 2012-05-18 09:49:01 UTC (rev 117570)
+++ trunk/LayoutTests/http/tests/inspector/search/search-in-static.html 2012-05-18 10:10:52 UTC (rev 117571)
@@ -18,7 +18,7 @@
function step3()
{
- staticContentProvider = new WebInspector.StaticContentProvider("text/plain", resource.content);
+ staticContentProvider = new WebInspector.StaticContentProvider(WebInspector.resourceTypes.Script, resource.content);
InspectorTest.addResult(resource.url);
var text = "searchTestUniqueString";
Modified: trunk/LayoutTests/inspector/debugger/scripts-file-selector.html (117570 => 117571)
--- trunk/LayoutTests/inspector/debugger/scripts-file-selector.html 2012-05-18 09:49:01 UTC (rev 117570)
+++ trunk/LayoutTests/inspector/debugger/scripts-file-selector.html 2012-05-18 10:10:52 UTC (rev 117571)
@@ -11,9 +11,16 @@
var navigatorFileSelector = new WebInspector.ScriptsNavigator();
+ var contentProvider = {
+ contentType: function()
+ {
+ return WebInspector.resourceTypes.Script;
+ }
+ }
+
function addUISourceCode(url, isContentScript)
{
- var uiSourceCode = new WebInspector.UISourceCode(url, null, null);
+ var uiSourceCode = new WebInspector.UISourceCode(url, contentProvider, null);
uiSourceCode.isContentScript = isContentScript;
navigatorFileSelector.addUISourceCode(uiSourceCode);
}
Modified: trunk/LayoutTests/inspector/debugger/scripts-panel.html (117570 => 117571)
--- trunk/LayoutTests/inspector/debugger/scripts-panel.html 2012-05-18 09:49:01 UTC (rev 117570)
+++ trunk/LayoutTests/inspector/debugger/scripts-panel.html 2012-05-18 10:10:52 UTC (rev 117571)
@@ -18,6 +18,13 @@
set: function(breakpoints) { persistentBreakpoints = breakpoints; }
};
+ var contentProvider = {
+ contentType: function()
+ {
+ return WebInspector.resourceTypes.Script;
+ }
+ }
+
function createUISourceCodeProviderMock()
{
var provider = new WebInspector.Object();
@@ -44,7 +51,7 @@
}
function createUISouceCode(url)
{
- var uiSourceCode = new WebInspector._javascript_Source(url, null, null, false);
+ var uiSourceCode = new WebInspector._javascript_Source(url, contentProvider, null, false);
uiSourceCode.requestContent = function(callback)
{
InspectorTest.addResult("Source requested for " + url);
Modified: trunk/LayoutTests/inspector/debugger/scripts-sorting.html (117570 => 117571)
--- trunk/LayoutTests/inspector/debugger/scripts-sorting.html 2012-05-18 09:49:01 UTC (rev 117570)
+++ trunk/LayoutTests/inspector/debugger/scripts-sorting.html 2012-05-18 10:10:52 UTC (rev 117571)
@@ -11,9 +11,16 @@
var navigatorFileSelector = new WebInspector.ScriptsNavigator();
+ var contentProvider = {
+ contentType: function()
+ {
+ return WebInspector.resourceTypes.Script;
+ }
+ }
+
function addUISourceCode(url, isContentScript)
{
- var uiSourceCode = new WebInspector.UISourceCode(url, null, null);
+ var uiSourceCode = new WebInspector.UISourceCode(url, contentProvider, null);
uiSourceCode.isContentScript = isContentScript;
navigatorFileSelector.addUISourceCode(uiSourceCode);
}
Modified: trunk/Source/WebCore/ChangeLog (117570 => 117571)
--- trunk/Source/WebCore/ChangeLog 2012-05-18 09:49:01 UTC (rev 117570)
+++ trunk/Source/WebCore/ChangeLog 2012-05-18 10:10:52 UTC (rev 117571)
@@ -1,3 +1,46 @@
+2012-05-18 Pavel Feldman <[email protected]>
+
+ Web Inspector: add ContentProvider::contentType and use it when rendering navigator tree.
+ https://bugs.webkit.org/show_bug.cgi?id=86833
+
+ Reviewed by Vsevolod Vlasov.
+
+ Added ContentProvider::contentType, regactored NavigatorView to use the icon defined by the content type.
+
+ * inspector/front-end/CompilerScriptMapping.js:
+ * inspector/front-end/ContentProvider.js:
+ (WebInspector.ContentProvider.prototype.contentType):
+ * inspector/front-end/ContentProviders.js:
+ (WebInspector.ConcatenatedScriptsContentProvider.prototype.contentType):
+ (WebInspector.CompilerSourceMappingContentProvider):
+ (WebInspector.CompilerSourceMappingContentProvider.prototype.contentType):
+ (WebInspector.CompilerSourceMappingContentProvider.prototype.requestContent):
+ (WebInspector.StaticContentProvider):
+ (WebInspector.StaticContentProvider.prototype.contentType):
+ (WebInspector.StaticContentProvider.prototype.requestContent):
+ * inspector/front-end/NavigatorView.js:
+ (WebInspector.NavigatorTreeOutline.prototype.scriptTreeElements):
+ (WebInspector.NavigatorSourceTreeElement):
+ * inspector/front-end/NetworkRequest.js:
+ (WebInspector.NetworkRequest.prototype.contentType):
+ * inspector/front-end/Resource.js:
+ (WebInspector.Resource.prototype.contentType):
+ (WebInspector.Resource.prototype.canonicalMimeType):
+ (WebInspector.ResourceRevision.prototype.contentType):
+ * inspector/front-end/ResourceType.js:
+ (WebInspector.ResourceType.prototype.toString):
+ (WebInspector.ResourceType.prototype.canonicalMimeType):
+ * inspector/front-end/Script.js:
+ (WebInspector.Script.prototype.contentType):
+ * inspector/front-end/ScriptSnippetModel.js:
+ (WebInspector.SnippetContentProvider):
+ * inspector/front-end/StylesPanel.js:
+ * inspector/front-end/UISourceCode.js:
+ (WebInspector.UISourceCode.prototype.contentType):
+ * inspector/front-end/navigatorView.css:
+ (.navigator-stylesheet-tree-item .icon):
+ (.navigator-document-tree-item .icon):
+
2012-05-18 Sheriff Bot <[email protected]>
Unreviewed, rolling out r117556.
Modified: trunk/Source/WebCore/inspector/front-end/CompilerScriptMapping.js (117570 => 117571)
--- trunk/Source/WebCore/inspector/front-end/CompilerScriptMapping.js 2012-05-18 09:49:01 UTC (rev 117570)
+++ trunk/Source/WebCore/inspector/front-end/CompilerScriptMapping.js 2012-05-18 10:10:52 UTC (rev 117571)
@@ -115,7 +115,7 @@
var sourceContent = sourceMap.sourceContent(sourceURL);
var contentProvider;
if (sourceContent)
- contentProvider = new WebInspector.StaticContentProvider("text/_javascript_", sourceContent);
+ contentProvider = new WebInspector.StaticContentProvider(WebInspector.resourceTypes.Script, sourceContent);
else
contentProvider = new WebInspector.CompilerSourceMappingContentProvider(sourceURL);
var uiSourceCode = new WebInspector._javascript_Source(sourceURL, contentProvider, this, false);
Modified: trunk/Source/WebCore/inspector/front-end/ContentProvider.js (117570 => 117571)
--- trunk/Source/WebCore/inspector/front-end/ContentProvider.js 2012-05-18 09:49:01 UTC (rev 117570)
+++ trunk/Source/WebCore/inspector/front-end/ContentProvider.js 2012-05-18 10:10:52 UTC (rev 117571)
@@ -40,6 +40,11 @@
contentURL: function() { },
/**
+ * @return {WebInspector.ResourceType}
+ */
+ contentType: function() { },
+
+ /**
* @param {function(?string,boolean,string)} callback
*/
requestContent: function(callback) { },
Modified: trunk/Source/WebCore/inspector/front-end/ContentProviders.js (117570 => 117571)
--- trunk/Source/WebCore/inspector/front-end/ContentProviders.js 2012-05-18 09:49:01 UTC (rev 117570)
+++ trunk/Source/WebCore/inspector/front-end/ContentProviders.js 2012-05-18 10:10:52 UTC (rev 117571)
@@ -81,6 +81,14 @@
},
/**
+ * @return {WebInspector.ResourceType}
+ */
+ contentType: function()
+ {
+ return WebInspector.resourceTypes.Document;
+ },
+
+ /**
* @param {function(?string,boolean,string)} callback
*/
requestContent: function(callback)
@@ -180,7 +188,6 @@
*/
WebInspector.CompilerSourceMappingContentProvider = function(sourceURL)
{
- this._mimeType = "text/_javascript_";
this._sourceURL = sourceURL;
}
@@ -194,6 +201,14 @@
},
/**
+ * @return {WebInspector.ResourceType}
+ */
+ contentType: function()
+ {
+ return WebInspector.resourceTypes.Script;
+ },
+
+ /**
* @param {function(?string,boolean,string)} callback
*/
requestContent: function(callback)
@@ -205,7 +220,7 @@
} catch(e) {
console.error(e.message);
}
- callback(sourceCode, false, this._mimeType);
+ callback(sourceCode, false, "text/_javascript_");
},
/**
@@ -225,11 +240,13 @@
/**
* @constructor
* @implements {WebInspector.ContentProvider}
+ * @param {WebInspector.ResourceType} contentType
+ * @param {string} content
*/
-WebInspector.StaticContentProvider = function(mimeType, content)
+WebInspector.StaticContentProvider = function(contentType, content)
{
- this._mimeType = mimeType;
this._content = content;
+ this._contentType = contentType;
}
WebInspector.StaticContentProvider.prototype = {
@@ -242,11 +259,19 @@
},
/**
+ * @return {WebInspector.ResourceType}
+ */
+ contentType: function()
+ {
+ return WebInspector.resourceTypes.Script;
+ },
+
+ /**
* @param {function(?string,boolean,string)} callback
*/
requestContent: function(callback)
{
- callback(this._content, false, this._mimeType);
+ callback(this._content, false, this._contentType.canonicalMimeType());
},
/**
Modified: trunk/Source/WebCore/inspector/front-end/NavigatorView.js (117570 => 117571)
--- trunk/Source/WebCore/inspector/front-end/NavigatorView.js 2012-05-18 09:49:01 UTC (rev 117570)
+++ trunk/Source/WebCore/inspector/front-end/NavigatorView.js 2012-05-18 10:10:52 UTC (rev 117571)
@@ -73,7 +73,7 @@
if (this._scriptTreeElementsByUISourceCode.get(uiSourceCode))
return;
- var scriptTreeElement = new WebInspector.NavigatorScriptTreeElement(this, uiSourceCode, "");
+ var scriptTreeElement = new WebInspector.NavigatorSourceTreeElement(this, uiSourceCode, "");
this._scriptTreeElementsByUISourceCode.put(uiSourceCode, scriptTreeElement);
this._updateScriptTitle(uiSourceCode);
this._addUISourceCodeListeners(uiSourceCode);
@@ -407,7 +407,7 @@
var result = [];
if (this.children.length) {
for (var treeElement = this.children[0]; treeElement; treeElement = treeElement.traverseNextTreeElement(false, this, true)) {
- if (treeElement instanceof WebInspector.NavigatorScriptTreeElement)
+ if (treeElement instanceof WebInspector.NavigatorSourceTreeElement)
result.push(treeElement.uiSourceCode);
}
}
@@ -561,15 +561,15 @@
* @param {WebInspector.UISourceCode} uiSourceCode
* @param {string} title
*/
-WebInspector.NavigatorScriptTreeElement = function(navigatorView, uiSourceCode, title)
+WebInspector.NavigatorSourceTreeElement = function(navigatorView, uiSourceCode, title)
{
- WebInspector.BaseNavigatorTreeElement.call(this, title, ["navigator-script-tree-item"], false);
+ WebInspector.BaseNavigatorTreeElement.call(this, title, ["navigator-" + uiSourceCode.contentType().name() + "-tree-item"], false);
this._navigatorView = navigatorView;
this._uiSourceCode = uiSourceCode;
this.tooltip = uiSourceCode.url;
}
-WebInspector.NavigatorScriptTreeElement.prototype = {
+WebInspector.NavigatorSourceTreeElement.prototype = {
/**
* @return {WebInspector.UISourceCode}
*/
@@ -619,4 +619,4 @@
}
}
-WebInspector.NavigatorScriptTreeElement.prototype.__proto__ = WebInspector.BaseNavigatorTreeElement.prototype;
+WebInspector.NavigatorSourceTreeElement.prototype.__proto__ = WebInspector.BaseNavigatorTreeElement.prototype;
Modified: trunk/Source/WebCore/inspector/front-end/NetworkRequest.js (117570 => 117571)
--- trunk/Source/WebCore/inspector/front-end/NetworkRequest.js 2012-05-18 09:49:01 UTC (rev 117570)
+++ trunk/Source/WebCore/inspector/front-end/NetworkRequest.js 2012-05-18 10:10:52 UTC (rev 117571)
@@ -684,6 +684,14 @@
},
/**
+ * @return {WebInspector.ResourceType}
+ */
+ contentType: function()
+ {
+ return this._type;
+ },
+
+ /**
* @param {function(?string, boolean, string)} callback
*/
requestContent: function(callback)
Modified: trunk/Source/WebCore/inspector/front-end/Resource.js (117570 => 117571)
--- trunk/Source/WebCore/inspector/front-end/Resource.js 2012-05-18 09:49:01 UTC (rev 117570)
+++ trunk/Source/WebCore/inspector/front-end/Resource.js 2012-05-18 10:10:52 UTC (rev 117571)
@@ -368,6 +368,14 @@
},
/**
+ * @return {WebInspector.ResourceType}
+ */
+ contentType: function()
+ {
+ return this.type;
+ },
+
+ /**
* @param {function(?string, boolean, string)} callback
*/
requestContent: function(callback)
@@ -383,13 +391,7 @@
canonicalMimeType: function()
{
- if (this.type === WebInspector.resourceTypes.Document)
- return "text/html";
- if (this.type === WebInspector.resourceTypes.Script)
- return "text/_javascript_";
- if (this.type === WebInspector.resourceTypes.Stylesheet)
- return "text/css";
- return this.mimeType;
+ return this.type.canonicalMimeType() || this.mimeType;
},
/**
@@ -526,6 +528,14 @@
},
/**
+ * @return {WebInspector.ResourceType}
+ */
+ contentType: function()
+ {
+ return this._resource.contentType();
+ },
+
+ /**
* @param {function(?string, boolean, string)} callback
*/
requestContent: function(callback)
Modified: trunk/Source/WebCore/inspector/front-end/ResourceType.js (117570 => 117571)
--- trunk/Source/WebCore/inspector/front-end/ResourceType.js 2012-05-18 09:49:01 UTC (rev 117570)
+++ trunk/Source/WebCore/inspector/front-end/ResourceType.js 2012-05-18 10:10:52 UTC (rev 117571)
@@ -91,6 +91,20 @@
toString: function()
{
return this._name;
+ },
+
+ /**
+ * @return {string}
+ */
+ canonicalMimeType: function()
+ {
+ if (this === WebInspector.resourceTypes.Document)
+ return "text/html";
+ if (this === WebInspector.resourceTypes.Script)
+ return "text/_javascript_";
+ if (this === WebInspector.resourceTypes.Stylesheet)
+ return "text/css";
+ return "";
}
}
Modified: trunk/Source/WebCore/inspector/front-end/Script.js (117570 => 117571)
--- trunk/Source/WebCore/inspector/front-end/Script.js 2012-05-18 09:49:01 UTC (rev 117570)
+++ trunk/Source/WebCore/inspector/front-end/Script.js 2012-05-18 10:10:52 UTC (rev 117571)
@@ -58,6 +58,14 @@
},
/**
+ * @return {WebInspector.ResourceType}
+ */
+ contentType: function()
+ {
+ return WebInspector.resourceTypes.Script;
+ },
+
+ /**
* @param {function(?string,boolean,string)} callback
*/
requestContent: function(callback)
Modified: trunk/Source/WebCore/inspector/front-end/ScriptSnippetModel.js (117570 => 117571)
--- trunk/Source/WebCore/inspector/front-end/ScriptSnippetModel.js 2012-05-18 09:49:01 UTC (rev 117570)
+++ trunk/Source/WebCore/inspector/front-end/ScriptSnippetModel.js 2012-05-18 10:10:52 UTC (rev 117571)
@@ -422,7 +422,7 @@
*/
WebInspector.SnippetContentProvider = function(snippet)
{
- WebInspector.StaticContentProvider.call(this, "text/_javascript_", snippet.content);
+ WebInspector.StaticContentProvider.call(this, WebInspector.resourceTypes.Script, snippet.content);
}
WebInspector.SnippetContentProvider.prototype.__proto__ = WebInspector.StaticContentProvider.prototype;
Modified: trunk/Source/WebCore/inspector/front-end/StylesPanel.js (117570 => 117571)
--- trunk/Source/WebCore/inspector/front-end/StylesPanel.js 2012-05-18 09:49:01 UTC (rev 117570)
+++ trunk/Source/WebCore/inspector/front-end/StylesPanel.js 2012-05-18 10:10:52 UTC (rev 117571)
@@ -99,7 +99,6 @@
}
WebInspector.StyleSource.prototype = {
-
}
WebInspector.StyleSource.prototype.__proto__ = WebInspector.UISourceCode.prototype;
Modified: trunk/Source/WebCore/inspector/front-end/UISourceCode.js (117570 => 117571)
--- trunk/Source/WebCore/inspector/front-end/UISourceCode.js 2012-05-18 09:49:01 UTC (rev 117570)
+++ trunk/Source/WebCore/inspector/front-end/UISourceCode.js 2012-05-18 10:10:52 UTC (rev 117571)
@@ -100,6 +100,14 @@
},
/**
+ * @return {WebInspector.ResourceType}
+ */
+ contentType: function()
+ {
+ return this._contentProvider.contentType();
+ },
+
+ /**
* @param {function(?string,boolean,string)} callback
*/
requestContent: function(callback)
Modified: trunk/Source/WebCore/inspector/front-end/navigatorView.css (117570 => 117571)
--- trunk/Source/WebCore/inspector/front-end/navigatorView.css 2012-05-18 09:49:01 UTC (rev 117570)
+++ trunk/Source/WebCore/inspector/front-end/navigatorView.css 2012-05-18 10:10:52 UTC (rev 117571)
@@ -40,6 +40,14 @@
content: url(Images/resourceJSIcon.png);
}
+.navigator-stylesheet-tree-item .icon {
+ content: url(Images/resourceCSSIcon.png);
+}
+
+.navigator-document-tree-item .icon {
+ content: url(Images/resourceDocumentIcon.png);
+}
+
.navigator li {
height: 17px;
white-space: nowrap;
