| OLD | NEW |
| 1 <html> | 1 <html> |
| 2 <head> | 2 <head> |
| 3 <script src="../inspector-test.js"></script> | 3 <script src="../inspector-test.js"></script> |
| 4 <script src="../resources-test.js"></script> | 4 <script src="../resources-test.js"></script> |
| 5 <script src="resource-tree-test.js"></script> | 5 <script src="resource-tree-test.js"></script> |
| 6 | 6 |
| 7 <script> | 7 <script> |
| 8 | 8 |
| 9 function test() | 9 function test() |
| 10 { | 10 { |
| 11 InspectorTest.runAfterResourcesAreFinished(["dummy-iframe.html", "inspector-
test.js", "resources-test.js", "resource-tree-test.js"], step1); | 11 InspectorTest.runAfterResourcesAreFinished(["dummy-iframe.html", "inspector-
test.js", "resources-test.js", "resource-tree-test.js"], step1); |
| 12 | 12 |
| 13 function step1() | 13 function step1() |
| 14 { | 14 { |
| 15 // Reset resourceTreeModel. | 15 // Reset resourceTreeModel. |
| 16 WebInspector.resourceTreeModel.mainFrame._remove(); | 16 InspectorTest.resourceTreeModel.mainFrame._remove(); |
| 17 | 17 |
| 18 for (var eventName in WebInspector.ResourceTreeModel.EventTypes) | 18 for (var eventName in WebInspector.ResourceTreeModel.EventTypes) |
| 19 WebInspector.resourceTreeModel.addEventListener(WebInspector.Resourc
eTreeModel.EventTypes[eventName], eventHandler.bind(this, eventName)); | 19 InspectorTest.resourceTreeModel.addEventListener(WebInspector.Resour
ceTreeModel.EventTypes[eventName], eventHandler.bind(this, eventName)); |
| 20 | 20 |
| 21 function eventHandler(eventName, event) | 21 function eventHandler(eventName, event) |
| 22 { | 22 { |
| 23 switch (eventName) { | 23 switch (eventName) { |
| 24 case "FrameAdded": | 24 case "FrameAdded": |
| 25 case "FrameDetached": | 25 case "FrameDetached": |
| 26 var frame = event.data; | 26 var frame = event.data; |
| 27 InspectorTest.addResult(" " + eventName + " : " + frame.id); | 27 InspectorTest.addResult(" " + eventName + " : " + frame.id); |
| 28 break; | 28 break; |
| 29 case "FrameNavigated": | 29 case "FrameNavigated": |
| 30 case "MainFrameNavigated": | 30 case "MainFrameNavigated": |
| 31 var frame = event.data; | 31 var frame = event.data; |
| 32 InspectorTest.addResult(" " + eventName + " : " + frame.id +
" : " + frame.loaderId); | 32 InspectorTest.addResult(" " + eventName + " : " + frame.id +
" : " + frame.loaderId); |
| 33 break; | 33 break; |
| 34 case "SecurityOriginAdded": | 34 case "SecurityOriginAdded": |
| 35 case "SecurityOriginRemoved": | 35 case "SecurityOriginRemoved": |
| 36 var securityOrigin = event.data; | 36 var securityOrigin = event.data; |
| 37 InspectorTest.addResult(" " + eventName + " : " + securityOri
gin); | 37 InspectorTest.addResult(" " + eventName + " : " + securityOri
gin); |
| 38 break; | 38 break; |
| 39 default: | 39 default: |
| 40 } | 40 } |
| 41 | 41 |
| 42 } | 42 } |
| 43 | 43 |
| 44 // Simulate navigation to new render view: do not attach root frame. | 44 // Simulate navigation to new render view: do not attach root frame. |
| 45 InspectorTest.addResult("Navigating root frame"); | 45 InspectorTest.addResult("Navigating root frame"); |
| 46 WebInspector.resourceTreeModel._frameNavigated(createFramePayload("root1
")); | 46 InspectorTest.resourceTreeModel._frameNavigated(createFramePayload("root
1")); |
| 47 InspectorTest.addResult("Navigating child frame 1"); | 47 InspectorTest.addResult("Navigating child frame 1"); |
| 48 WebInspector.resourceTreeModel._frameAttached("child1", "root1"); | 48 InspectorTest.resourceTreeModel._frameAttached("child1", "root1"); |
| 49 WebInspector.resourceTreeModel._frameNavigated(createFramePayload("child
1", "root1")); | 49 InspectorTest.resourceTreeModel._frameNavigated(createFramePayload("chil
d1", "root1")); |
| 50 InspectorTest.addResult("Navigating child frame 1 to a different URL"); | 50 InspectorTest.addResult("Navigating child frame 1 to a different URL"); |
| 51 WebInspector.resourceTreeModel._frameNavigated(createFramePayload("child
1", "root1", "child1-new")); | 51 InspectorTest.resourceTreeModel._frameNavigated(createFramePayload("chil
d1", "root1", "child1-new")); |
| 52 InspectorTest.addResult("Navigating child frame 2"); | 52 InspectorTest.addResult("Navigating child frame 2"); |
| 53 WebInspector.resourceTreeModel._frameAttached("child2", "root1"); | 53 InspectorTest.resourceTreeModel._frameAttached("child2", "root1"); |
| 54 WebInspector.resourceTreeModel._frameNavigated(createFramePayload("child
2", "root1")); | 54 InspectorTest.resourceTreeModel._frameNavigated(createFramePayload("chil
d2", "root1")); |
| 55 InspectorTest.addResult("Detaching child frame 1"); | 55 InspectorTest.addResult("Detaching child frame 1"); |
| 56 WebInspector.resourceTreeModel._frameDetached("child1"); | 56 InspectorTest.resourceTreeModel._frameDetached("child1"); |
| 57 | 57 |
| 58 InspectorTest.addResult("Navigating root frame"); | 58 InspectorTest.addResult("Navigating root frame"); |
| 59 WebInspector.resourceTreeModel._frameAttached("root2"); | 59 InspectorTest.resourceTreeModel._frameAttached("root2"); |
| 60 WebInspector.resourceTreeModel._frameNavigated(createFramePayload("root2
")); | 60 InspectorTest.resourceTreeModel._frameNavigated(createFramePayload("root
2")); |
| 61 InspectorTest.completeTest(); | 61 InspectorTest.completeTest(); |
| 62 } | 62 } |
| 63 | 63 |
| 64 function createFramePayload(id, parentId, name) | 64 function createFramePayload(id, parentId, name) |
| 65 { | 65 { |
| 66 var framePayload = {}; | 66 var framePayload = {}; |
| 67 framePayload.id = id; | 67 framePayload.id = id; |
| 68 framePayload.parentId = parentId || ""; | 68 framePayload.parentId = parentId || ""; |
| 69 framePayload.loaderId = "loader-" + id; | 69 framePayload.loaderId = "loader-" + id; |
| 70 framePayload.name = "frame-" + id; | 70 framePayload.name = "frame-" + id; |
| (...skipping 10 matching lines...) Expand all Loading... |
| 81 | 81 |
| 82 <body> | 82 <body> |
| 83 <p> | 83 <p> |
| 84 Tests top frame navigation events. | 84 Tests top frame navigation events. |
| 85 </p> | 85 </p> |
| 86 | 86 |
| 87 <iframe src="resources/dummy-iframe.html" onload="runTest()"> | 87 <iframe src="resources/dummy-iframe.html" onload="runTest()"> |
| 88 | 88 |
| 89 </body> | 89 </body> |
| 90 </html> | 90 </html> |
| OLD | NEW |