| OLD | NEW |
| 1 var initialize_ResourceTest = function() { | 1 var initialize_ResourceTest = function() { |
| 2 | 2 |
| 3 InspectorTest.preloadPanel("sources"); | 3 InspectorTest.preloadPanel("sources"); |
| 4 InspectorTest.preloadPanel("resources"); | 4 InspectorTest.preloadPanel("resources"); |
| 5 | 5 |
| 6 InspectorTest.requestURLComparer = function(r1, r2) | 6 InspectorTest.requestURLComparer = function(r1, r2) |
| 7 { | 7 { |
| 8 return r1.request.url.localeCompare(r2.request.url); | 8 return r1.request.url.localeCompare(r2.request.url); |
| 9 } | 9 } |
| 10 | 10 |
| 11 InspectorTest.runAfterCachedResourcesProcessed = function(callback) | 11 InspectorTest.runAfterCachedResourcesProcessed = function(callback) |
| 12 { | 12 { |
| 13 if (!InspectorTest.resourceTreeModel._cachedResourcesProcessed) | 13 if (!InspectorTest.resourceTreeModel._cachedResourcesProcessed) |
| 14 InspectorTest.resourceTreeModel.addEventListener(WebInspector.ResourceTr
eeModel.Events.CachedResourcesLoaded, callback); | 14 InspectorTest.resourceTreeModel.addEventListener(SDK.ResourceTreeModel.E
vents.CachedResourcesLoaded, callback); |
| 15 else | 15 else |
| 16 callback(); | 16 callback(); |
| 17 } | 17 } |
| 18 | 18 |
| 19 InspectorTest.runAfterResourcesAreFinished = function(resourceURLs, callback) | 19 InspectorTest.runAfterResourcesAreFinished = function(resourceURLs, callback) |
| 20 { | 20 { |
| 21 var resourceURLsMap = new Set(resourceURLs); | 21 var resourceURLsMap = new Set(resourceURLs); |
| 22 | 22 |
| 23 function checkResources() | 23 function checkResources() |
| 24 { | 24 { |
| 25 for (var url of resourceURLsMap) { | 25 for (var url of resourceURLsMap) { |
| 26 var resource = InspectorTest.resourceMatchingURL(url); | 26 var resource = InspectorTest.resourceMatchingURL(url); |
| 27 if (resource) | 27 if (resource) |
| 28 resourceURLsMap.delete(url); | 28 resourceURLsMap.delete(url); |
| 29 } | 29 } |
| 30 if (!resourceURLsMap.size) { | 30 if (!resourceURLsMap.size) { |
| 31 InspectorTest.resourceTreeModel.removeEventListener(WebInspector.Res
ourceTreeModel.Events.ResourceAdded, checkResources); | 31 InspectorTest.resourceTreeModel.removeEventListener(SDK.ResourceTree
Model.Events.ResourceAdded, checkResources); |
| 32 callback(); | 32 callback(); |
| 33 } | 33 } |
| 34 } | 34 } |
| 35 checkResources(); | 35 checkResources(); |
| 36 if (resourceURLsMap.size) | 36 if (resourceURLsMap.size) |
| 37 InspectorTest.resourceTreeModel.addEventListener(WebInspector.ResourceTr
eeModel.Events.ResourceAdded, checkResources); | 37 InspectorTest.resourceTreeModel.addEventListener(SDK.ResourceTreeModel.E
vents.ResourceAdded, checkResources); |
| 38 } | 38 } |
| 39 | 39 |
| 40 InspectorTest.showResource = function(resourceURL, callback) | 40 InspectorTest.showResource = function(resourceURL, callback) |
| 41 { | 41 { |
| 42 var reported = false; | 42 var reported = false; |
| 43 function callbackWrapper(sourceFrame) | 43 function callbackWrapper(sourceFrame) |
| 44 { | 44 { |
| 45 if (reported) | 45 if (reported) |
| 46 return; | 46 return; |
| 47 callback(sourceFrame); | 47 callback(sourceFrame); |
| 48 reported = true; | 48 reported = true; |
| 49 } | 49 } |
| 50 | 50 |
| 51 function showResourceCallback() | 51 function showResourceCallback() |
| 52 { | 52 { |
| 53 var resource = InspectorTest.resourceMatchingURL(resourceURL); | 53 var resource = InspectorTest.resourceMatchingURL(resourceURL); |
| 54 if (!resource) | 54 if (!resource) |
| 55 return; | 55 return; |
| 56 WebInspector.panels.resources.showResource(resource, 1); | 56 UI.panels.resources.showResource(resource, 1); |
| 57 var sourceFrame = WebInspector.panels.resources._resourceViewForResource
(resource); | 57 var sourceFrame = UI.panels.resources._resourceViewForResource(resource)
; |
| 58 if (sourceFrame.loaded) | 58 if (sourceFrame.loaded) |
| 59 callbackWrapper(sourceFrame); | 59 callbackWrapper(sourceFrame); |
| 60 else | 60 else |
| 61 InspectorTest.addSniffer(sourceFrame, "onTextEditorContentSet", call
backWrapper.bind(null, sourceFrame)); | 61 InspectorTest.addSniffer(sourceFrame, "onTextEditorContentSet", call
backWrapper.bind(null, sourceFrame)); |
| 62 } | 62 } |
| 63 InspectorTest.runAfterResourcesAreFinished([resourceURL], showResourceCallba
ck); | 63 InspectorTest.runAfterResourcesAreFinished([resourceURL], showResourceCallba
ck); |
| 64 } | 64 } |
| 65 | 65 |
| 66 InspectorTest.resourceMatchingURL = function(resourceURL) | 66 InspectorTest.resourceMatchingURL = function(resourceURL) |
| 67 { | 67 { |
| 68 var result = null; | 68 var result = null; |
| 69 InspectorTest.resourceTreeModel.forAllResources(visit); | 69 InspectorTest.resourceTreeModel.forAllResources(visit); |
| 70 function visit(resource) | 70 function visit(resource) |
| 71 { | 71 { |
| 72 if (resource.url.indexOf(resourceURL) !== -1) { | 72 if (resource.url.indexOf(resourceURL) !== -1) { |
| 73 result = resource; | 73 result = resource; |
| 74 return true; | 74 return true; |
| 75 } | 75 } |
| 76 } | 76 } |
| 77 return result; | 77 return result; |
| 78 } | 78 } |
| 79 | 79 |
| 80 InspectorTest.databaseModel = function() | 80 InspectorTest.databaseModel = function() |
| 81 { | 81 { |
| 82 return WebInspector.DatabaseModel.fromTarget(InspectorTest.mainTarget); | 82 return Resources.DatabaseModel.fromTarget(InspectorTest.mainTarget); |
| 83 } | 83 } |
| 84 | 84 |
| 85 InspectorTest.domStorageModel = function() | 85 InspectorTest.domStorageModel = function() |
| 86 { | 86 { |
| 87 return WebInspector.DOMStorageModel.fromTarget(InspectorTest.mainTarget); | 87 return Resources.DOMStorageModel.fromTarget(InspectorTest.mainTarget); |
| 88 } | 88 } |
| 89 | 89 |
| 90 InspectorTest.indexedDBModel = function() | 90 InspectorTest.indexedDBModel = function() |
| 91 { | 91 { |
| 92 return WebInspector.IndexedDBModel.fromTarget(InspectorTest.mainTarget); | 92 return Resources.IndexedDBModel.fromTarget(InspectorTest.mainTarget); |
| 93 } | 93 } |
| 94 | 94 |
| 95 } | 95 } |
| OLD | NEW |