Revert of [DevTools] Inject element into toolbox window, do not load modules...

Revert of [DevTools] Inject element into toolbox window, do not load modules there. (patchset #2 id:150001 of https://codereview.chromium.org/653613002/)

Reason for revert:
Breaks all references to "document".

Original issue's description:
> [DevTools] Inject element into toolbox window, do not load modules there.
> 
> BUG=none
> 
> Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=183669

TBR=pfeldman@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=none

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

git-svn-id: svn://svn.chromium.org/blink/trunk@183744 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/bindings/core/v8/custom/V8InspectorFrontendHostCustom.cpp

@@ -32,7 +32,6 @@
 #include "bindings/core/v8/V8InspectorFrontendHost.h"
 
 #include "bindings/core/v8/V8Binding.h"
-#include "bindings/core/v8/V8Document.h"
 #include "bindings/core/v8/V8MouseEvent.h"
 #include "bindings/core/v8/V8Window.h"
 #include "core/dom/Document.h"
@@ -147,17 +146,12 @@ void V8InspectorFrontendHost::showContextMenuAtPointMethodCustom(const v8::Funct
     if (!populateContextMenuItems(v8::Local<v8::Array>::Cast(array), menu, info.GetIsolate()))
         return;
 
-    LocalDOMWindow* window = nullptr;
-    if (info.Length() >= 4) {
-        window = toDOMWindow(info[3], info.GetIsolate());
-    } else {
-        v8::Isolate* isolate = info.GetIsolate();
-        v8::Handle<v8::Object> windowWrapper = V8Window::findInstanceInPrototypeChain(isolate->GetEnteredContext()->Global(), isolate);
-        if (windowWrapper.IsEmpty())
-            return;
-        window = V8Window::toImpl(windowWrapper);
-    }
-    if (!window || !window->document() || !window->document()->page())
+    v8::Isolate* isolate = info.GetIsolate();
+    v8::Handle<v8::Object> windowWrapper = V8Window::findInstanceInPrototypeChain(isolate->GetEnteredContext()->Global(), isolate);
+    if (windowWrapper.IsEmpty())
+        return;
+    LocalDOMWindow* window = V8Window::toImpl(windowWrapper);
+    if (!window->document() || !window->document()->page())
         return;
 
     InspectorFrontendHost* frontendHost = V8InspectorFrontendHost::toImpl(info.Holder());

third_party/WebKit/Source/core/inspector/InspectorFrontendHost.idl

@@ -46,7 +46,7 @@
     [Custom] DOMString port();
     // FIXME: showContextMenu is here only for old frontends. Remove in M43.
     [Custom] void showContextMenu(MouseEvent event, any items);
-    [Custom] void showContextMenuAtPoint(float x, float y, any items, optional DOMWindow window);
+    [Custom] void showContextMenuAtPoint(float x, float y, any items);
     void sendMessageToBackend(DOMString message);
     void sendMessageToEmbedder(DOMString message);
 

third_party/WebKit/Source/devtools/front_end/host/InspectorFrontendHost.js

@@ -31,10 +31,6 @@
 /** @interface */
 function InspectorFrontendHostAPI()
 {
-    /**
-     * @type {!WebInspector.EventTarget}
-     */
-    this.events;
 }
 
 /** @typedef {{type:string, id:(number|undefined),
@@ -276,9 +272,8 @@ InspectorFrontendHostAPI.prototype = {
      * @param {number} x
      * @param {number} y
      * @param {!Array.<!InspectorFrontendHostAPI.ContextMenuDescriptor>} items
-     * @param {!Window} window
      */
-    showContextMenuAtPoint: function(x, y, items, window) { },
+    showContextMenuAtPoint: function(x, y, items) { },
 
     /**
      * @return {boolean}
@@ -591,9 +586,8 @@ WebInspector.InspectorFrontendHostStub.prototype = {
      * @param {number} x
      * @param {number} y
      * @param {!Array.<!InspectorFrontendHostAPI.ContextMenuDescriptor>} items
-     * @param {!Window} window
      */
-    showContextMenuAtPoint: function(x, y, items, window)
+    showContextMenuAtPoint: function(x, y, items)
     {
         throw "Soft context menu should be used";
     },

third_party/WebKit/Source/devtools/front_end/main/AdvancedApp.js

@@ -88,26 +88,16 @@ WebInspector.AdvancedApp.prototype = {
     },
 
     /**
-     * @param {!Element} rootElement
-     * @override
+     * @param {!WebInspector.ResponsiveDesignView} responsiveDesignView
+     * @param {!WebInspector.InspectedPagePlaceholder} placeholder
      */
-    toolboxLoaded: function(rootElement)
+    toolboxLoaded: function(responsiveDesignView, placeholder)
     {
-        var inspectedPagePlaceholder = new WebInspector.InspectedPagePlaceholder();
-        inspectedPagePlaceholder.addEventListener(WebInspector.InspectedPagePlaceholder.Events.Update, this._onSetInspectedPageBounds.bind(this, true));
-        this._toolboxResponsiveDesignView = new WebInspector.ResponsiveDesignView(inspectedPagePlaceholder);
-        this._toolboxResponsiveDesignView.show(rootElement);
+        this._toolboxResponsiveDesignView = responsiveDesignView;
+        placeholder.addEventListener(WebInspector.InspectedPagePlaceholder.Events.Update, this._onSetInspectedPageBounds.bind(this, true));
         this._updatePageResizer();
     },
 
-    /**
-     * @return {!InspectorFrontendHostAPI}
-     */
-    inspectorFrontendHost: function()
-    {
-        return window.InspectorFrontendHost;
-    },
-
     _updatePageResizer: function()
     {
         if (this._isDocked())

third_party/WebKit/Source/devtools/front_end/toolbox.json

@@ -3,6 +3,10 @@
         "name": "ui",
         "type": "autostart"
     },
+    {
+        "name": "sdk",
+        "type": "autostart"
+    },
     {
         "name": "host",
         "type": "autostart"
@@ -11,6 +15,18 @@
         "name": "common",
         "type": "autostart"
     },
+    {
+        "name": "toolbox",
+        "type": "autostart"
+    },
+    {
+        "name": "bindings",
+        "type": "autostart"
+    },
+    {
+        "name": "workspace",
+        "type": "autostart"
+    },
     {
         "name": "toolbox_bootstrap",
         "type": "autostart"

third_party/WebKit/Source/devtools/front_end/toolbox/MediaQueryInspector.js

@@ -143,7 +143,7 @@ WebInspector.MediaQueryInspector.prototype = {
         }
 
         var contextMenuItems = uiLocations.keys().sort();
-        var contextMenu = new WebInspector.ContextMenu(event, this.element.ownerDocument.defaultView);
+        var contextMenu = new WebInspector.ContextMenu(event);
         var subMenuItem = contextMenu.appendSubMenuItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Reveal in source code" : "Reveal In Source Code"));
         for (var i = 0; i < contextMenuItems.length; ++i) {
             var title = contextMenuItems[i];

third_party/WebKit/Source/devtools/front_end/toolbox/ToolboxDelegate.js

@@ -9,12 +9,8 @@ WebInspector.ToolboxDelegate = function() {}
 
 WebInspector.ToolboxDelegate.prototype = {
     /**
-     * @param {!Element} rootElement
+     * @param {!WebInspector.ResponsiveDesignView} responsiveDesignView
+     * @param {!WebInspector.InspectedPagePlaceholder} placeholder
      */
-    toolboxLoaded: function(rootElement) {},
-
-    /**
-     * @return {!InspectorFrontendHostAPI}
-     */
-    inspectorFrontendHost: function() {}
+    toolboxLoaded: function(responsiveDesignView, placeholder) {}
 }

third_party/WebKit/Source/devtools/front_end/toolbox_bootstrap/Toolbox.js

@@ -10,14 +10,24 @@ WebInspector.Toolbox = function()
     if (!window.opener)
         return;
 
-    var delegate = /** @type {!WebInspector.ToolboxDelegate} */ (window.opener.WebInspector["app"]);
-
-    WebInspector.zoomManager = new WebInspector.ZoomManager(delegate.inspectorFrontendHost());
+    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();
-    delegate.toolboxLoaded(rootView.element);
+    var inspectedPagePlaceholder = new WebInspector.InspectedPagePlaceholder();
+    this._responsiveDesignView = new WebInspector.ResponsiveDesignView(inspectedPagePlaceholder);
+    this._responsiveDesignView.show(rootView.element);
     rootView.attachToBody();
+    delegate.toolboxLoaded(this._responsiveDesignView, inspectedPagePlaceholder);
 }
 
 // FIXME: This stub is invoked from the backend and should be removed

third_party/WebKit/Source/devtools/front_end/toolbox_bootstrap/module.json

 {
     "dependencies": [
-        "ui",
-        "host",
-        "common"
+        "toolbox"
     ],
     "scripts": [
         "Toolbox.js"

third_party/WebKit/Source/devtools/front_end/ui/ContextMenu.js

@@ -197,9 +197,8 @@ WebInspector.ContextSubMenuItem.prototype = {
  * @constructor
  * @extends {WebInspector.ContextSubMenuItem}
  * @param {!Event} event
- * @param {!Window=} opt_window
  */
-WebInspector.ContextMenu = function(event, opt_window)
+WebInspector.ContextMenu = function(event)
 {
     WebInspector.ContextSubMenuItem.call(this, this, "");
     /** @type {!Array.<!Promise.<!WebInspector.ContextMenu.Provider> >} */
@@ -211,7 +210,6 @@ WebInspector.ContextMenu = function(event, opt_window)
     this._y = event.y;
     this._handlers = {};
     this._id = 0;
-    this._window = opt_window || window;
 }
 
 WebInspector.ContextMenu.initialize = function()
@@ -280,7 +278,7 @@ WebInspector.ContextMenu.prototype = {
                 var softMenu = new WebInspector.SoftContextMenu(menuObject, this._itemSelected.bind(this));
                 softMenu.show(this._x, this._y);
             } else {
-                InspectorFrontendHost.showContextMenuAtPoint(this._x, this._y, menuObject, this._window);
+                InspectorFrontendHost.showContextMenuAtPoint(this._x, this._y, menuObject);
                 InspectorFrontendHost.events.addEventListener(InspectorFrontendHostAPI.Events.ContextMenuCleared, this._menuCleared, this);
                 InspectorFrontendHost.events.addEventListener(InspectorFrontendHostAPI.Events.ContextMenuItemSelected, this._onItemSelected, this);
             }