Index: Source/devtools/blink/chromeServerProfile/Default/Cache/f_000040 |
diff --git a/Source/devtools/front_end/Main.js b/Source/devtools/blink/chromeServerProfile/Default/Cache/f_000040 |
similarity index 93% |
copy from Source/devtools/front_end/Main.js |
copy to Source/devtools/blink/chromeServerProfile/Default/Cache/f_000040 |
index 89d774de5ea2d821e40756075b4b160d4fc8049f..e82b996c20ca3afbbc468f8f0b6b93d244db3e77 100644 |
--- a/Source/devtools/front_end/Main.js |
+++ b/Source/devtools/blink/chromeServerProfile/Default/Cache/f_000040 |
@@ -52,9 +52,9 @@ WebInspector.Main.prototype = { |
{ |
var configuration; |
if (!Capabilities.isMainFrontend) { |
- configuration = ["main", "sources", "timeline", "profiles", "console", "codemirror", "search"]; |
+ configuration = ["main", "sources", "timeline", "profiles", "console", "codemirror"]; |
} else { |
- configuration = ["main", "elements", "network", "sources", "timeline", "profiles", "resources", "audits", "console", "codemirror", "extensions", "settings", "search"]; |
+ configuration = ["main", "elements", "network", "sources", "timeline", "profiles", "resources", "audits", "console", "codemirror", "extensions", "settings"]; |
if (WebInspector.experimentsSettings.layersPanel.isEnabled()) |
configuration.push("layers"); |
} |
@@ -70,8 +70,8 @@ WebInspector.Main.prototype = { |
if (WebInspector.dockController.element) |
WebInspector.inspectorView.appendToRightToolbar(WebInspector.dockController.element); |
- if (this._screencastController) |
- WebInspector.inspectorView.appendToRightToolbar(this._screencastController.statusBarItem()); |
+ if (WebInspector._screencastController) |
+ WebInspector.inspectorView.appendToRightToolbar(WebInspector._screencastController.statusBarItem()); |
}, |
_createRootView: function() |
@@ -261,15 +261,21 @@ WebInspector.Main.prototype = { |
WebInspector.console.addEventListener(WebInspector.ConsoleModel.Events.MessageAdded, this._updateErrorAndWarningCounts, this); |
WebInspector.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.DebuggerPaused, this._debuggerPaused, this); |
+ WebInspector.networkLog = new WebInspector.NetworkLog(); |
WebInspector.zoomManager = new WebInspector.ZoomManager(); |
+ WebInspector.advancedSearchController = new WebInspector.AdvancedSearchController(); |
+ |
InspectorBackend.registerInspectorDispatcher(this); |
WebInspector.isolatedFileSystemManager = new WebInspector.IsolatedFileSystemManager(); |
WebInspector.isolatedFileSystemDispatcher = new WebInspector.IsolatedFileSystemDispatcher(WebInspector.isolatedFileSystemManager); |
WebInspector.workspace = new WebInspector.Workspace(WebInspector.isolatedFileSystemManager.mapping()); |
+ WebInspector.timelineManager = new WebInspector.TimelineManager(); |
+ WebInspector.tracingAgent = new WebInspector.TracingAgent(); |
+ |
if (Capabilities.isMainFrontend) { |
WebInspector.inspectElementModeController = new WebInspector.InspectElementModeController(); |
WebInspector.workerFrontendManager = new WebInspector.WorkerFrontendManager(); |
@@ -307,10 +313,10 @@ WebInspector.Main.prototype = { |
new WebInspector.WorkspaceController(WebInspector.workspace); |
- WebInspector.fileSystemWorkspaceBinding = new WebInspector.FileSystemWorkspaceBinding(WebInspector.isolatedFileSystemManager, WebInspector.workspace); |
+ WebInspector.fileSystemWorkspaceProvider = new WebInspector.FileSystemWorkspaceProvider(WebInspector.isolatedFileSystemManager, WebInspector.workspace); |
- WebInspector.networkWorkspaceBinding = new WebInspector.NetworkWorkspaceBinding(WebInspector.workspace); |
- new WebInspector.NetworkUISourceCodeProvider(WebInspector.networkWorkspaceBinding, WebInspector.workspace); |
+ WebInspector.networkWorkspaceProvider = new WebInspector.SimpleWorkspaceProvider(WebInspector.workspace, WebInspector.projectTypes.Network); |
+ new WebInspector.NetworkUISourceCodeProvider(WebInspector.networkWorkspaceProvider, WebInspector.workspace); |
WebInspector.breakpointManager = new WebInspector.BreakpointManager(WebInspector.settings.breakpoints, WebInspector.debuggerModel, WebInspector.workspace); |
@@ -319,9 +325,9 @@ WebInspector.Main.prototype = { |
WebInspector.overridesSupport = new WebInspector.OverridesSupport(); |
WebInspector.overridesSupport.applyInitialOverrides(); |
- new WebInspector.DebuggerScriptMapping(WebInspector.debuggerModel, WebInspector.workspace, WebInspector.networkWorkspaceBinding); |
+ new WebInspector.DebuggerScriptMapping(WebInspector.debuggerModel, WebInspector.workspace, WebInspector.networkWorkspaceProvider); |
WebInspector.liveEditSupport = new WebInspector.LiveEditSupport(WebInspector.workspace); |
- new WebInspector.CSSStyleSheetMapping(WebInspector.cssModel, WebInspector.workspace, WebInspector.networkWorkspaceBinding); |
+ new WebInspector.CSSStyleSheetMapping(WebInspector.cssModel, WebInspector.workspace, WebInspector.networkWorkspaceProvider); |
new WebInspector.PresentationConsoleMessageHelper(WebInspector.workspace); |
// Create settings before loading modules. |
@@ -359,6 +365,10 @@ WebInspector.Main.prototype = { |
WebInspector.extensionServerProxy.setFrontendReady(); |
+ WebInspector.databaseModel = new WebInspector.DatabaseModel(); |
+ WebInspector.domStorageModel = new WebInspector.DOMStorageModel(); |
+ WebInspector.cpuProfilerModel = new WebInspector.CPUProfilerModel(mainTarget); |
+ |
InspectorAgent.enable(inspectorAgentEnableCallback.bind(this)); |
/** |
@@ -405,7 +415,7 @@ WebInspector.Main.prototype = { |
var uiSourceCode = WebInspector.workspace.uiSourceCodeForURL(anchor.href); |
if (uiSourceCode) { |
- WebInspector.Revealer.reveal(uiSourceCode.uiLocation(anchor.lineNumber || 0, anchor.columnNumber || 0)); |
+ WebInspector.Revealer.reveal(new WebInspector.UILocation(uiSourceCode, anchor.lineNumber || 0, anchor.columnNumber || 0)); |
return; |
} |
@@ -460,10 +470,7 @@ WebInspector.Main.prototype = { |
section.addKey(shortcut.makeDescriptor(shortcut.Keys.Esc), toggleDrawerLabel); |
section.addKey(shortcut.makeDescriptor("f", shortcut.Modifiers.CtrlOrMeta), WebInspector.UIString("Search")); |
- var advancedSearchShortcutModifier = WebInspector.isMac() |
- ? WebInspector.KeyboardShortcut.Modifiers.Meta | WebInspector.KeyboardShortcut.Modifiers.Alt |
- : WebInspector.KeyboardShortcut.Modifiers.Ctrl | WebInspector.KeyboardShortcut.Modifiers.Shift; |
- var advancedSearchShortcut = shortcut.makeDescriptor("f", advancedSearchShortcutModifier); |
+ var advancedSearchShortcut = WebInspector.AdvancedSearchController.createShortcut(); |
section.addKey(advancedSearchShortcut, WebInspector.UIString("Search across all sources")); |
var inspectElementModeShortcut = WebInspector.InspectElementModeController.createShortcut(); |
@@ -521,6 +528,8 @@ WebInspector.Main.prototype = { |
} |
} |
+ if (!WebInspector.Dialog.currentInstance() && WebInspector.advancedSearchController.handleShortcut(event)) |
+ return; |
if (!WebInspector.Dialog.currentInstance() && WebInspector.inspectElementModeController && WebInspector.inspectElementModeController.handleShortcut(event)) |
return; |
@@ -552,6 +561,18 @@ WebInspector.Main.prototype = { |
event.preventDefault(); |
}, |
+ _inspectNodeRequested: function(event) |
+ { |
+ this._updateFocusedNode(event.data); |
+ }, |
+ |
+ _updateFocusedNode: function(nodeId) |
+ { |
+ var node = WebInspector.domModel.nodeForId(nodeId); |
+ console.assert(node); |
+ WebInspector.Revealer.reveal(node); |
+ }, |
+ |
_addMainEventListeners: function(doc) |
{ |
doc.addEventListener("keydown", this._postDocumentKeyDown.bind(this), false); |
@@ -569,7 +590,7 @@ WebInspector.Main.prototype = { |
inspect: function(payload, hints) |
{ |
var object = WebInspector.runtimeModel.createRemoteObject(payload); |
- if (object.isNode()) { |
+ if (object.subtype === "node") { |
object.pushNodeToFrontend(callback); |
var elementsPanel = /** @type {!WebInspector.ElementsPanel} */ (WebInspector.inspectorView.panel("elements")); |
elementsPanel.omitDefaultSelection(); |
@@ -577,13 +598,10 @@ WebInspector.Main.prototype = { |
return; |
} |
- /** |
- * @param {!WebInspector.DOMNode} node |
- */ |
- function callback(node) |
+ function callback(nodeId) |
{ |
elementsPanel.stopOmittingDefaultSelection(); |
- node.reveal(); |
+ WebInspector.Revealer.reveal(WebInspector.domModel.nodeForId(nodeId)); |
if (!WebInspector.inspectorView.drawerVisible() && !WebInspector._notFirstInspectElement) |
InspectorFrontendHost.inspectElementCompleted(); |
WebInspector._notFirstInspectElement = true; |
@@ -740,21 +758,6 @@ WebInspector.Main.ShortcutPanelSwitchSettingDelegate.prototype = { |
__proto__: WebInspector.UISettingDelegate.prototype |
} |
-/** |
- * @param {string} ws |
- */ |
-WebInspector.Main._addWebSocketTarget = function(ws) |
-{ |
- /** |
- * @param {!InspectorBackendClass.Connection} connection |
- */ |
- function callback(connection) |
- { |
- WebInspector.targetManager.createTarget(connection); |
- } |
- new InspectorBackendClass.WebSocketConnection(ws, callback); |
-} |
- |
new WebInspector.Main(); |
window.DEBUG = true; |