Changeset 117571 in webkit
- Timestamp:
- May 18, 2012 3:10:52 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r117570 r117571 1 2012-05-18 Pavel Feldman <pfeldman@chromium.org> 2 3 Web Inspector: add ContentProvider::contentType and use it when rendering navigator tree. 4 https://bugs.webkit.org/show_bug.cgi?id=86833 5 6 Reviewed by Vsevolod Vlasov. 7 8 * http/tests/inspector/search/search-in-static.html: 9 * inspector/debugger/scripts-file-selector.html: 10 * inspector/debugger/scripts-panel.html: 11 * inspector/debugger/scripts-sorting.html: 12 1 13 2012-05-18 Ryosuke Niwa <rniwa@webkit.org> 2 14 -
trunk/LayoutTests/http/tests/inspector/search/search-in-static.html
r97959 r117571 19 19 function step3() 20 20 { 21 staticContentProvider = new WebInspector.StaticContentProvider( "text/plain", resource.content);21 staticContentProvider = new WebInspector.StaticContentProvider(WebInspector.resourceTypes.Script, resource.content); 22 22 InspectorTest.addResult(resource.url); 23 23 -
trunk/LayoutTests/inspector/debugger/scripts-file-selector.html
r116846 r117571 12 12 var navigatorFileSelector = new WebInspector.ScriptsNavigator(); 13 13 14 var contentProvider = { 15 contentType: function() 16 { 17 return WebInspector.resourceTypes.Script; 18 } 19 } 20 14 21 function addUISourceCode(url, isContentScript) 15 22 { 16 var uiSourceCode = new WebInspector.UISourceCode(url, null, null);23 var uiSourceCode = new WebInspector.UISourceCode(url, contentProvider, null); 17 24 uiSourceCode.isContentScript = isContentScript; 18 25 navigatorFileSelector.addUISourceCode(uiSourceCode); -
trunk/LayoutTests/inspector/debugger/scripts-panel.html
r117302 r117571 19 19 }; 20 20 21 var contentProvider = { 22 contentType: function() 23 { 24 return WebInspector.resourceTypes.Script; 25 } 26 } 27 21 28 function createUISourceCodeProviderMock() 22 29 { … … 45 52 function createUISouceCode(url) 46 53 { 47 var uiSourceCode = new WebInspector.JavaScriptSource(url, null, null, false);54 var uiSourceCode = new WebInspector.JavaScriptSource(url, contentProvider, null, false); 48 55 uiSourceCode.requestContent = function(callback) 49 56 { -
trunk/LayoutTests/inspector/debugger/scripts-sorting.html
r116846 r117571 12 12 var navigatorFileSelector = new WebInspector.ScriptsNavigator(); 13 13 14 var contentProvider = { 15 contentType: function() 16 { 17 return WebInspector.resourceTypes.Script; 18 } 19 } 20 14 21 function addUISourceCode(url, isContentScript) 15 22 { 16 var uiSourceCode = new WebInspector.UISourceCode(url, null, null);23 var uiSourceCode = new WebInspector.UISourceCode(url, contentProvider, null); 17 24 uiSourceCode.isContentScript = isContentScript; 18 25 navigatorFileSelector.addUISourceCode(uiSourceCode); -
trunk/Source/WebCore/ChangeLog
r117565 r117571 1 2012-05-18 Pavel Feldman <pfeldman@chromium.org> 2 3 Web Inspector: add ContentProvider::contentType and use it when rendering navigator tree. 4 https://bugs.webkit.org/show_bug.cgi?id=86833 5 6 Reviewed by Vsevolod Vlasov. 7 8 Added ContentProvider::contentType, regactored NavigatorView to use the icon defined by the content type. 9 10 * inspector/front-end/CompilerScriptMapping.js: 11 * inspector/front-end/ContentProvider.js: 12 (WebInspector.ContentProvider.prototype.contentType): 13 * inspector/front-end/ContentProviders.js: 14 (WebInspector.ConcatenatedScriptsContentProvider.prototype.contentType): 15 (WebInspector.CompilerSourceMappingContentProvider): 16 (WebInspector.CompilerSourceMappingContentProvider.prototype.contentType): 17 (WebInspector.CompilerSourceMappingContentProvider.prototype.requestContent): 18 (WebInspector.StaticContentProvider): 19 (WebInspector.StaticContentProvider.prototype.contentType): 20 (WebInspector.StaticContentProvider.prototype.requestContent): 21 * inspector/front-end/NavigatorView.js: 22 (WebInspector.NavigatorTreeOutline.prototype.scriptTreeElements): 23 (WebInspector.NavigatorSourceTreeElement): 24 * inspector/front-end/NetworkRequest.js: 25 (WebInspector.NetworkRequest.prototype.contentType): 26 * inspector/front-end/Resource.js: 27 (WebInspector.Resource.prototype.contentType): 28 (WebInspector.Resource.prototype.canonicalMimeType): 29 (WebInspector.ResourceRevision.prototype.contentType): 30 * inspector/front-end/ResourceType.js: 31 (WebInspector.ResourceType.prototype.toString): 32 (WebInspector.ResourceType.prototype.canonicalMimeType): 33 * inspector/front-end/Script.js: 34 (WebInspector.Script.prototype.contentType): 35 * inspector/front-end/ScriptSnippetModel.js: 36 (WebInspector.SnippetContentProvider): 37 * inspector/front-end/StylesPanel.js: 38 * inspector/front-end/UISourceCode.js: 39 (WebInspector.UISourceCode.prototype.contentType): 40 * inspector/front-end/navigatorView.css: 41 (.navigator-stylesheet-tree-item .icon): 42 (.navigator-document-tree-item .icon): 43 1 44 2012-05-18 Sheriff Bot <webkit.review.bot@gmail.com> 2 45 -
trunk/Source/WebCore/inspector/front-end/CompilerScriptMapping.js
r117277 r117571 116 116 var contentProvider; 117 117 if (sourceContent) 118 contentProvider = new WebInspector.StaticContentProvider( "text/javascript", sourceContent);118 contentProvider = new WebInspector.StaticContentProvider(WebInspector.resourceTypes.Script, sourceContent); 119 119 else 120 120 contentProvider = new WebInspector.CompilerSourceMappingContentProvider(sourceURL); -
trunk/Source/WebCore/inspector/front-end/ContentProvider.js
r114241 r117571 41 41 42 42 /** 43 * @return {WebInspector.ResourceType} 44 */ 45 contentType: function() { }, 46 47 /** 43 48 * @param {function(?string,boolean,string)} callback 44 49 */ -
trunk/Source/WebCore/inspector/front-end/ContentProviders.js
r115979 r117571 82 82 83 83 /** 84 * @return {WebInspector.ResourceType} 85 */ 86 contentType: function() 87 { 88 return WebInspector.resourceTypes.Document; 89 }, 90 91 /** 84 92 * @param {function(?string,boolean,string)} callback 85 93 */ … … 181 189 WebInspector.CompilerSourceMappingContentProvider = function(sourceURL) 182 190 { 183 this._mimeType = "text/javascript";184 191 this._sourceURL = sourceURL; 185 192 } … … 194 201 }, 195 202 203 /** 204 * @return {WebInspector.ResourceType} 205 */ 206 contentType: function() 207 { 208 return WebInspector.resourceTypes.Script; 209 }, 210 196 211 /** 197 212 * @param {function(?string,boolean,string)} callback … … 206 221 console.error(e.message); 207 222 } 208 callback(sourceCode, false, this._mimeType);223 callback(sourceCode, false, "text/javascript"); 209 224 }, 210 225 … … 226 241 * @constructor 227 242 * @implements {WebInspector.ContentProvider} 243 * @param {WebInspector.ResourceType} contentType 244 * @param {string} content 228 245 */ 229 WebInspector.StaticContentProvider = function( mimeType, content)246 WebInspector.StaticContentProvider = function(contentType, content) 230 247 { 231 this._mimeType = mimeType;232 248 this._content = content; 249 this._contentType = contentType; 233 250 } 234 251 … … 243 260 244 261 /** 262 * @return {WebInspector.ResourceType} 263 */ 264 contentType: function() 265 { 266 return WebInspector.resourceTypes.Script; 267 }, 268 269 /** 245 270 * @param {function(?string,boolean,string)} callback 246 271 */ 247 272 requestContent: function(callback) 248 273 { 249 callback(this._content, false, this._ mimeType);274 callback(this._content, false, this._contentType.canonicalMimeType()); 250 275 }, 251 276 -
trunk/Source/WebCore/inspector/front-end/NavigatorView.js
r117306 r117571 74 74 return; 75 75 76 var scriptTreeElement = new WebInspector.NavigatorS criptTreeElement(this, uiSourceCode, "");76 var scriptTreeElement = new WebInspector.NavigatorSourceTreeElement(this, uiSourceCode, ""); 77 77 this._scriptTreeElementsByUISourceCode.put(uiSourceCode, scriptTreeElement); 78 78 this._updateScriptTitle(uiSourceCode); … … 408 408 if (this.children.length) { 409 409 for (var treeElement = this.children[0]; treeElement; treeElement = treeElement.traverseNextTreeElement(false, this, true)) { 410 if (treeElement instanceof WebInspector.NavigatorS criptTreeElement)410 if (treeElement instanceof WebInspector.NavigatorSourceTreeElement) 411 411 result.push(treeElement.uiSourceCode); 412 412 } … … 562 562 * @param {string} title 563 563 */ 564 WebInspector.NavigatorS criptTreeElement = function(navigatorView, uiSourceCode, title)564 WebInspector.NavigatorSourceTreeElement = function(navigatorView, uiSourceCode, title) 565 565 { 566 WebInspector.BaseNavigatorTreeElement.call(this, title, ["navigator- script-tree-item"], false);566 WebInspector.BaseNavigatorTreeElement.call(this, title, ["navigator-" + uiSourceCode.contentType().name() + "-tree-item"], false); 567 567 this._navigatorView = navigatorView; 568 568 this._uiSourceCode = uiSourceCode; … … 570 570 } 571 571 572 WebInspector.NavigatorS criptTreeElement.prototype = {572 WebInspector.NavigatorSourceTreeElement.prototype = { 573 573 /** 574 574 * @return {WebInspector.UISourceCode} … … 620 620 } 621 621 622 WebInspector.NavigatorS criptTreeElement.prototype.__proto__ = WebInspector.BaseNavigatorTreeElement.prototype;622 WebInspector.NavigatorSourceTreeElement.prototype.__proto__ = WebInspector.BaseNavigatorTreeElement.prototype; -
trunk/Source/WebCore/inspector/front-end/NetworkRequest.js
r116952 r117571 685 685 686 686 /** 687 * @return {WebInspector.ResourceType} 688 */ 689 contentType: function() 690 { 691 return this._type; 692 }, 693 694 /** 687 695 * @param {function(?string, boolean, string)} callback 688 696 */ -
trunk/Source/WebCore/inspector/front-end/Resource.js
r115984 r117571 369 369 370 370 /** 371 * @return {WebInspector.ResourceType} 372 */ 373 contentType: function() 374 { 375 return this.type; 376 }, 377 378 /** 371 379 * @param {function(?string, boolean, string)} callback 372 380 */ … … 384 392 canonicalMimeType: function() 385 393 { 386 if (this.type === WebInspector.resourceTypes.Document) 387 return "text/html"; 388 if (this.type === WebInspector.resourceTypes.Script) 389 return "text/javascript"; 390 if (this.type === WebInspector.resourceTypes.Stylesheet) 391 return "text/css"; 392 return this.mimeType; 394 return this.type.canonicalMimeType() || this.mimeType; 393 395 }, 394 396 … … 527 529 528 530 /** 531 * @return {WebInspector.ResourceType} 532 */ 533 contentType: function() 534 { 535 return this._resource.contentType(); 536 }, 537 538 /** 529 539 * @param {function(?string, boolean, string)} callback 530 540 */ -
trunk/Source/WebCore/inspector/front-end/ResourceType.js
r113587 r117571 92 92 { 93 93 return this._name; 94 }, 95 96 /** 97 * @return {string} 98 */ 99 canonicalMimeType: function() 100 { 101 if (this === WebInspector.resourceTypes.Document) 102 return "text/html"; 103 if (this === WebInspector.resourceTypes.Script) 104 return "text/javascript"; 105 if (this === WebInspector.resourceTypes.Stylesheet) 106 return "text/css"; 107 return ""; 94 108 } 95 109 } -
trunk/Source/WebCore/inspector/front-end/Script.js
r117277 r117571 59 59 60 60 /** 61 * @return {WebInspector.ResourceType} 62 */ 63 contentType: function() 64 { 65 return WebInspector.resourceTypes.Script; 66 }, 67 68 /** 61 69 * @param {function(?string,boolean,string)} callback 62 70 */ -
trunk/Source/WebCore/inspector/front-end/ScriptSnippetModel.js
r117299 r117571 423 423 WebInspector.SnippetContentProvider = function(snippet) 424 424 { 425 WebInspector.StaticContentProvider.call(this, "text/javascript", snippet.content);425 WebInspector.StaticContentProvider.call(this, WebInspector.resourceTypes.Script, snippet.content); 426 426 } 427 427 -
trunk/Source/WebCore/inspector/front-end/StylesPanel.js
r117462 r117571 100 100 101 101 WebInspector.StyleSource.prototype = { 102 103 102 } 104 103 -
trunk/Source/WebCore/inspector/front-end/UISourceCode.js
r117455 r117571 101 101 102 102 /** 103 * @return {WebInspector.ResourceType} 104 */ 105 contentType: function() 106 { 107 return this._contentProvider.contentType(); 108 }, 109 110 /** 103 111 * @param {function(?string,boolean,string)} callback 104 112 */ -
trunk/Source/WebCore/inspector/front-end/navigatorView.css
r117055 r117571 39 39 .navigator-script-tree-item .icon { 40 40 content: url(Images/resourceJSIcon.png); 41 } 42 43 .navigator-stylesheet-tree-item .icon { 44 content: url(Images/resourceCSSIcon.png); 45 } 46 47 .navigator-document-tree-item .icon { 48 content: url(Images/resourceDocumentIcon.png); 41 49 } 42 50
Note: See TracChangeset
for help on using the changeset viewer.