Diff
Modified: trunk/LayoutTests/ChangeLog (139413 => 139414)
--- trunk/LayoutTests/ChangeLog 2013-01-11 08:33:06 UTC (rev 139413)
+++ trunk/LayoutTests/ChangeLog 2013-01-11 08:37:07 UTC (rev 139414)
@@ -1,3 +1,14 @@
+2013-01-11 Vsevolod Vlasov <[email protected]>
+
+ Web Inspector: Refactoring, move NetworkWorkspaceProvider to NetworkUISourceCodeProvider.js and rename its parent to SimpleWorkspaceProvider.
+ https://bugs.webkit.org/show_bug.cgi?id=106635
+
+ Reviewed by Pavel Feldman.
+
+ * http/tests/inspector/compiler-script-mapping.html:
+ * inspector/debugger/resource-script-mapping.html:
+ * inspector/debugger/scripts-panel.html:
+
2013-01-10 Grzegorz Czajkowski <[email protected]>
On Linux, should be able to get spelling suggestions without selecting the misspelled word
Modified: trunk/LayoutTests/http/tests/inspector/compiler-script-mapping.html (139413 => 139414)
--- trunk/LayoutTests/http/tests/inspector/compiler-script-mapping.html 2013-01-11 08:33:06 UTC (rev 139413)
+++ trunk/LayoutTests/http/tests/inspector/compiler-script-mapping.html 2013-01-11 08:37:07 UTC (rev 139414)
@@ -16,7 +16,7 @@
InspectorTest.createWorkspace();
var compilerScriptMapping = new WebInspector.CompilerScriptMapping(InspectorTest.testWorkspace, InspectorTest.testNetworkWorkspaceProvider);
resourceScriptMapping = new WebInspector.ResourceScriptMapping(InspectorTest.testWorkspace);
- defaultScriptMapping = new WebInspector.DefaultScriptMapping(InspectorTest.testWorkspace, InspectorTest.testDebuggerWorkspaceProvider);
+ defaultScriptMapping = new WebInspector.DefaultScriptMapping(InspectorTest.testWorkspace);
return compilerScriptMapping;
}
@@ -313,7 +313,7 @@
var workspace = new WebInspector.Workspace();
var debuggerWorkspaceProvider = new WebInspector.DebuggerWorkspaceProvider(workspace);
workspace.addProject("network", networkWorkspaceProvider);
- var debuggerScriptMapping = new WebInspector.DebuggerScriptMapping(workspace, debuggerWorkspaceProvider, networkWorkspaceProvider);
+ var debuggerScriptMapping = new WebInspector.DebuggerScriptMapping(workspace, networkWorkspaceProvider);
var script = InspectorTest.createScriptMock("compiled.js", 0, 0, true, "");
script.sourceMapURL = "http://localhost:8000/inspector/resources/source-map.json_";
Modified: trunk/LayoutTests/inspector/debugger/resource-script-mapping.html (139413 => 139414)
--- trunk/LayoutTests/inspector/debugger/resource-script-mapping.html 2013-01-11 08:33:06 UTC (rev 139413)
+++ trunk/LayoutTests/inspector/debugger/resource-script-mapping.html 2013-01-11 08:37:07 UTC (rev 139414)
@@ -11,7 +11,7 @@
function createResourceScriptMapping()
{
InspectorTest.createWorkspace();
- defaultScriptMapping = new WebInspector.DefaultScriptMapping(InspectorTest.testWorkspace, InspectorTest.testDebuggerWorkspaceProvider);
+ defaultScriptMapping = new WebInspector.DefaultScriptMapping(InspectorTest.testWorkspace);
var resourceScriptMapping = new WebInspector.ResourceScriptMapping(InspectorTest.testWorkspace);
return resourceScriptMapping;
}
Modified: trunk/LayoutTests/inspector/debugger/scripts-panel.html (139413 => 139414)
--- trunk/LayoutTests/inspector/debugger/scripts-panel.html 2013-01-11 08:33:06 UTC (rev 139413)
+++ trunk/LayoutTests/inspector/debugger/scripts-panel.html 2013-01-11 08:37:07 UTC (rev 139414)
@@ -19,10 +19,10 @@
function createMockWorkspace()
{
+ var workspace = new WebInspector.Workspace();
var networkWorkspaceProvider = new WebInspector.NetworkWorkspaceProvider();
- var workspace = new WebInspector.Workspace();
+ workspace.addProject("network", networkWorkspaceProvider);
workspace.debuggerWorkspaceProvider = new WebInspector.DebuggerWorkspaceProvider(workspace);
- workspace.addProject("network", networkWorkspaceProvider);
workspace.requestFileContent = function(uiSourceCode, callback)
{
InspectorTest.addResult("Source requested for " + uiSourceCode.url);
Modified: trunk/Source/WebCore/ChangeLog (139413 => 139414)
--- trunk/Source/WebCore/ChangeLog 2013-01-11 08:33:06 UTC (rev 139413)
+++ trunk/Source/WebCore/ChangeLog 2013-01-11 08:37:07 UTC (rev 139414)
@@ -1,3 +1,42 @@
+2013-01-11 Vsevolod Vlasov <[email protected]>
+
+ Web Inspector: Refactoring, move NetworkWorkspaceProvider to NetworkUISourceCodeProvider.js and rename its parent to SimpleWorkspaceProvider.
+ https://bugs.webkit.org/show_bug.cgi?id=106635
+
+ Reviewed by Pavel Feldman.
+
+ * WebCore.gypi:
+ * WebCore.vcproj/WebCore.vcproj:
+ * inspector/compile-front-end.py:
+ * inspector/front-end/DebuggerScriptMapping.js:
+ (WebInspector.DebuggerScriptMapping):
+ * inspector/front-end/DefaultScriptMapping.js:
+ (WebInspector.DefaultScriptMapping):
+ (WebInspector.DefaultScriptMapping.prototype.addScript):
+ (WebInspector.DebuggerWorkspaceProvider):
+ (WebInspector.DebuggerWorkspaceProvider.prototype.addDebuggerFile):
+ * inspector/front-end/LiveEditSupport.js:
+ (WebInspector.LiveEditSupport):
+ (WebInspector.LiveEditSupport.prototype.uiSourceCodeForLiveEdit):
+ (WebInspector.LiveEditWorkspaceProvider):
+ (WebInspector.LiveEditWorkspaceProvider.prototype.addLiveEditFile):
+ * inspector/front-end/NetworkUISourceCodeProvider.js:
+ (WebInspector.NetworkWorkspaceProvider):
+ (WebInspector.NetworkWorkspaceProvider.prototype.addNetworkFile):
+ * inspector/front-end/SimpleWorkspaceProvider.js: Renamed from Source/WebCore/inspector/front-end/NetworkWorkspaceProvider.js.
+ (WebInspector.SimpleWorkspaceProvider):
+ (WebInspector.SimpleWorkspaceProvider.uriForURL):
+ (WebInspector.SimpleWorkspaceProvider.prototype.requestFileContent):
+ (WebInspector.SimpleWorkspaceProvider.prototype.setFileContent):
+ (WebInspector.SimpleWorkspaceProvider.prototype.searchInFileContent):
+ (WebInspector.SimpleWorkspaceProvider.prototype.addFile):
+ (WebInspector.SimpleWorkspaceProvider.prototype.removeFile):
+ (WebInspector.SimpleWorkspaceProvider.prototype.uniqueURI):
+ (WebInspector.SimpleWorkspaceProvider.prototype.reset):
+ * inspector/front-end/WebKit.qrc:
+ * inspector/front-end/inspector.html:
+ * inspector/front-end/inspector.js:
+
2013-01-10 Grzegorz Czajkowski <[email protected]>
On Linux, should be able to get spelling suggestions without selecting the misspelled word
Modified: trunk/Source/WebCore/WebCore.gypi (139413 => 139414)
--- trunk/Source/WebCore/WebCore.gypi 2013-01-11 08:33:06 UTC (rev 139413)
+++ trunk/Source/WebCore/WebCore.gypi 2013-01-11 08:37:07 UTC (rev 139414)
@@ -5170,7 +5170,6 @@
'inspector/front-end/NetworkLog.js',
'inspector/front-end/NetworkPanelDescriptor.js',
'inspector/front-end/NetworkRequest.js',
- 'inspector/front-end/NetworkWorkspaceProvider.js',
'inspector/front-end/NetworkUISourceCodeProvider.js',
'inspector/front-end/Object.js',
'inspector/front-end/ObjectPopoverHelper.js',
@@ -5200,15 +5199,16 @@
'inspector/front-end/ScriptSnippetModel.js',
'inspector/front-end/ScriptsPanelDescriptor.js',
'inspector/front-end/SearchController.js',
- 'inspector/front-end/ShortcutsScreen.js',
'inspector/front-end/SettingsScreen.js',
- 'inspector/front-end/ShowMoreDataGridNode.js',
'inspector/front-end/Section.js',
'inspector/front-end/Settings.js',
+ 'inspector/front-end/ShortcutsScreen.js',
+ 'inspector/front-end/ShowMoreDataGridNode.js',
'inspector/front-end/SidebarOverlay.js',
'inspector/front-end/SidebarPane.js',
'inspector/front-end/SidebarView.js',
'inspector/front-end/SidebarTreeElement.js',
+ 'inspector/front-end/SimpleWorkspaceProvider.js',
'inspector/front-end/SnippetStorage.js',
'inspector/front-end/SoftContextMenu.js',
'inspector/front-end/SourceCSSTokenizer.js',
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (139413 => 139414)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2013-01-11 08:33:06 UTC (rev 139413)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2013-01-11 08:37:07 UTC (rev 139414)
@@ -76961,10 +76961,6 @@
>
</File>
<File
- RelativePath="..\inspector\front-end\NetworkWorkspaceProvider.js"
- >
- </File>
- <File
RelativePath="..\inspector\front-end\Object.js"
>
</File>
@@ -77221,6 +77217,10 @@
>
</File>
<File
+ RelativePath="..\inspector\front-end\SimpleWorkspaceProvider.js"
+ >
+ </File>
+ <File
RelativePath="..\inspector\front-end\SnippetJavaScriptSourceFrame.js"
>
</File>
Modified: trunk/Source/WebCore/inspector/compile-front-end.py (139413 => 139414)
--- trunk/Source/WebCore/inspector/compile-front-end.py 2013-01-11 08:33:06 UTC (rev 139413)
+++ trunk/Source/WebCore/inspector/compile-front-end.py 2013-01-11 08:37:07 UTC (rev 139414)
@@ -84,13 +84,13 @@
"Linkifier.js",
"NetworkLog.js",
"NetworkUISourceCodeProvider.js",
- "NetworkWorkspaceProvider.js",
"PresentationConsoleMessageHelper.js",
"RuntimeModel.js",
"SASSSourceMapping.js",
"Script.js",
"ScriptFormatter.js",
"ScriptSnippetModel.js",
+ "SimpleWorkspaceProvider.js",
"SnippetStorage.js",
"SourceMapping.js",
"StylesSourceMapping.js",
Modified: trunk/Source/WebCore/inspector/front-end/DebuggerScriptMapping.js (139413 => 139414)
--- trunk/Source/WebCore/inspector/front-end/DebuggerScriptMapping.js 2013-01-11 08:33:06 UTC (rev 139413)
+++ trunk/Source/WebCore/inspector/front-end/DebuggerScriptMapping.js 2013-01-11 08:37:07 UTC (rev 139414)
@@ -31,12 +31,11 @@
/**
* @constructor
* @param {WebInspector.Workspace} workspace
- * @param {WebInspector.DebuggerWorkspaceProvider} debuggerWorkspaceProvider
* @param {WebInspector.NetworkWorkspaceProvider} networkWorkspaceProvider
*/
-WebInspector.DebuggerScriptMapping = function(workspace, debuggerWorkspaceProvider, networkWorkspaceProvider)
+WebInspector.DebuggerScriptMapping = function(workspace, networkWorkspaceProvider)
{
- this._defaultMapping = new WebInspector.DefaultScriptMapping(workspace, debuggerWorkspaceProvider);
+ this._defaultMapping = new WebInspector.DefaultScriptMapping(workspace);
this._resourceMapping = new WebInspector.ResourceScriptMapping(workspace);
this._compilerMapping = new WebInspector.CompilerScriptMapping(workspace, networkWorkspaceProvider);
this._snippetMapping = WebInspector.scriptSnippetModel.scriptMapping;
Modified: trunk/Source/WebCore/inspector/front-end/DefaultScriptMapping.js (139413 => 139414)
--- trunk/Source/WebCore/inspector/front-end/DefaultScriptMapping.js 2013-01-11 08:33:06 UTC (rev 139413)
+++ trunk/Source/WebCore/inspector/front-end/DefaultScriptMapping.js 2013-01-11 08:37:07 UTC (rev 139414)
@@ -32,12 +32,11 @@
* @constructor
* @implements {WebInspector.ScriptSourceMapping}
* @param {WebInspector.Workspace} workspace
- * @param {WebInspector.DebuggerWorkspaceProvider} debuggerWorkspaceProvider
*/
-WebInspector.DefaultScriptMapping = function(workspace, debuggerWorkspaceProvider)
+WebInspector.DefaultScriptMapping = function(workspace)
{
this._workspace = workspace;
- this._debuggerWorkspaceProvider = debuggerWorkspaceProvider;
+ this._workspaceProvider = new WebInspector.DebuggerWorkspaceProvider(workspace);
this._workspace.addEventListener(WebInspector.Workspace.Events.ProjectWillReset, this._reset, this);
this._reset();
}
@@ -76,7 +75,7 @@
addScript: function(script)
{
var contentProvider = script.isInlineScript() ? new WebInspector.ConcatenatedScriptsContentProvider([script]) : script;
- var uiSourceCode = this._debuggerWorkspaceProvider.addDebuggerFile(script.sourceURL, contentProvider, false);
+ var uiSourceCode = this._workspaceProvider.addDebuggerFile(script.sourceURL, contentProvider, false);
this._uiSourceCodeForScriptId[script.scriptId] = uiSourceCode;
this._scriptIdForUISourceCode.put(uiSourceCode, script.scriptId);
uiSourceCode.setSourceMapping(this);
@@ -105,11 +104,11 @@
/**
* @constructor
- * @extends {WebInspector.ContentProviderWorkspaceProvider}
+ * @extends {WebInspector.SimpleWorkspaceProvider}
*/
WebInspector.DebuggerWorkspaceProvider = function(workspace)
{
- WebInspector.ContentProviderWorkspaceProvider.call(this);
+ WebInspector.SimpleWorkspaceProvider.call(this);
this._workspace = workspace;
}
@@ -122,7 +121,7 @@
*/
addDebuggerFile: function(url, contentProvider, isEditable)
{
- var uri = "debugger:" + WebInspector.ContentProviderWorkspaceProvider.uriForURL(url);
+ var uri = "debugger:" + WebInspector.SimpleWorkspaceProvider.uriForURL(url);
var uniqueURI = this.uniqueURI(uri);
var uiSourceCode = this._workspace.addTemporaryUISourceCode(uniqueURI, url, contentProvider, isEditable);
// FIXME: this is a temporary hack to be removed once DefaultScriptMapping uiSourceCode become part of the workspace.
@@ -130,7 +129,7 @@
return uiSourceCode;
},
- __proto__: WebInspector.ContentProviderWorkspaceProvider.prototype
+ __proto__: WebInspector.SimpleWorkspaceProvider.prototype
}
/**
Modified: trunk/Source/WebCore/inspector/front-end/LiveEditSupport.js (139413 => 139414)
--- trunk/Source/WebCore/inspector/front-end/LiveEditSupport.js 2013-01-11 08:33:06 UTC (rev 139413)
+++ trunk/Source/WebCore/inspector/front-end/LiveEditSupport.js 2013-01-11 08:37:07 UTC (rev 139414)
@@ -35,7 +35,7 @@
WebInspector.LiveEditSupport = function(workspace)
{
this._workspace = workspace;
- this._liveEditWorkspaceProvider = new WebInspector.LiveEditWorkspaceProvider(workspace);
+ this._workspaceProvider = new WebInspector.LiveEditWorkspaceProvider(workspace);
this._workspace.addEventListener(WebInspector.Workspace.Events.ProjectWillReset, this._reset, this);
this._reset();
}
@@ -59,8 +59,7 @@
return this._uiSourceCodeForScriptId[script.scriptId];
console.assert(!script.isInlineScript());
- var uri = uiSourceCode.uri();
- var liveEditUISourceCode = this._liveEditWorkspaceProvider.addLiveEditFile(uiSourceCode.url, script, true);
+ var liveEditUISourceCode = this._workspaceProvider.addLiveEditFile(uiSourceCode.url, script, true);
liveEditUISourceCode.setScriptFile(new WebInspector.LiveEditScriptFile(uiSourceCode, liveEditUISourceCode, script.scriptId));
this._uiSourceCodeForScriptId[script.scriptId] = liveEditUISourceCode;
this._scriptIdForUISourceCode.put(liveEditUISourceCode, script.scriptId);
@@ -134,11 +133,11 @@
/**
* @constructor
- * @extends {WebInspector.ContentProviderWorkspaceProvider}
+ * @extends {WebInspector.SimpleWorkspaceProvider}
*/
WebInspector.LiveEditWorkspaceProvider = function(workspace)
{
- WebInspector.ContentProviderWorkspaceProvider.call(this);
+ WebInspector.SimpleWorkspaceProvider.call(this);
this._workspace = workspace;
}
@@ -151,12 +150,12 @@
*/
addLiveEditFile: function(url, contentProvider, isEditable)
{
- var uri = "liveedit:" + WebInspector.ContentProviderWorkspaceProvider.uriForURL(url);
+ var uri = "liveedit:" + WebInspector.SimpleWorkspaceProvider.uriForURL(url);
var uniqueURI = this.uniqueURI(uri);
// FIXME: this is a temporary hack to be removed once LiveEdit uiSourceCode become part of the workspace.
this._contentProviders[uniqueURI] = null;
return this._workspace.addTemporaryUISourceCode(uniqueURI, url, contentProvider, isEditable);
},
- __proto__: WebInspector.ContentProviderWorkspaceProvider.prototype
+ __proto__: WebInspector.SimpleWorkspaceProvider.prototype
}
Modified: trunk/Source/WebCore/inspector/front-end/NetworkUISourceCodeProvider.js (139413 => 139414)
--- trunk/Source/WebCore/inspector/front-end/NetworkUISourceCodeProvider.js 2013-01-11 08:33:06 UTC (rev 139413)
+++ trunk/Source/WebCore/inspector/front-end/NetworkUISourceCodeProvider.js 2013-01-11 08:37:07 UTC (rev 139414)
@@ -31,7 +31,7 @@
/**
* @constructor
* @param {WebInspector.Workspace} workspace
- * @param {WebInspector.NetworkWorkspaceProvider} networkWorkspaceProvider
+ * @param {WebInspector.SimpleWorkspaceProvider} networkWorkspaceProvider
*/
WebInspector.NetworkUISourceCodeProvider = function(workspace, networkWorkspaceProvider)
{
@@ -128,3 +128,34 @@
this._populate();
}
}
+
+/**
+ * @constructor
+ * @extends {WebInspector.SimpleWorkspaceProvider}
+ */
+WebInspector.NetworkWorkspaceProvider = function()
+{
+ WebInspector.SimpleWorkspaceProvider.call(this);
+}
+
+WebInspector.NetworkWorkspaceProvider.prototype = {
+ /**
+ * @param {string} url
+ * @param {WebInspector.ContentProvider} contentProvider
+ * @param {boolean} isEditable
+ * @param {boolean=} isContentScript
+ * @param {boolean=} isSnippet
+ */
+ addNetworkFile: function(url, contentProvider, isEditable, isContentScript, isSnippet)
+ {
+ var uri = WebInspector.SimpleWorkspaceProvider.uriForURL(url);
+ this.addFile(uri, url, contentProvider, isEditable, isContentScript, isSnippet);
+ },
+
+ __proto__: WebInspector.SimpleWorkspaceProvider.prototype
+}
+
+/**
+ * @type {?WebInspector.NetworkWorkspaceProvider}
+ */
+WebInspector.networkWorkspaceProvider = null;
Deleted: trunk/Source/WebCore/inspector/front-end/NetworkWorkspaceProvider.js (139413 => 139414)
--- trunk/Source/WebCore/inspector/front-end/NetworkWorkspaceProvider.js 2013-01-11 08:33:06 UTC (rev 139413)
+++ trunk/Source/WebCore/inspector/front-end/NetworkWorkspaceProvider.js 2013-01-11 08:37:07 UTC (rev 139414)
@@ -1,159 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/**
- * @constructor
- * @implements {WebInspector.WorkspaceProvider}
- * @extends {WebInspector.Object}
- */
-WebInspector.ContentProviderWorkspaceProvider = function()
-{
- /** @type {Object.<string, WebInspector.ContentProvider>} */
- this._contentProviders = {};
-}
-
-/**
- * @param {string} url
- * @return {string}
- */
-WebInspector.ContentProviderWorkspaceProvider.uriForURL = function(url)
-{
- var uri = url;
- return uri;
-},
-
-WebInspector.ContentProviderWorkspaceProvider.prototype = {
- /**
- * @param {string} uri
- * @param {function(?string,boolean,string)} callback
- */
- requestFileContent: function(uri, callback)
- {
- var contentProvider = this._contentProviders[uri];
- contentProvider.requestContent(callback);
- },
-
- /**
- * @param {string} uri
- * @param {string} newContent
- * @param {function(?string)} callback
- */
- setFileContent: function(uri, newContent, callback)
- {
- callback(null);
- },
-
- /**
- * @param {string} query
- * @param {boolean} caseSensitive
- * @param {boolean} isRegex
- * @param {function(Array.<WebInspector.ContentProvider.SearchMatch>)} callback
- */
- searchInFileContent: function(uri, query, caseSensitive, isRegex, callback)
- {
- var contentProvider = this._contentProviders[uri];
- contentProvider.searchInContent(query, caseSensitive, isRegex, callback);
- },
-
- /**
- * @param {string} uri
- * @param {string} url
- * @param {WebInspector.ContentProvider} contentProvider
- * @param {boolean} isEditable
- * @param {boolean=} isContentScript
- * @param {boolean=} isSnippet
- */
- addFile: function(uri, url, contentProvider, isEditable, isContentScript, isSnippet)
- {
- console.assert(!this._contentProviders[uri]);
- var fileDescriptor = new WebInspector.FileDescriptor(uri, url, contentProvider.contentType(), isEditable, isContentScript, isSnippet);
- this._contentProviders[uri] = contentProvider;
- this.dispatchEventToListeners(WebInspector.WorkspaceProvider.Events.FileAdded, fileDescriptor);
- },
-
- /**
- * @param {string} uri
- */
- removeFile: function(uri)
- {
- delete this._contentProviders[uri];
- this.dispatchEventToListeners(WebInspector.WorkspaceProvider.Events.FileRemoved, uri);
- },
-
- /**
- * @param {string} uri
- * @return {string}
- */
- uniqueURI: function(uri)
- {
- var uniqueURI = uri;
- for (var i = 1; this._contentProviders[uniqueURI]; ++i)
- uniqueURI = uri + " (" + i + ")";
- return uniqueURI;
- },
-
- reset: function()
- {
- this._contentProviders = {};
- },
-
- __proto__: WebInspector.Object.prototype
-}
-
-/**
- * @constructor
- * @extends {WebInspector.ContentProviderWorkspaceProvider}
- */
-WebInspector.NetworkWorkspaceProvider = function()
-{
- WebInspector.ContentProviderWorkspaceProvider.call(this);
-}
-
-WebInspector.NetworkWorkspaceProvider.prototype = {
- /**
- * @param {string} url
- * @param {WebInspector.ContentProvider} contentProvider
- * @param {boolean} isEditable
- * @param {boolean=} isContentScript
- * @param {boolean=} isSnippet
- */
- addNetworkFile: function(url, contentProvider, isEditable, isContentScript, isSnippet)
- {
- var uri = WebInspector.ContentProviderWorkspaceProvider.uriForURL(url);
- this.addFile(uri, url, contentProvider, isEditable, isContentScript, isSnippet);
- },
-
- __proto__: WebInspector.ContentProviderWorkspaceProvider.prototype
-}
-
-/**
- * @type {?WebInspector.NetworkWorkspaceProvider}
- */
-WebInspector.networkWorkspaceProvider = null;
Copied: trunk/Source/WebCore/inspector/front-end/SimpleWorkspaceProvider.js (from rev 139413, trunk/Source/WebCore/inspector/front-end/NetworkWorkspaceProvider.js) (0 => 139414)
--- trunk/Source/WebCore/inspector/front-end/SimpleWorkspaceProvider.js (rev 0)
+++ trunk/Source/WebCore/inspector/front-end/SimpleWorkspaceProvider.js 2013-01-11 08:37:07 UTC (rev 139414)
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2012 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * @constructor
+ * @implements {WebInspector.WorkspaceProvider}
+ * @extends {WebInspector.Object}
+ */
+WebInspector.SimpleWorkspaceProvider = function()
+{
+ /** @type {Object.<string, WebInspector.ContentProvider>} */
+ this._contentProviders = {};
+}
+
+/**
+ * @param {string} url
+ * @return {string}
+ */
+WebInspector.SimpleWorkspaceProvider.uriForURL = function(url)
+{
+ var uri = url;
+ return uri;
+},
+
+WebInspector.SimpleWorkspaceProvider.prototype = {
+ /**
+ * @param {string} uri
+ * @param {function(?string,boolean,string)} callback
+ */
+ requestFileContent: function(uri, callback)
+ {
+ var contentProvider = this._contentProviders[uri];
+ contentProvider.requestContent(callback);
+ },
+
+ /**
+ * @param {string} uri
+ * @param {string} newContent
+ * @param {function(?string)} callback
+ */
+ setFileContent: function(uri, newContent, callback)
+ {
+ callback(null);
+ },
+
+ /**
+ * @param {string} query
+ * @param {boolean} caseSensitive
+ * @param {boolean} isRegex
+ * @param {function(Array.<WebInspector.ContentProvider.SearchMatch>)} callback
+ */
+ searchInFileContent: function(uri, query, caseSensitive, isRegex, callback)
+ {
+ var contentProvider = this._contentProviders[uri];
+ contentProvider.searchInContent(query, caseSensitive, isRegex, callback);
+ },
+
+ /**
+ * @param {string} uri
+ * @param {string} url
+ * @param {WebInspector.ContentProvider} contentProvider
+ * @param {boolean} isEditable
+ * @param {boolean=} isContentScript
+ * @param {boolean=} isSnippet
+ */
+ addFile: function(uri, url, contentProvider, isEditable, isContentScript, isSnippet)
+ {
+ console.assert(!this._contentProviders[uri]);
+ var fileDescriptor = new WebInspector.FileDescriptor(uri, url, contentProvider.contentType(), isEditable, isContentScript, isSnippet);
+ this._contentProviders[uri] = contentProvider;
+ this.dispatchEventToListeners(WebInspector.WorkspaceProvider.Events.FileAdded, fileDescriptor);
+ },
+
+ /**
+ * @param {string} uri
+ */
+ removeFile: function(uri)
+ {
+ delete this._contentProviders[uri];
+ this.dispatchEventToListeners(WebInspector.WorkspaceProvider.Events.FileRemoved, uri);
+ },
+
+ /**
+ * @param {string} uri
+ * @return {string}
+ */
+ uniqueURI: function(uri)
+ {
+ var uniqueURI = uri;
+ for (var i = 1; this._contentProviders[uniqueURI]; ++i)
+ uniqueURI = uri + " (" + i + ")";
+ return uniqueURI;
+ },
+
+ reset: function()
+ {
+ this._contentProviders = {};
+ },
+
+ __proto__: WebInspector.Object.prototype
+}
Property changes: trunk/Source/WebCore/inspector/front-end/SimpleWorkspaceProvider.js
Added: svn:eol-style
Modified: trunk/Source/WebCore/inspector/front-end/WebKit.qrc (139413 => 139414)
--- trunk/Source/WebCore/inspector/front-end/WebKit.qrc 2013-01-11 08:33:06 UTC (rev 139413)
+++ trunk/Source/WebCore/inspector/front-end/WebKit.qrc 2013-01-11 08:37:07 UTC (rev 139414)
@@ -120,7 +120,6 @@
<file>NetworkPanelDescriptor.js</file>
<file>NetworkRequest.js</file>
<file>NetworkUISourceCodeProvider.js</file>
- <file>NetworkWorkspaceProvider.js</file>
<file>Object.js</file>
<file>ObjectPopoverHelper.js</file>
<file>ObjectPropertiesSection.js</file>
@@ -177,6 +176,7 @@
<file>SidebarPane.js</file>
<file>SidebarTreeElement.js</file>
<file>SidebarView.js</file>
+ <file>SimpleWorkspaceProvider.js</file>
<file>SnippetJavaScriptSourceFrame.js</file>
<file>SnippetStorage.js</file>
<file>SoftContextMenu.js</file>
Modified: trunk/Source/WebCore/inspector/front-end/inspector.html (139413 => 139414)
--- trunk/Source/WebCore/inspector/front-end/inspector.html 2013-01-11 08:33:06 UTC (rev 139413)
+++ trunk/Source/WebCore/inspector/front-end/inspector.html 2013-01-11 08:37:07 UTC (rev 139414)
@@ -137,8 +137,8 @@
<script type="text/_javascript_" src=""
<script type="text/_javascript_" src=""
<script type="text/_javascript_" src=""
- <script type="text/_javascript_" src=""
<script type="text/_javascript_" src=""
+ <script type="text/_javascript_" src=""
<script type="text/_javascript_" src=""
<script type="text/_javascript_" src=""
<script type="text/_javascript_" src=""
Modified: trunk/Source/WebCore/inspector/front-end/inspector.js (139413 => 139414)
--- trunk/Source/WebCore/inspector/front-end/inspector.js 2013-01-11 08:33:06 UTC (rev 139413)
+++ trunk/Source/WebCore/inspector/front-end/inspector.js 2013-01-11 08:37:07 UTC (rev 139414)
@@ -430,16 +430,15 @@
this.openAnchorLocationRegistry = new WebInspector.HandlerRegistry(openAnchorLocationSetting);
this.openAnchorLocationRegistry.registerHandler(autoselectPanel, function() { return false; });
- this.networkWorkspaceProvider = new WebInspector.NetworkWorkspaceProvider();
this.workspace = new WebInspector.Workspace();
- this.debuggerWorkspaceProvider = new WebInspector.DebuggerWorkspaceProvider(this.workspace);
+ this.networkWorkspaceProvider = new WebInspector.NetworkWorkspaceProvider();
this.workspace.addProject("network", this.networkWorkspaceProvider);
this.workspaceController = new WebInspector.WorkspaceController(this.workspace);
this.breakpointManager = new WebInspector.BreakpointManager(WebInspector.settings.breakpoints, this.debuggerModel, this.workspace);
this.scriptSnippetModel = new WebInspector.ScriptSnippetModel(this.workspace, this.networkWorkspaceProvider);
- new WebInspector.DebuggerScriptMapping(this.workspace, this.debuggerWorkspaceProvider, this.networkWorkspaceProvider);
+ new WebInspector.DebuggerScriptMapping(this.workspace, this.networkWorkspaceProvider);
this.liveEditSupport = new WebInspector.LiveEditSupport(this.workspace);
this.styleContentBinding = new WebInspector.StyleContentBinding(this.cssModel);
new WebInspector.NetworkUISourceCodeProvider(this.workspace, this.networkWorkspaceProvider);
