Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(310)

Side by Side Diff: LayoutTests/http/tests/inspector/resources-test.js

Issue 881263002: DevTools: use target-based model accessors only. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 var initialize_ResourceTest = function() { 1 var initialize_ResourceTest = function() {
2 2
3 InspectorTest.preloadPanel("resources"); 3 InspectorTest.preloadPanel("resources");
4 4
5 InspectorTest.requestURLComparer = function(r1, r2) 5 InspectorTest.requestURLComparer = function(r1, r2)
6 { 6 {
7 return r1.request.url.localeCompare(r2.request.url); 7 return r1.request.url.localeCompare(r2.request.url);
8 } 8 }
9 9
10 InspectorTest.runAfterCachedResourcesProcessed = function(callback) 10 InspectorTest.runAfterCachedResourcesProcessed = function(callback)
11 { 11 {
12 if (!WebInspector.resourceTreeModel._cachedResourcesProcessed) 12 if (!InspectorTest.resourceTreeModel._cachedResourcesProcessed)
13 WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTre eModel.EventTypes.CachedResourcesLoaded, callback); 13 InspectorTest.resourceTreeModel.addEventListener(WebInspector.ResourceTr eeModel.EventTypes.CachedResourcesLoaded, callback);
14 else 14 else
15 callback(); 15 callback();
16 } 16 }
17 17
18 InspectorTest.runAfterResourcesAreFinished = function(resourceURLs, callback) 18 InspectorTest.runAfterResourcesAreFinished = function(resourceURLs, callback)
19 { 19 {
20 var resourceURLsMap = resourceURLs.keySet(); 20 var resourceURLsMap = resourceURLs.keySet();
21 21
22 function checkResources() 22 function checkResources()
23 { 23 {
24 for (url in resourceURLsMap) { 24 for (url in resourceURLsMap) {
25 var resource = InspectorTest.resourceMatchingURL(url); 25 var resource = InspectorTest.resourceMatchingURL(url);
26 if (resource) 26 if (resource)
27 delete resourceURLsMap[url]; 27 delete resourceURLsMap[url];
28 } 28 }
29 if (!Object.keys(resourceURLsMap).length) { 29 if (!Object.keys(resourceURLsMap).length) {
30 WebInspector.resourceTreeModel.removeEventListener(WebInspector.Reso urceTreeModel.EventTypes.ResourceAdded, checkResources); 30 InspectorTest.resourceTreeModel.removeEventListener(WebInspector.Res ourceTreeModel.EventTypes.ResourceAdded, checkResources);
31 callback(); 31 callback();
32 } 32 }
33 } 33 }
34 checkResources(); 34 checkResources();
35 if (Object.keys(resourceURLsMap).length) 35 if (Object.keys(resourceURLsMap).length)
36 WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTre eModel.EventTypes.ResourceAdded, checkResources); 36 InspectorTest.resourceTreeModel.addEventListener(WebInspector.ResourceTr eeModel.EventTypes.ResourceAdded, checkResources);
37 } 37 }
38 38
39 InspectorTest.showResource = function(resourceURL, callback) 39 InspectorTest.showResource = function(resourceURL, callback)
40 { 40 {
41 var reported = false; 41 var reported = false;
42 function callbackWrapper(sourceFrame) 42 function callbackWrapper(sourceFrame)
43 { 43 {
44 if (reported) 44 if (reported)
45 return; 45 return;
46 callback(sourceFrame); 46 callback(sourceFrame);
(...skipping 11 matching lines...) Expand all
58 callbackWrapper(sourceFrame); 58 callbackWrapper(sourceFrame);
59 else 59 else
60 InspectorTest.addSniffer(sourceFrame, "onTextEditorContentLoaded", c allbackWrapper.bind(null, sourceFrame)); 60 InspectorTest.addSniffer(sourceFrame, "onTextEditorContentLoaded", c allbackWrapper.bind(null, sourceFrame));
61 } 61 }
62 InspectorTest.runAfterResourcesAreFinished([resourceURL], showResourceCallba ck); 62 InspectorTest.runAfterResourcesAreFinished([resourceURL], showResourceCallba ck);
63 } 63 }
64 64
65 InspectorTest.resourceMatchingURL = function(resourceURL) 65 InspectorTest.resourceMatchingURL = function(resourceURL)
66 { 66 {
67 var result = null; 67 var result = null;
68 WebInspector.resourceTreeModel.forAllResources(visit); 68 InspectorTest.resourceTreeModel.forAllResources(visit);
69 function visit(resource) 69 function visit(resource)
70 { 70 {
71 if (resource.url.indexOf(resourceURL) !== -1) { 71 if (resource.url.indexOf(resourceURL) !== -1) {
72 result = resource; 72 result = resource;
73 return true; 73 return true;
74 } 74 }
75 } 75 }
76 return result; 76 return result;
77 } 77 }
78 78
79 } 79 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698