| Index: third_party/WebKit/LayoutTests/inspector/sources/debugger/file-system-project-mapping.html
|
| diff --git a/third_party/WebKit/LayoutTests/inspector/sources/debugger/file-system-project-mapping.html b/third_party/WebKit/LayoutTests/inspector/sources/debugger/file-system-project-mapping.html
|
| index f4c1bf9c73c6a5bc0819e6c83cd71261bfeb2368..e5ed9dcd9338880e8f0ad600cea4de4c69b3588d 100644
|
| --- a/third_party/WebKit/LayoutTests/inspector/sources/debugger/file-system-project-mapping.html
|
| +++ b/third_party/WebKit/LayoutTests/inspector/sources/debugger/file-system-project-mapping.html
|
| @@ -13,8 +13,8 @@ function test()
|
| var resourceScriptMapping;
|
| var defaultScriptMapping;
|
| var persistence;
|
| - var fileSystemProjectId = WebInspector.FileSystemWorkspaceBinding.projectId("file:///var/www");
|
| - WebInspector.networkMapping.dispose();
|
| + var fileSystemProjectId = Bindings.FileSystemWorkspaceBinding.projectId("file:///var/www");
|
| + Bindings.networkMapping.dispose();
|
|
|
| function createWorkspaceWithTarget()
|
| {
|
| @@ -24,7 +24,7 @@ function test()
|
| defaultScriptMapping = entry._defaultMapping;
|
| if (persistence)
|
| persistence.dispose();
|
| - persistence = new WebInspector.Persistence(InspectorTest.testWorkspace, WebInspector.breakpointManager, WebInspector.fileSystemMapping);
|
| + persistence = new Persistence.Persistence(InspectorTest.testWorkspace, Bindings.breakpointManager, Workspace.fileSystemMapping);
|
| }
|
|
|
| function dumpFileSystemUISourceCodesMappings()
|
| @@ -53,28 +53,28 @@ function test()
|
| function fileSystemCreated1()
|
| {
|
| InspectorTest.addResult("Adding network resource.");
|
| - InspectorTest.addMockUISourceCodeViaNetwork("http://localhost/html/foo.js", WebInspector.resourceTypes.Script, "<foo content>", target);
|
| - InspectorTest.addMockUISourceCodeViaNetwork("http://localhost/bar.js", WebInspector.resourceTypes.Script, "<foo content>", target);
|
| + InspectorTest.addMockUISourceCodeViaNetwork("http://localhost/html/foo.js", Common.resourceTypes.Script, "<foo content>", target);
|
| + InspectorTest.addMockUISourceCodeViaNetwork("http://localhost/bar.js", Common.resourceTypes.Script, "<foo content>", target);
|
| dumpFileSystemUISourceCodesMappings();
|
|
|
| var uiSourceCode = InspectorTest.testWorkspace.uiSourceCode(fileSystemProjectId, "file:///var/www/html/foo.js");
|
| - networkUISourceCode = InspectorTest.testWorkspace.uiSourceCode(WebInspector.NetworkProject.projectId(target, target.resourceTreeModel.mainFrame, false), "http://localhost/html/foo.js");
|
| + networkUISourceCode = InspectorTest.testWorkspace.uiSourceCode(Bindings.NetworkProject.projectId(target, target.resourceTreeModel.mainFrame, false), "http://localhost/html/foo.js");
|
| InspectorTest.addResult("Adding mapping between network and file system resources.");
|
| InspectorTest.testNetworkMapping.addMapping(networkUISourceCode, uiSourceCode);
|
| - var setting = JSON.stringify(WebInspector.fileSystemMapping._fileSystemMappingSetting.get());
|
| + var setting = JSON.stringify(Workspace.fileSystemMapping._fileSystemMappingSetting.get());
|
|
|
| InspectorTest.addResult("Emulate reloading inspector.");
|
| fs.reportRemoved();
|
| createWorkspaceWithTarget();
|
| - WebInspector.fileSystemMapping._fileSystemMappingSetting.set(JSON.parse(setting));
|
| - WebInspector.fileSystemMapping._loadFromSettings();
|
| + Workspace.fileSystemMapping._fileSystemMappingSetting.set(JSON.parse(setting));
|
| + Workspace.fileSystemMapping._loadFromSettings();
|
| fs.reportCreated(fileSystemCreated2);
|
| }
|
|
|
| function fileSystemCreated2()
|
| {
|
| - InspectorTest.addMockUISourceCodeViaNetwork("http://localhost/html/foo.js", WebInspector.resourceTypes.Script, "<foo content>", target);
|
| - InspectorTest.addMockUISourceCodeViaNetwork("http://localhost/bar.js", WebInspector.resourceTypes.Script, "<foo content>", target);
|
| + InspectorTest.addMockUISourceCodeViaNetwork("http://localhost/html/foo.js", Common.resourceTypes.Script, "<foo content>", target);
|
| + InspectorTest.addMockUISourceCodeViaNetwork("http://localhost/bar.js", Common.resourceTypes.Script, "<foo content>", target);
|
|
|
| dumpFileSystemUISourceCodesMappings();
|
|
|
| @@ -90,11 +90,11 @@ function test()
|
|
|
| function fileSystemCreated3()
|
| {
|
| - InspectorTest.addMockUISourceCodeViaNetwork("http://localhost/html/foo.js", WebInspector.resourceTypes.Script, "<foo content>", target);
|
| - InspectorTest.addMockUISourceCodeViaNetwork("http://localhost/bar.js", WebInspector.resourceTypes.Script, "<foo content>", target);
|
| + InspectorTest.addMockUISourceCodeViaNetwork("http://localhost/html/foo.js", Common.resourceTypes.Script, "<foo content>", target);
|
| + InspectorTest.addMockUISourceCodeViaNetwork("http://localhost/bar.js", Common.resourceTypes.Script, "<foo content>", target);
|
| dumpFileSystemUISourceCodesMappings();
|
|
|
| - WebInspector.fileSystemMapping.removeMappingForURL(networkUISourceCode.url());
|
| + Workspace.fileSystemMapping.removeMappingForURL(networkUISourceCode.url());
|
| fs.reportRemoved();
|
| next();
|
| }
|
| @@ -121,14 +121,14 @@ function test()
|
| {
|
| dumpWorkspaceUISourceCodes();
|
| InspectorTest.addResult("Removing project:");
|
| - InspectorTest.testWorkspace.addEventListener(WebInspector.Workspace.Events.ProjectRemoved, projectRemoved);
|
| + InspectorTest.testWorkspace.addEventListener(Workspace.Workspace.Events.ProjectRemoved, projectRemoved);
|
| InspectorTest.testTargetManager.removeTarget(target);
|
| target = null;
|
| }
|
|
|
| function projectRemoved()
|
| {
|
| - InspectorTest.testWorkspace.removeEventListener(WebInspector.Workspace.Events.ProjectRemoved, projectRemoved);
|
| + InspectorTest.testWorkspace.removeEventListener(Workspace.Workspace.Events.ProjectRemoved, projectRemoved);
|
| InspectorTest.addResult("Received project removed event.");
|
| fs.reportRemoved();
|
| setImmediate(next);
|
| @@ -148,8 +148,8 @@ function test()
|
|
|
| function fileSystemCreated()
|
| {
|
| - InspectorTest.addMockUISourceCodeViaNetwork("http://localhost/h1/foo.js", WebInspector.resourceTypes.Script, "<foo content>", target);
|
| - InspectorTest.addMockUISourceCodeViaNetwork("http://localhost/h2/bar.js", WebInspector.resourceTypes.Script, "<bar content>", target);
|
| + InspectorTest.addMockUISourceCodeViaNetwork("http://localhost/h1/foo.js", Common.resourceTypes.Script, "<foo content>", target);
|
| + InspectorTest.addMockUISourceCodeViaNetwork("http://localhost/h2/bar.js", Common.resourceTypes.Script, "<bar content>", target);
|
| dumpFileSystemUISourceCodesMappings();
|
| fs.reportRemoved();
|
| next();
|
|
|