Changeset 121778 in webkit


Ignore:
Timestamp:
Jul 3, 2012 9:29:06 AM (12 years ago)
Author:
vsevik@chromium.org
Message:

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:
Location:
trunk/Source/WebCore
Files:
1 added
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r121777 r121778  
     12012-07-03  Vsevolod Vlasov  <vsevik@chromium.org>
     2
     3        Web Inspector: Introduce Workspace make it UISourceCode provider for ScriptsPanel.
     4        https://bugs.webkit.org/show_bug.cgi?id=90466
     5
     6        Reviewed by Pavel Feldman.
     7
     8        Introduced WebInspector.Workspace as a model (UISourceCode provider) behind ScriptsPanel.
     9
     10        * WebCore.gypi:
     11        * WebCore.vcproj/WebCore.vcproj:
     12        * inspector/compile-front-end.py:
     13        * inspector/front-end/ScriptsPanel.js:
     14        * inspector/front-end/WebKit.qrc:
     15        * inspector/front-end/Workspace.js: Added.
     16        (WebInspector.CompositeUISourceCodeProvider):
     17        (WebInspector.CompositeUISourceCodeProvider.prototype._registerUISourceCodeProvider):
     18        (WebInspector.CompositeUISourceCodeProvider.prototype._handleUISourceCodeAdded):
     19        (WebInspector.CompositeUISourceCodeProvider.prototype._handleUISourceCodeReplaced):
     20        (WebInspector.CompositeUISourceCodeProvider.prototype._handleUISourceCodeRemoved):
     21        (WebInspector.CompositeUISourceCodeProvider.prototype.uiSourceCodes):
     22        (WebInspector.Workspace):
     23        (WebInspector.Workspace.prototype.registerUISourceCodeProvider):
     24        * inspector/front-end/inspector.html:
     25        * inspector/front-end/inspector.js:
     26
    1272012-07-03  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
    228
  • trunk/Source/WebCore/WebCore.gypi

    r121746 r121778  
    64076407            'inspector/front-end/WorkerManager.js',
    64086408            'inspector/front-end/WorkersSidebarPane.js',
     6409            'inspector/front-end/Workspace.js',
    64096410            'inspector/front-end/dialog.css',
    64106411            'inspector/front-end/inspector.css',
  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r121746 r121778  
    7554675546                                        >
    7554775547                                </File>
     75548                                <File
     75549                                        RelativePath="..\inspector\front-end\Workspace.js"
     75550                                        >
     75551                                </File>
    7554875552                        </Filter>
    7554975553                </Filter>
  • trunk/Source/WebCore/inspector/compile-front-end.py

    r121746 r121778  
    107107            "UISourceCode.js",
    108108            "UserAgentSupport.js",
     109            "Workspace.js",
    109110        ]
    110111    },
  • trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js

    r121535 r121778  
    3030 * @implements {WebInspector.ContextMenu.Provider}
    3131 * @extends {WebInspector.Panel}
    32  * @param {WebInspector.CompositeUISourceCodeProvider=} uiSourceCodeProviderForTest
     32 * @param {WebInspector.UISourceCodeProvider=} uiSourceCodeProviderForTest
    3333 */
    3434WebInspector.ScriptsPanel = function(uiSourceCodeProviderForTest)
     
    4141    WebInspector.settings.debuggerSidebarHidden = WebInspector.settings.createSetting("debuggerSidebarHidden", false);
    4242
    43     var scriptMapping = new WebInspector.DebuggerScriptMapping();
    44     var providers = scriptMapping.uiSourceCodeProviders();
    45     providers = providers.concat(new WebInspector.StylesUISourceCodeProvider());
    46     this._uiSourceCodeProvider = uiSourceCodeProviderForTest || new WebInspector.CompositeUISourceCodeProvider(providers);
    47 
    48     new WebInspector.PresentationConsoleMessageHelper(this._uiSourceCodeProvider);
    49     new WebInspector.DebuggerResourceBinding(this._uiSourceCodeProvider);
     43    this._uiSourceCodeProvider = uiSourceCodeProviderForTest || WebInspector.workspace;
    5044
    5145    function viewGetter()
     
    10591053
    10601054    /**
    1061      * @param {WebInspector.UISourceCodeProvider} uiSourceCodeProvider
    1062      */
    1063     registerUISourceCodeProvider: function(uiSourceCodeProvider)
    1064     {
    1065         this._uiSourceCodeProvider._registerUISourceCodeProvider(uiSourceCodeProvider);
    1066     },
    1067 
    1068     /**
    10691055     * @param {WebInspector.UISourceCode} uiSourceCode
    10701056     */
     
    10971083
    10981084WebInspector.ScriptsPanel.prototype.__proto__ = WebInspector.Panel.prototype;
    1099 
    1100 /**
    1101  * @constructor
    1102  * @extends {WebInspector.Object}
    1103  * @implements {WebInspector.UISourceCodeProvider}
    1104  * @param {Array.<WebInspector.UISourceCodeProvider>} uiSourceCodeProviders
    1105  */
    1106 WebInspector.CompositeUISourceCodeProvider = function(uiSourceCodeProviders)
    1107 {
    1108     WebInspector.Object.call(this);
    1109     this._uiSourceCodeProviders = [];
    1110     for (var i = 0; i < uiSourceCodeProviders.length; ++i)
    1111         this._registerUISourceCodeProvider(uiSourceCodeProviders[i]);
    1112 }
    1113 
    1114 WebInspector.CompositeUISourceCodeProvider.prototype = {
    1115     /**
    1116      * @param {WebInspector.UISourceCodeProvider} uiSourceCodeProvider
    1117      */
    1118     _registerUISourceCodeProvider: function(uiSourceCodeProvider)
    1119     {
    1120         this._uiSourceCodeProviders.push(uiSourceCodeProvider);
    1121         uiSourceCodeProvider.addEventListener(WebInspector.UISourceCodeProvider.Events.UISourceCodeAdded, this._handleUISourceCodeAdded, this);
    1122         uiSourceCodeProvider.addEventListener(WebInspector.UISourceCodeProvider.Events.UISourceCodeReplaced, this._handleUISourceCodeReplaced, this);
    1123         uiSourceCodeProvider.addEventListener(WebInspector.UISourceCodeProvider.Events.UISourceCodeRemoved, this._handleUISourceCodeRemoved, this);
    1124     },
    1125 
    1126     _handleUISourceCodeAdded: function(event)
    1127     {
    1128         this.dispatchEventToListeners(WebInspector.UISourceCodeProvider.Events.UISourceCodeAdded, event.data);
    1129     },
    1130 
    1131     /**
    1132      * @param {WebInspector.Event} event
    1133      */
    1134     _handleUISourceCodeReplaced: function(event)
    1135     {
    1136         this.dispatchEventToListeners(WebInspector.UISourceCodeProvider.Events.UISourceCodeReplaced, event.data);
    1137     },
    1138 
    1139     /**
    1140      * @param {WebInspector.Event} event
    1141      */
    1142     _handleUISourceCodeRemoved: function(event)
    1143     {
    1144         this.dispatchEventToListeners(WebInspector.UISourceCodeProvider.Events.UISourceCodeRemoved, event.data);
    1145     },
    1146 
    1147     /**
    1148      * @return {Array.<WebInspector.UISourceCode>}
    1149      */
    1150     uiSourceCodes: function()
    1151     {
    1152         var result = [];
    1153         for (var i = 0; i < this._uiSourceCodeProviders.length; ++i) {
    1154             var uiSourceCodes = this._uiSourceCodeProviders[i].uiSourceCodes();
    1155             for (var j = 0; j < uiSourceCodes.length; ++j)
    1156                 result.push(uiSourceCodes[j]);
    1157         }
    1158         return result;
    1159     }
    1160 }
    1161 
    1162 WebInspector.CompositeUISourceCodeProvider.prototype.__proto__ = WebInspector.Object.prototype;
  • trunk/Source/WebCore/inspector/front-end/WebKit.qrc

    r121746 r121778  
    190190    <file>WorkerManager.js</file>
    191191    <file>WorkersSidebarPane.js</file>
     192    <file>Workspace.js</file>
    192193    <file>UglifyJS/parse-js.js</file>
    193194    <file>auditsPanel.css</file>
  • trunk/Source/WebCore/inspector/front-end/inspector.html

    r121746 r121778  
    191191    <script type="text/javascript" src="DebuggerResourceBinding.js"></script>
    192192    <script type="text/javascript" src="PresentationConsoleMessageHelper.js"></script>
     193    <script type="text/javascript" src="Workspace.js"></script>
    193194    <script type="text/javascript" src="BreakpointManager.js"></script>
    194195    <script type="text/javascript" src="ContentProviders.js"></script>
  • trunk/Source/WebCore/inspector/front-end/inspector.js

    r121528 r121778  
    457457    this.openAnchorLocationRegistry.registerHandler(autoselectPanel, function() { return false; });
    458458
     459    this.workspace = new WebInspector.Workspace();
     460
    459461    this._createPanels();
    460462    this._createGlobalStatusBarItems();
Note: See TracChangeset for help on using the changeset viewer.