Changeset 67084 in webkit
- Timestamp:
- Sep 9, 2010 7:51:29 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 3 added
- 9 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r67079 r67084 1 2010-09-09 Andrey Kosyakov <caseq@chromium.org> 2 3 Reviewed by Yury Semikhatsky. 4 5 Web Inspector: use string representation of resource type in extension API 6 Split resource tests from the misc. extension API tests, added more resource types. 7 https://bugs.webkit.org/show_bug.cgi?id=45286 8 9 * inspector/extensions-api-expected.txt: 10 * inspector/extensions-events-expected.txt: 11 * inspector/extensions-expected.txt: 12 * inspector/extensions-resources-expected.txt: Added. 13 * inspector/extensions-resources.html: Added. 14 * inspector/extensions.html: 15 * inspector/resources/Ahem.ttf: Copied from LayoutTests/fast/css/resources/Ahem.ttf. 16 * inspector/resources/abe.png: Copied from LayoutTests/editing/resources/abe.png. 17 1 18 2010-09-09 Pavel Podivilov <podivilov@chromium.org> 2 19 -
trunk/LayoutTests/inspector/extensions-api-expected.txt
r66596 r67084 47 47 removeListener : <function> 48 48 } 49 Types : { 50 Document : "document" 51 Stylesheet : "stylesheet" 52 Image : "image" 53 Font : "font" 54 Script : "script" 55 XHR : "XHR" 56 Media : "media" 57 Other : "other" 58 } 49 59 getAll : <function> 50 60 get : <function> -
trunk/LayoutTests/inspector/extensions-events-expected.txt
r66601 r67084 10 10 0 : { 11 11 id : <number> 12 type : 712 type : "other" 13 13 har : <object> 14 14 } -
trunk/LayoutTests/inspector/extensions-expected.txt
r66601 r67084 24 24 setExpanded : <function> 25 25 } 26 RUNNING TEST: extension_testGetAllResources27 resource: .../tests/inspector/inspector-test2.js28 resource: .../LayoutTests/inspector/extensions-test.js29 resource: .../LayoutTests/inspector/extensions.html30 RUNNING TEST: extension_testGetInvalidResource31 Attempted to retrieve invalid resource: {"code":"E_NOTFOUND","description":"Object not found: %s","details":[2128506],"isError":true}32 RUNNING TEST: extension_testResourceNotification33 Resource finished: .../inspector/resources/extension-main.html34 26 All tests done. 35 27 -
trunk/LayoutTests/inspector/extensions-resources.html
-
Property
svn:executable
set to
*
r67083 r67084 1 1 <html> 2 2 <head> 3 <link rel="stylesheet" href="resources/audits-style1.css" type="text/css"> 4 <style> 5 @font-face { 6 font-family: 'test'; 7 src: url(resources/Ahem.ttf); 8 } 9 10 p { font-family: 'test'; } 11 </style> 12 3 13 <script src="../http/tests/inspector/inspector-test2.js"></script> 4 14 <script src="extensions-test.js"></script> 5 15 <script type="text/javascript"> 6 7 window.inspectedValue = { str: "foo", num: 42 };8 16 9 17 function extension_testGetAllResources(nextTest) … … 19 27 20 28 for (var i = 0; i < resources.length; ++i) 21 output("resource: " + resources[i].har.request.url.replace(/.*((\/[^/]*){3}$)/,"...$1") );29 output("resource: " + resources[i].har.request.url.replace(/.*((\/[^/]*){3}$)/,"...$1") + ", type: " + resources[i].type); 22 30 } 23 webInspector.resources.getAll(callbackAndNextTest(onResource, nextTest)); 31 extension_doXHR(function() { 32 webInspector.resources.getAll(callbackAndNextTest(onResource, nextTest)); 33 }); 24 34 } 25 35 … … 33 43 } 34 44 35 function extension_testCreatePanel(nextTest)45 function doXHR() 36 46 { 37 function onPanelCreated(panel) 38 { 39 output("Panel created"); 40 dumpObject(panel); 41 } 42 webInspector.panels.create("Test Panel", "extension-panel.html", "extension-panel.png", callbackAndNextTest(onPanelCreated, nextTest)); 43 output("done createPanel"); 47 var xhr = new XMLHttpRequest(); 48 xhr.open('GET', location.href, false); 49 xhr.send(null); 44 50 } 45 51 46 function extension_ testCreateSidebar(nextTest)52 function extension_doXHR(callback) 47 53 { 48 function onSidebarCreated(sidebar) 49 { 50 output("Sidebar created"); 51 dumpObject(sidebar); 52 } 53 webInspector.panels.scripts.createSidebarPane("Test Sidebar", "extension-sidebar.html", callbackAndNextTest(onSidebarCreated, nextTest)); 54 webInspector.inspectedWindow.evaluate("doXHR()", callback); 54 55 } 55 56 … … 62 63 63 64 webInspector.resources.onFinished.addListener(callbackAndNextTest(onResourceFinished, nextTest)); 64 webInspector.inspectedWindow.evaluate("var xhr = new XMLHttpRequest(); xhr.open('GET', '" + location.href + "', false); xhr.send(null);");65 extension_doXHR(); 65 66 } 66 67 … … 69 70 <body onload="runTest()"> 70 71 <p>Tests WebInspector extension API</p> 72 <img src="resources/abe.png"> 73 <img src="resources/missing-image.png"> 71 74 </body> 72 75 </html> -
Property
svn:executable
set to
-
trunk/LayoutTests/inspector/extensions.html
r66601 r67084 4 4 <script src="extensions-test.js"></script> 5 5 <script type="text/javascript"> 6 7 window.inspectedValue = { str: "foo", num: 42 };8 9 function extension_testGetAllResources(nextTest)10 {11 function compareResources(a, b)12 {13 return a.har.request.url.localeCompare(b.har.request.url);14 }15 16 function onResource(result)17 {18 var resources = result.sort(compareResources);19 20 for (var i = 0; i < resources.length; ++i)21 output("resource: " + resources[i].har.request.url.replace(/.*((\/[^/]*){3}$)/,"...$1"));22 }23 webInspector.resources.getAll(callbackAndNextTest(onResource, nextTest));24 }25 26 function extension_testGetInvalidResource(nextTest)27 {28 function onResource(result)29 {30 output("Attempted to retrieve invalid resource: " + JSON.stringify(result));31 }32 webInspector.resources.get(2128506, callbackAndNextTest(onResource, nextTest));33 }34 6 35 7 function extension_testCreatePanel(nextTest) … … 54 26 } 55 27 56 function extension_testResourceNotification(nextTest)57 {58 function onResourceFinished(resource)59 {60 output("Resource finished: " + resource.har.request.url.replace(/.*((\/[^/]*){3}$)/,"...$1"));61 }62 63 webInspector.resources.onFinished.addListener(callbackAndNextTest(onResourceFinished, nextTest));64 webInspector.inspectedWindow.evaluate("var xhr = new XMLHttpRequest(); xhr.open('GET', '" + location.href + "', false); xhr.send(null);");65 }66 67 28 </script> 68 29 </head> -
trunk/WebCore/ChangeLog
r67080 r67084 1 2010-09-09 Andrey Kosyakov <caseq@chromium.org> 2 3 Reviewed by Yury Semikhatsky. 4 5 Web Inspector: use string representation of resource type in extension API 6 Fixed Resoruce.Type.toString() to handle Resource.Type.Media. 7 https://bugs.webkit.org/show_bug.cgi?id=45286 8 9 Test: inspector/extensions-resources.html 10 11 * English.lproj/localizedStrings.js: Added "media". 12 * inspector/front-end/ExtensionServer.js: Added webInspector.resources.Types. Return resource types as strings. 13 (WebInspector.ExtensionServer.prototype._convertResource): 14 (WebInspector.ExtensionServer.prototype._buildExtensionAPIInjectedScript): 15 * inspector/front-end/Resource.js: Added toUIString(), changed toString() to return locale-independent representation. 16 (WebInspector.Resource.Type.toUIString): 17 (WebInspector.Resource.Type.toString): 18 1 19 2010-09-09 Kristian Amlie <kristian.amlie@nokia.com> 2 20 -
trunk/WebCore/inspector/front-end/ExtensionServer.js
r66601 r67084 104 104 return { 105 105 id: resource.identifier, 106 type: resource.type,106 type: WebInspector.Resource.Type.toString(resource.type), 107 107 har: (new WebInspector.HAREntry(resource)).build(), 108 108 }; … … 322 322 _buildExtensionAPIInjectedScript: function() 323 323 { 324 var resourceTypes = {}; 325 var resourceTypeProperties = Object.getOwnPropertyNames(WebInspector.Resource.Type); 326 for (var i = 0; i < resourceTypeProperties.length; ++i) { 327 var propName = resourceTypeProperties[i]; 328 var propValue = WebInspector.Resource.Type[propName]; 329 if (typeof propValue === "number") 330 resourceTypes[propName] = WebInspector.Resource.Type.toString(propValue); 331 } 332 324 333 return "(function(){ " + 325 334 "var private = {};" + 326 335 "(" + WebInspector.commonExtensionSymbols.toString() + ")(private);" + 327 336 "(" + WebInspector.injectedExtensionAPI.toString() + ").apply(this, arguments);" + 337 "webInspector.resources.Types = " + JSON.stringify(resourceTypes) + ";" + 328 338 "})"; 329 339 }, -
trunk/WebCore/inspector/front-end/Resource.js
r64142 r67084 53 53 }, 54 54 55 toUIString: function(type) 56 { 57 return WebInspector.UIString(WebInspector.Resource.Type.toString(type)); 58 }, 59 60 // Returns locale-independent string identifier of resource type (primarily for use in extension API). 61 // The IDs need to be kept in sync with webInspector.resoureces.Types object in ExtensionAPI.js. 55 62 toString: function(type) 56 63 { 57 64 switch (type) { 58 65 case this.Document: 59 return WebInspector.UIString("document");66 return "document"; 60 67 case this.Stylesheet: 61 return WebInspector.UIString("stylesheet");68 return "stylesheet"; 62 69 case this.Image: 63 return WebInspector.UIString("image");70 return "image"; 64 71 case this.Font: 65 return WebInspector.UIString("font");72 return "font"; 66 73 case this.Script: 67 return WebInspector.UIString("script");74 return "script"; 68 75 case this.XHR: 69 return WebInspector.UIString("XHR"); 76 return "XHR"; 77 case this.Media: 78 return "media"; 70 79 case this.Other: 71 80 default: 72 return WebInspector.UIString("other");81 return "other"; 73 82 } 74 83 } … … 604 613 null, 605 614 1, 606 String.sprintf(WebInspector.Warnings.IncorrectMIMEType.message, WebInspector.Resource.Type.to String(this.type), this.mimeType),615 String.sprintf(WebInspector.Warnings.IncorrectMIMEType.message, WebInspector.Resource.Type.toUIString(this.type), this.mimeType), 607 616 null, 608 617 null);
Note: See TracChangeset
for help on using the changeset viewer.