Skip to content

GitLab

T
tangled
Commit fa5b9081 authored by apavlov@chromium.org's avatar apavlov@chromium.org
Browse files
Options

DevTools: Decouple AdvancedApp from Toolbox 

This is required to introduce a new "toolbox" application
within the new application loading scheme.

R=dgozman, pfeldman, vsevik
BUG=391566

Review URL: https://codereview.chromium.org/460673003

git-svn-id: svn://svn.chromium.org/blink/trunk@180178 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 59f5251c
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 38 deletions
third_party/WebKit/Source/devtools/devtools.gypi
View file @ fa5b9081
...@@ -188,6 +188,7 @@ ...@@ -188,6 +188,7 @@
'front_end/toolbox/MediaQueryInspector.js', 'front_end/toolbox/MediaQueryInspector.js',
'front_end/toolbox/OverridesUI.js', 'front_end/toolbox/OverridesUI.js',
'front_end/toolbox/ResponsiveDesignView.js', 'front_end/toolbox/ResponsiveDesignView.js',
'front_end/toolbox/ToolboxDelegate.js',
], ],
'devtools_ui_js_files': [ 'devtools_ui_js_files': [
'front_end/ui/ActionRegistry.js', 'front_end/ui/ActionRegistry.js',
...@@ -238,6 +239,7 @@ ...@@ -238,6 +239,7 @@
'front_end/main/RenderingOptions.js', 'front_end/main/RenderingOptions.js',
'front_end/main/ScreencastApp.js', 'front_end/main/ScreencastApp.js',
'front_end/main/SimpleApp.js', 'front_end/main/SimpleApp.js',
'front_end/main/Toolbox.js',
], ],
'devtools_module_json_files': [ 'devtools_module_json_files': [
......
third_party/WebKit/Source/devtools/front_end/inspector.html
View file @ fa5b9081
...@@ -52,6 +52,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ...@@ -52,6 +52,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<script type="text/javascript" src="ui/DOMExtension.js"></script> <script type="text/javascript" src="ui/DOMExtension.js"></script>
<script type="text/javascript" src="ui/treeoutline.js"></script> <script type="text/javascript" src="ui/treeoutline.js"></script>
<script type="text/javascript" src="ui/SettingsUI.js"></script> <script type="text/javascript" src="ui/SettingsUI.js"></script>
<script type="text/javascript" src="main/Toolbox.js"></script>
<script type="text/javascript" src="main/Main.js"></script> <script type="text/javascript" src="main/Main.js"></script>
<script type="text/javascript" src="sdk/InspectorBackend.js"></script> <script type="text/javascript" src="sdk/InspectorBackend.js"></script>
<script type="text/javascript" src="InspectorBackendCommands.js"></script> <script type="text/javascript" src="InspectorBackendCommands.js"></script>
...@@ -198,6 +199,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ...@@ -198,6 +199,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<script type="text/javascript" src="toolbox/MediaQueryInspector.js"></script> <script type="text/javascript" src="toolbox/MediaQueryInspector.js"></script>
<script type="text/javascript" src="toolbox/OverridesUI.js"></script> <script type="text/javascript" src="toolbox/OverridesUI.js"></script>
<script type="text/javascript" src="toolbox/ResponsiveDesignView.js"></script> <script type="text/javascript" src="toolbox/ResponsiveDesignView.js"></script>
<script type="text/javascript" src="toolbox/ToolboxDelegate.js"></script>
<script type="text/javascript" src="Tests.js"></script> <script type="text/javascript" src="Tests.js"></script>
</head> </head>
<body class="undocked" id="-blink-dev-tools"></body> <body class="undocked" id="-blink-dev-tools"></body>
......
third_party/WebKit/Source/devtools/front_end/main/AdvancedApp.js
View file @ fa5b9081
...@@ -95,11 +95,13 @@ WebInspector.AdvancedApp.prototype = { ...@@ -95,11 +95,13 @@ WebInspector.AdvancedApp.prototype = {
}, },
/** /**
* @param {!WebInspector.Toolbox} toolbox * @param {!WebInspector.ResponsiveDesignView} responsiveDesignView
* @param {!WebInspector.InspectedPagePlaceholder} placeholder
*/ */
_toolboxLoaded: function(toolbox) toolboxLoaded: function(responsiveDesignView, placeholder)
{ {
this._toolbox = toolbox; this._toolboxResponsiveDesignView = responsiveDesignView;
placeholder.addEventListener(WebInspector.InspectedPagePlaceholder.Events.Update, this._onSetInspectedPageBounds.bind(this, true));
this._updatePageResizer(); this._updatePageResizer();
}, },
...@@ -107,8 +109,8 @@ WebInspector.AdvancedApp.prototype = { ...@@ -107,8 +109,8 @@ WebInspector.AdvancedApp.prototype = {
{ {
if (this._isDocked()) if (this._isDocked())
this._responsiveDesignView.updatePageResizer(); this._responsiveDesignView.updatePageResizer();
else if (this._toolbox) else if (this._toolboxResponsiveDesignView)
this._toolbox._responsiveDesignView.updatePageResizer(); this._toolboxResponsiveDesignView.updatePageResizer();
}, },
/** /**
...@@ -116,7 +118,7 @@ WebInspector.AdvancedApp.prototype = { ...@@ -116,7 +118,7 @@ WebInspector.AdvancedApp.prototype = {
*/ */
_onBeforeDockSideChange: function(event) _onBeforeDockSideChange: function(event)
{ {
if (/** @type {string} */ (event.data.to) === WebInspector.DockController.State.Undocked && this._toolbox) { if (/** @type {string} */ (event.data.to) === WebInspector.DockController.State.Undocked && this._toolboxResponsiveDesignView) {
// Hide inspectorView and force layout to mimic the undocked state. // Hide inspectorView and force layout to mimic the undocked state.
this._rootSplitView.hideSidebar(); this._rootSplitView.hideSidebar();
this._inspectedPagePlaceholder.update(); this._inspectedPagePlaceholder.update();
...@@ -135,7 +137,7 @@ WebInspector.AdvancedApp.prototype = { ...@@ -135,7 +137,7 @@ WebInspector.AdvancedApp.prototype = {
var toDockSide = event ? /** @type {string} */ (event.data.to) : WebInspector.dockController.dockSide(); var toDockSide = event ? /** @type {string} */ (event.data.to) : WebInspector.dockController.dockSide();
if (toDockSide === WebInspector.DockController.State.Undocked) { if (toDockSide === WebInspector.DockController.State.Undocked) {
this._updateForUndocked(); this._updateForUndocked();
} else if (this._toolbox && event && /** @type {string} */ (event.data.from) === WebInspector.DockController.State.Undocked) { } else if (this._toolboxResponsiveDesignView && event && /** @type {string} */ (event.data.from) === WebInspector.DockController.State.Undocked) {
// Don't update yet for smooth transition. // Don't update yet for smooth transition.
this._rootSplitView.hideSidebar(); this._rootSplitView.hideSidebar();
} else { } else {
...@@ -244,35 +246,6 @@ WebInspector.AdvancedApp.DeviceCounter.prototype = { ...@@ -244,35 +246,6 @@ WebInspector.AdvancedApp.DeviceCounter.prototype = {
} }
} }
/**
* @constructor
*/
WebInspector.Toolbox = function()
{
if (!window.opener)
return;
WebInspector.zoomManager = new WebInspector.ZoomManager(window.opener.InspectorFrontendHost);
WebInspector.overridesSupport = window.opener.WebInspector.overridesSupport;
WebInspector.settings = window.opener.WebInspector.settings;
WebInspector.experimentsSettings = window.opener.WebInspector.experimentsSettings;
WebInspector.targetManager = window.opener.WebInspector.targetManager;
WebInspector.workspace = window.opener.WebInspector.workspace;
WebInspector.cssWorkspaceBinding = window.opener.WebInspector.cssWorkspaceBinding;
WebInspector.Revealer = window.opener.WebInspector.Revealer;
WebInspector.ContextMenu = window.opener.WebInspector.ContextMenu;
WebInspector.installPortStyles();
var advancedApp = /** @type {!WebInspector.AdvancedApp} */ (window.opener.WebInspector.app);
var rootView = new WebInspector.RootView();
this._inspectedPagePlaceholder = new WebInspector.InspectedPagePlaceholder();
this._inspectedPagePlaceholder.addEventListener(WebInspector.InspectedPagePlaceholder.Events.Update, advancedApp._onSetInspectedPageBounds.bind(advancedApp, true));
this._responsiveDesignView = new WebInspector.ResponsiveDesignView(this._inspectedPagePlaceholder);
this._responsiveDesignView.show(rootView.element);
rootView.attachToBody();
advancedApp._toolboxLoaded(this);
}
/** /**
* @constructor * @constructor
* @implements {WebInspector.StatusBarItem.Provider} * @implements {WebInspector.StatusBarItem.Provider}
......
third_party/WebKit/Source/devtools/front_end/main/Toolbox.js 0 → 100644
View file @ fa5b9081
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
function windowLoaded()
{
window.removeEventListener("DOMContentLoaded", windowLoaded, false);
new WebInspector.Toolbox();
}
window.addEventListener("DOMContentLoaded", windowLoaded, false);
/**
* @constructor
*/
WebInspector.Toolbox = function()
{
if (!window.opener)
return;
WebInspector.zoomManager = new WebInspector.ZoomManager(window.opener.InspectorFrontendHost);
WebInspector.overridesSupport = window.opener.WebInspector.overridesSupport;
WebInspector.settings = window.opener.WebInspector.settings;
WebInspector.experimentsSettings = window.opener.WebInspector.experimentsSettings;
WebInspector.targetManager = window.opener.WebInspector.targetManager;
WebInspector.workspace = window.opener.WebInspector.workspace;
WebInspector.cssWorkspaceBinding = window.opener.WebInspector.cssWorkspaceBinding;
WebInspector.Revealer = window.opener.WebInspector.Revealer;
WebInspector.ContextMenu = window.opener.WebInspector.ContextMenu;
WebInspector.installPortStyles();
var delegate = /** @type {!WebInspector.ToolboxDelegate} */ (window.opener.WebInspector["app"]);
var rootView = new WebInspector.RootView();
var inspectedPagePlaceholder = new WebInspector.InspectedPagePlaceholder();
this._responsiveDesignView = new WebInspector.ResponsiveDesignView(inspectedPagePlaceholder);
this._responsiveDesignView.show(rootView.element);
rootView.attachToBody();
delegate.toolboxLoaded(this._responsiveDesignView, inspectedPagePlaceholder);
}
third_party/WebKit/Source/devtools/front_end/toolbox/ToolboxDelegate.js 0 → 100644
View file @ fa5b9081
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
/**
* @interface
*/
WebInspector.ToolboxDelegate = function() {}
WebInspector.ToolboxDelegate.prototype = {
/**
* @param {!WebInspector.ResponsiveDesignView} responsiveDesignView
* @param {!WebInspector.InspectedPagePlaceholder} placeholder
*/
toolboxLoaded: function(responsiveDesignView, placeholder) {}
}
third_party/WebKit/Source/devtools/scripts/frontend_modules.json
View file @ fa5b9081
...@@ -184,7 +184,8 @@ ...@@ -184,7 +184,8 @@
"toolbox/InspectedPagePlaceholder.js", "toolbox/InspectedPagePlaceholder.js",
"toolbox/MediaQueryInspector.js", "toolbox/MediaQueryInspector.js",
"toolbox/OverridesUI.js", "toolbox/OverridesUI.js",
"toolbox/ResponsiveDesignView.js" "toolbox/ResponsiveDesignView.js",
"toolbox/ToolboxDelegate.js"
] ]
}, },
{ {
...@@ -466,11 +467,12 @@ ...@@ -466,11 +467,12 @@
"main/AdvancedApp.js", "main/AdvancedApp.js",
"main/App.js", "main/App.js",
"main/HelpScreenUntilReload.js", "main/HelpScreenUntilReload.js",
"main/Main.js",
"main/OverridesView.js", "main/OverridesView.js",
"main/RenderingOptions.js", "main/RenderingOptions.js",
"main/ScreencastApp.js", "main/ScreencastApp.js",
"main/SimpleApp.js", "main/SimpleApp.js",
"main/Main.js" "main/Toolbox.js"
] ]
}, },
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment