Diff
Modified: trunk/Source/WebCore/ChangeLog (121777 => 121778)
--- trunk/Source/WebCore/ChangeLog 2012-07-03 16:22:10 UTC (rev 121777)
+++ trunk/Source/WebCore/ChangeLog 2012-07-03 16:29:06 UTC (rev 121778)
@@ -1,3 +1,29 @@
+2012-07-03 Vsevolod Vlasov <[email protected]>
+
+ Web Inspector: Introduce Workspace make it UISourceCode provider for ScriptsPanel.
+ https://bugs.webkit.org/show_bug.cgi?id=90466
+
+ Reviewed by Pavel Feldman.
+
+ Introduced WebInspector.Workspace as a model (UISourceCode provider) behind ScriptsPanel.
+
+ * WebCore.gypi:
+ * WebCore.vcproj/WebCore.vcproj:
+ * inspector/compile-front-end.py:
+ * inspector/front-end/ScriptsPanel.js:
+ * inspector/front-end/WebKit.qrc:
+ * inspector/front-end/Workspace.js: Added.
+ (WebInspector.CompositeUISourceCodeProvider):
+ (WebInspector.CompositeUISourceCodeProvider.prototype._registerUISourceCodeProvider):
+ (WebInspector.CompositeUISourceCodeProvider.prototype._handleUISourceCodeAdded):
+ (WebInspector.CompositeUISourceCodeProvider.prototype._handleUISourceCodeReplaced):
+ (WebInspector.CompositeUISourceCodeProvider.prototype._handleUISourceCodeRemoved):
+ (WebInspector.CompositeUISourceCodeProvider.prototype.uiSourceCodes):
+ (WebInspector.Workspace):
+ (WebInspector.Workspace.prototype.registerUISourceCodeProvider):
+ * inspector/front-end/inspector.html:
+ * inspector/front-end/inspector.js:
+
2012-07-03 Tor Arne Vestbø <[email protected]>
[Qt] Make use of .qmake.cache for caching features
Modified: trunk/Source/WebCore/WebCore.gypi (121777 => 121778)
--- trunk/Source/WebCore/WebCore.gypi 2012-07-03 16:22:10 UTC (rev 121777)
+++ trunk/Source/WebCore/WebCore.gypi 2012-07-03 16:29:06 UTC (rev 121778)
@@ -6406,6 +6406,7 @@
'inspector/front-end/WatchExpressionsSidebarPane.js',
'inspector/front-end/WorkerManager.js',
'inspector/front-end/WorkersSidebarPane.js',
+ 'inspector/front-end/Workspace.js',
'inspector/front-end/dialog.css',
'inspector/front-end/inspector.css',
'inspector/front-end/inspectorSyntaxHighlight.css',
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (121777 => 121778)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-07-03 16:22:10 UTC (rev 121777)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-07-03 16:29:06 UTC (rev 121778)
@@ -75545,6 +75545,10 @@
RelativePath="..\inspector\front-end\WorkersSidebarPane.js"
>
</File>
+ <File
+ RelativePath="..\inspector\front-end\Workspace.js"
+ >
+ </File>
</Filter>
</Filter>
<Filter
Modified: trunk/Source/WebCore/inspector/compile-front-end.py (121777 => 121778)
--- trunk/Source/WebCore/inspector/compile-front-end.py 2012-07-03 16:22:10 UTC (rev 121777)
+++ trunk/Source/WebCore/inspector/compile-front-end.py 2012-07-03 16:29:06 UTC (rev 121778)
@@ -106,6 +106,7 @@
"NetworkRequest.js",
"UISourceCode.js",
"UserAgentSupport.js",
+ "Workspace.js",
]
},
{
Modified: trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js (121777 => 121778)
--- trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js 2012-07-03 16:22:10 UTC (rev 121777)
+++ trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js 2012-07-03 16:29:06 UTC (rev 121778)
@@ -29,7 +29,7 @@
* @implements {WebInspector.TabbedEditorContainerDelegate}
* @implements {WebInspector.ContextMenu.Provider}
* @extends {WebInspector.Panel}
- * @param {WebInspector.CompositeUISourceCodeProvider=} uiSourceCodeProviderForTest
+ * @param {WebInspector.UISourceCodeProvider=} uiSourceCodeProviderForTest
*/
WebInspector.ScriptsPanel = function(uiSourceCodeProviderForTest)
{
@@ -40,14 +40,8 @@
WebInspector.settings.navigatorWasOnceHidden = WebInspector.settings.createSetting("navigatorWasOnceHidden", false);
WebInspector.settings.debuggerSidebarHidden = WebInspector.settings.createSetting("debuggerSidebarHidden", false);
- var scriptMapping = new WebInspector.DebuggerScriptMapping();
- var providers = scriptMapping.uiSourceCodeProviders();
- providers = providers.concat(new WebInspector.StylesUISourceCodeProvider());
- this._uiSourceCodeProvider = uiSourceCodeProviderForTest || new WebInspector.CompositeUISourceCodeProvider(providers);
+ this._uiSourceCodeProvider = uiSourceCodeProviderForTest || WebInspector.workspace;
- new WebInspector.PresentationConsoleMessageHelper(this._uiSourceCodeProvider);
- new WebInspector.DebuggerResourceBinding(this._uiSourceCodeProvider);
-
function viewGetter()
{
return this.visibleView;
@@ -1058,14 +1052,6 @@
},
/**
- * @param {WebInspector.UISourceCodeProvider} uiSourceCodeProvider
- */
- registerUISourceCodeProvider: function(uiSourceCodeProvider)
- {
- this._uiSourceCodeProvider._registerUISourceCodeProvider(uiSourceCodeProvider);
- },
-
- /**
* @param {WebInspector.UISourceCode} uiSourceCode
*/
_showLocalHistory: function(uiSourceCode)
@@ -1096,67 +1082,3 @@
}
WebInspector.ScriptsPanel.prototype.__proto__ = WebInspector.Panel.prototype;
-
-/**
- * @constructor
- * @extends {WebInspector.Object}
- * @implements {WebInspector.UISourceCodeProvider}
- * @param {Array.<WebInspector.UISourceCodeProvider>} uiSourceCodeProviders
- */
-WebInspector.CompositeUISourceCodeProvider = function(uiSourceCodeProviders)
-{
- WebInspector.Object.call(this);
- this._uiSourceCodeProviders = [];
- for (var i = 0; i < uiSourceCodeProviders.length; ++i)
- this._registerUISourceCodeProvider(uiSourceCodeProviders[i]);
-}
-
-WebInspector.CompositeUISourceCodeProvider.prototype = {
- /**
- * @param {WebInspector.UISourceCodeProvider} uiSourceCodeProvider
- */
- _registerUISourceCodeProvider: function(uiSourceCodeProvider)
- {
- this._uiSourceCodeProviders.push(uiSourceCodeProvider);
- uiSourceCodeProvider.addEventListener(WebInspector.UISourceCodeProvider.Events.UISourceCodeAdded, this._handleUISourceCodeAdded, this);
- uiSourceCodeProvider.addEventListener(WebInspector.UISourceCodeProvider.Events.UISourceCodeReplaced, this._handleUISourceCodeReplaced, this);
- uiSourceCodeProvider.addEventListener(WebInspector.UISourceCodeProvider.Events.UISourceCodeRemoved, this._handleUISourceCodeRemoved, this);
- },
-
- _handleUISourceCodeAdded: function(event)
- {
- this.dispatchEventToListeners(WebInspector.UISourceCodeProvider.Events.UISourceCodeAdded, event.data);
- },
-
- /**
- * @param {WebInspector.Event} event
- */
- _handleUISourceCodeReplaced: function(event)
- {
- this.dispatchEventToListeners(WebInspector.UISourceCodeProvider.Events.UISourceCodeReplaced, event.data);
- },
-
- /**
- * @param {WebInspector.Event} event
- */
- _handleUISourceCodeRemoved: function(event)
- {
- this.dispatchEventToListeners(WebInspector.UISourceCodeProvider.Events.UISourceCodeRemoved, event.data);
- },
-
- /**
- * @return {Array.<WebInspector.UISourceCode>}
- */
- uiSourceCodes: function()
- {
- var result = [];
- for (var i = 0; i < this._uiSourceCodeProviders.length; ++i) {
- var uiSourceCodes = this._uiSourceCodeProviders[i].uiSourceCodes();
- for (var j = 0; j < uiSourceCodes.length; ++j)
- result.push(uiSourceCodes[j]);
- }
- return result;
- }
-}
-
-WebInspector.CompositeUISourceCodeProvider.prototype.__proto__ = WebInspector.Object.prototype;
Modified: trunk/Source/WebCore/inspector/front-end/WebKit.qrc (121777 => 121778)
--- trunk/Source/WebCore/inspector/front-end/WebKit.qrc 2012-07-03 16:22:10 UTC (rev 121777)
+++ trunk/Source/WebCore/inspector/front-end/WebKit.qrc 2012-07-03 16:29:06 UTC (rev 121778)
@@ -189,6 +189,7 @@
<file>WatchExpressionsSidebarPane.js</file>
<file>WorkerManager.js</file>
<file>WorkersSidebarPane.js</file>
+ <file>Workspace.js</file>
<file>UglifyJS/parse-js.js</file>
<file>auditsPanel.css</file>
<file>dataGrid.css</file>
Added: trunk/Source/WebCore/inspector/front-end/Workspace.js (0 => 121778)
--- trunk/Source/WebCore/inspector/front-end/Workspace.js (rev 0)
+++ trunk/Source/WebCore/inspector/front-end/Workspace.js 2012-07-03 16:29:06 UTC (rev 121778)
@@ -0,0 +1,125 @@
+/*
+ * 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
+ * @extends {WebInspector.Object}
+ * @implements {WebInspector.UISourceCodeProvider}
+ * @param {Array.<WebInspector.UISourceCodeProvider>} uiSourceCodeProviders
+ */
+WebInspector.CompositeUISourceCodeProvider = function(uiSourceCodeProviders)
+{
+ WebInspector.Object.call(this);
+ this._uiSourceCodeProviders = [];
+ for (var i = 0; i < uiSourceCodeProviders.length; ++i)
+ this._registerUISourceCodeProvider(uiSourceCodeProviders[i]);
+}
+
+WebInspector.CompositeUISourceCodeProvider.prototype = {
+ /**
+ * @param {WebInspector.UISourceCodeProvider} uiSourceCodeProvider
+ */
+ _registerUISourceCodeProvider: function(uiSourceCodeProvider)
+ {
+ this._uiSourceCodeProviders.push(uiSourceCodeProvider);
+ uiSourceCodeProvider.addEventListener(WebInspector.UISourceCodeProvider.Events.UISourceCodeAdded, this._handleUISourceCodeAdded, this);
+ uiSourceCodeProvider.addEventListener(WebInspector.UISourceCodeProvider.Events.UISourceCodeReplaced, this._handleUISourceCodeReplaced, this);
+ uiSourceCodeProvider.addEventListener(WebInspector.UISourceCodeProvider.Events.UISourceCodeRemoved, this._handleUISourceCodeRemoved, this);
+ },
+
+ _handleUISourceCodeAdded: function(event)
+ {
+ this.dispatchEventToListeners(WebInspector.UISourceCodeProvider.Events.UISourceCodeAdded, event.data);
+ },
+
+ /**
+ * @param {WebInspector.Event} event
+ */
+ _handleUISourceCodeReplaced: function(event)
+ {
+ this.dispatchEventToListeners(WebInspector.UISourceCodeProvider.Events.UISourceCodeReplaced, event.data);
+ },
+
+ /**
+ * @param {WebInspector.Event} event
+ */
+ _handleUISourceCodeRemoved: function(event)
+ {
+ this.dispatchEventToListeners(WebInspector.UISourceCodeProvider.Events.UISourceCodeRemoved, event.data);
+ },
+
+ /**
+ * @return {Array.<WebInspector.UISourceCode>}
+ */
+ uiSourceCodes: function()
+ {
+ var result = [];
+ for (var i = 0; i < this._uiSourceCodeProviders.length; ++i) {
+ var uiSourceCodes = this._uiSourceCodeProviders[i].uiSourceCodes();
+ for (var j = 0; j < uiSourceCodes.length; ++j)
+ result.push(uiSourceCodes[j]);
+ }
+ return result;
+ }
+}
+
+WebInspector.CompositeUISourceCodeProvider.prototype.__proto__ = WebInspector.Object.prototype;
+
+/**
+ * @constructor
+ * @extends {WebInspector.CompositeUISourceCodeProvider}
+ */
+WebInspector.Workspace = function()
+{
+ var scriptMapping = new WebInspector.DebuggerScriptMapping();
+ var providers = scriptMapping.uiSourceCodeProviders();
+ providers = providers.concat(new WebInspector.StylesUISourceCodeProvider());
+ WebInspector.CompositeUISourceCodeProvider.call(this, providers);
+
+ new WebInspector.PresentationConsoleMessageHelper(this);
+ new WebInspector.DebuggerResourceBinding(this);
+}
+
+WebInspector.Workspace.prototype = {
+ /**
+ * @param {WebInspector.UISourceCodeProvider} uiSourceCodeProvider
+ */
+ registerUISourceCodeProvider: function(uiSourceCodeProvider)
+ {
+ this._registerUISourceCodeProvider(uiSourceCodeProvider);
+ }
+}
+
+WebInspector.Workspace.prototype.__proto__ = WebInspector.CompositeUISourceCodeProvider.prototype;
+
+/**
+ * @type {?WebInspector.Workspace}
+ */
+WebInspector.workspace = null;
Property changes on: trunk/Source/WebCore/inspector/front-end/Workspace.js
___________________________________________________________________
Added: svn:eol-style
Modified: trunk/Source/WebCore/inspector/front-end/inspector.html (121777 => 121778)
--- trunk/Source/WebCore/inspector/front-end/inspector.html 2012-07-03 16:22:10 UTC (rev 121777)
+++ trunk/Source/WebCore/inspector/front-end/inspector.html 2012-07-03 16:29:06 UTC (rev 121778)
@@ -190,6 +190,7 @@
<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 (121777 => 121778)
--- trunk/Source/WebCore/inspector/front-end/inspector.js 2012-07-03 16:22:10 UTC (rev 121777)
+++ trunk/Source/WebCore/inspector/front-end/inspector.js 2012-07-03 16:29:06 UTC (rev 121778)
@@ -456,6 +456,8 @@
this.openAnchorLocationRegistry = new WebInspector.HandlerRegistry(openAnchorLocationSetting);
this.openAnchorLocationRegistry.registerHandler(autoselectPanel, function() { return false; });
+ this.workspace = new WebInspector.Workspace();
+
this._createPanels();
this._createGlobalStatusBarItems();
