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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: LayoutTests/inspector/sources/debugger/file-system-project-mapping.html

Issue 464963002: DevTools: Make UISourceCode Target-agnostic (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/inspector/sources/debugger/breakpoint-manager.js ('k') | LayoutTests/inspector/sources/debugger/multi-target-breakpoint-manager.html » ('j') | Source/devtools/front_end/sdk/DebuggerWorkspaceBinding.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: LayoutTests/inspector/sources/debugger/file-system-project-mapping.html
diff --git a/LayoutTests/inspector/sources/debugger/file-system-project-mapping.html b/LayoutTests/inspector/sources/debugger/file-system-project-mapping.html
index 6eef4f69fe484bbad56f0fcbccd503732b68eb18..26405a6486fee5fc36c5ea77e3d6f84541974666 100644
--- a/LayoutTests/inspector/sources/debugger/file-system-project-mapping.html
+++ b/LayoutTests/inspector/sources/debugger/file-system-project-mapping.html
@@ -74,8 +74,9 @@ function test()
function callback(target)
{
manager = InspectorTest.createIsolatedFileSystemManager(InspectorTest.testWorkspace, InspectorTest.testFileSystemMapping);
- resourceScriptMapping = new WebInspector.ResourceScriptMapping(target.debuggerModel, InspectorTest.testWorkspace, InspectorTest.testDebuggerWorkspaceBinding);
- defaultScriptMapping = new WebInspector.DefaultScriptMapping(target.debuggerModel, InspectorTest.testWorkspace, InspectorTest.testDebuggerWorkspaceBinding);
+ var entry = InspectorTest.testDebuggerWorkspaceBinding._targetToData.get(target);
+ resourceScriptMapping = entry._resourceMapping;
+ defaultScriptMapping = entry._defaultMapping;
userCallback();
}
}
@@ -179,8 +180,9 @@ function test()
function step1()
{
+ InspectorTest._originalDebuggerBinding = WebInspector.debuggerWorkspaceBinding;
+ WebInspector.debuggerWorkspaceBinding = InspectorTest.testDebuggerWorkspaceBinding;
target = InspectorTest.testTargetManager.targets()[0];
- target._connection = WebInspector.targetManager.targets()[0];
WebInspector._originalTargetManager = WebInspector.targetManager;
WebInspector.targetManager = InspectorTest.testTargetManager;
InspectorTest.addResult("Adding file system.");
@@ -206,12 +208,12 @@ function test()
function didShowScriptSource(sourceFrame)
{
dumpUISourceCodeAndScriptContents();
- InspectorTest.addResult(" - hasDivergedFromVM: " + !!uiSourceCode.scriptFileForTarget(target).hasDivergedFromVM());
+ InspectorTest.addResult(" - hasDivergedFromVM: " + !!resourceScriptMapping.scriptFile(uiSourceCode).hasDivergedFromVM());
InspectorTest.addResult(" - sourceFrame._muted: " + !!sourceFrame._muted);
InspectorTest.addResult("Editing uiSourceCode:");
uiSourceCode.setWorkingCopy("<foo content edited>");
- InspectorTest.addResult(" - hasDivergedFromVM: " + !!uiSourceCode.scriptFileForTarget(target).hasDivergedFromVM());
+ InspectorTest.addResult(" - hasDivergedFromVM: " + !!resourceScriptMapping.scriptFile(uiSourceCode).hasDivergedFromVM());
InspectorTest.addResult(" - sourceFrame._muted: " + !!sourceFrame._muted);
function setScriptSourceOverrideFailure(scriptId, newContent, callback)
@@ -223,23 +225,23 @@ function test()
InspectorTest.addResult("Committing uiSourceCode with live edit failure:");
uiSourceCode.commitWorkingCopy(function() { });
dumpUISourceCodeAndScriptContents();
- InspectorTest.addResult(" - hasDivergedFromVM: " + !!uiSourceCode.scriptFileForTarget(target).hasDivergedFromVM());
+ InspectorTest.addResult(" - hasDivergedFromVM: " + !!resourceScriptMapping.scriptFile(uiSourceCode).hasDivergedFromVM());
InspectorTest.addResult(" - sourceFrame._muted: " + !!sourceFrame._muted);
InspectorTest.addResult("Reloading with saved but diverged uiSourceCode:");
unloadScript();
- InspectorTest.assertTrue(!uiSourceCode.scriptFileForTarget(target), "UISourceCode should not have script file after unloading scripts.");
+ InspectorTest.assertTrue(!resourceScriptMapping.scriptFile(uiSourceCode), "UISourceCode should not have script file after unloading scripts.");
InspectorTest.assertTrue(!sourceFrame._muted, "Saved but diverged source frame should not be muted");
InspectorTest.addResult("Loading script.");
loadScript();
dumpUISourceCodeAndScriptContents();
- InspectorTest.addResult(" - hasDivergedFromVM: " + !!uiSourceCode.scriptFileForTarget(target).hasDivergedFromVM());
+ InspectorTest.addResult(" - hasDivergedFromVM: " + !!resourceScriptMapping.scriptFile(uiSourceCode).hasDivergedFromVM());
InspectorTest.addResult(" - sourceFrame._muted: " + !!sourceFrame._muted);
InspectorTest.addResult("Editing uiSourceCode again:");
uiSourceCode.setWorkingCopy("<foo content edited again>");
- InspectorTest.addResult(" - hasDivergedFromVM: " + !!uiSourceCode.scriptFileForTarget(target).hasDivergedFromVM());
+ InspectorTest.addResult(" - hasDivergedFromVM: " + !!resourceScriptMapping.scriptFile(uiSourceCode).hasDivergedFromVM());
InspectorTest.addResult(" - sourceFrame._muted: " + !!sourceFrame._muted);
function setScriptSourceOverrideSuccess(scriptId, newContent, callback)
@@ -252,32 +254,33 @@ function test()
InspectorTest.addResult("Committing uiSourceCode again (with live edit success now):");
uiSourceCode.commitWorkingCopy(function() { });
dumpUISourceCodeAndScriptContents();
- InspectorTest.addResult(" - hasDivergedFromVM: " + !!uiSourceCode.scriptFileForTarget(target).hasDivergedFromVM());
+ InspectorTest.addResult(" - hasDivergedFromVM: " + !!resourceScriptMapping.scriptFile(uiSourceCode).hasDivergedFromVM());
InspectorTest.addResult(" - sourceFrame._muted: " + !!sourceFrame._muted);
InspectorTest.addResult("Reloading page:");
unloadScript();
- InspectorTest.assertTrue(!uiSourceCode.scriptFileForTarget(target), "UISourceCode should not have script file after unloading scripts.");
+ InspectorTest.assertTrue(!resourceScriptMapping.scriptFile(uiSourceCode), "UISourceCode should not have script file after unloading scripts.");
InspectorTest.assertTrue(!sourceFrame._muted, "Saved and merged source frame should not be muted");
InspectorTest.addResult("Loading script.");
loadScript();
- InspectorTest.addResult(" - hasDivergedFromVM: " + !!uiSourceCode.scriptFileForTarget(target).hasDivergedFromVM());
+ InspectorTest.addResult(" - hasDivergedFromVM: " + !!resourceScriptMapping.scriptFile(uiSourceCode).hasDivergedFromVM());
InspectorTest.addResult(" - sourceFrame._muted: " + !!sourceFrame._muted);
InspectorTest.addResult("Editing uiSourceCode again and reloading while it is dirty:");
uiSourceCode.setWorkingCopy("<foo content edited and dirty>");
unloadScript();
- InspectorTest.assertTrue(!uiSourceCode.scriptFileForTarget(target), "UISourceCode should not have script file after unloading scripts.");
+ InspectorTest.assertTrue(!resourceScriptMapping.scriptFile(uiSourceCode), "UISourceCode should not have script file after unloading scripts.");
InspectorTest.assertTrue(sourceFrame._muted, "Dirty source frame should be muted");
InspectorTest.addResult("Loading script.");
loadScript();
- InspectorTest.addResult(" - hasDivergedFromVM: " + !!uiSourceCode.scriptFileForTarget(target).hasDivergedFromVM());
+ InspectorTest.addResult(" - hasDivergedFromVM: " + !!resourceScriptMapping.scriptFile(uiSourceCode).hasDivergedFromVM());
InspectorTest.addResult(" - sourceFrame._muted: " + !!sourceFrame._muted);
unloadScript();
loadScript;
InspectorTest.testFileSystemMapping.removeFileMapping(fileSystemPath, "http://localhost/", "/");
+ WebInspector.debuggerWorkspaceBinding = InspectorTest._originalDebuggerBinding;
next();
}
},
« no previous file with comments | « LayoutTests/inspector/sources/debugger/breakpoint-manager.js ('k') | LayoutTests/inspector/sources/debugger/multi-target-breakpoint-manager.html » ('j') | Source/devtools/front_end/sdk/DebuggerWorkspaceBinding.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698