Skip to content

Commit

Permalink
squash 'resources/unpacked/devtools' changes from 7f1d79e..433b36f
Browse files Browse the repository at this point in the history
433b36f DevTools: accept multiple service connections to dt backend.
f8f9933 [Devtools] Bug fix of event dividers not showing in network panel
dc059ab DevTools: update styles for debugger's CallStackSidebarPane
aaecc7b DevTools: use services infrastructure for shared workers (temp storage).
e13243e DevTools: restore selected panel upon devtools reload. (a follow-up to tabbed location migration).
e76512f DevTools: throttle updates of layers panel when layer tree changes
c9c938b DevTools: migrate InspectorView to tabbed view location.
b0c3a48 DevTools: fix selection persistance when user switches back and forth from Layers panel
82fb90b DevTools: move overview grid window curtains handling into said window
a973be8 DevTools: teach WI.IsolatedFileSystem to memorize folders with .git directory
f25f93f Add auxclick to the devtool event listeners
9dffe65 Timeline: fix paint profiler image view
7bc9b57 [Devtools] Added row decoration to canvas timeline experiment
20a6bf8 [Devtools] Added data to networking timeline canvas experiment
1d4fdf5 DevTools: fix NPE in paint profiler when selection is made on empty profile
d976c00 Revert of DevTools: render element tree hover as a block. (patchset #1 id:1 of https://codereview.chromium.org/2404533002/ )
c4cd9eb DevTools: Remove legacy experimental v8 sampling format support from front-end.
fca245a DevTools: split LayerTreeModel accross different modules
93957f0 DevTools: fix exception in WI.TabbedEditorContainer

git-subtree-dir: resources/unpacked/devtools
git-subtree-split: 433b36f
  • Loading branch information
darwin committed Oct 14, 2016
1 parent 58697ff commit f855f61
Show file tree
Hide file tree
Showing 84 changed files with 2,557 additions and 2,687 deletions.
30 changes: 17 additions & 13 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ devtools_core_base_files = [
"front_end/formatter_worker.json",
"front_end/heap_snapshot_worker.js",
"front_end/heap_snapshot_worker.json",
"front_end/temp_storage_shared_worker.js",
"front_end/temp_storage_shared_worker.json",
"front_end/utility_shared_worker.js",
"front_end/utility_shared_worker.json",
"front_end/toolbox.js",
"front_end/toolbox.json",
"front_end/Runtime.js",
Expand Down Expand Up @@ -119,6 +119,7 @@ devtools_sdk_js_files = [
"front_end/sdk/HeapProfilerModel.js",
"front_end/sdk/InspectorBackend.js",
"front_end/sdk/InspectorBackendHostedMode.js",
"front_end/sdk/LayerTreeBase.js",
"front_end/sdk/NetworkLog.js",
"front_end/sdk/NetworkManager.js",
"front_end/sdk/NetworkRequest.js",
Expand Down Expand Up @@ -334,7 +335,7 @@ devtools_module_json_files = [
"front_end/source_frame/module.json",
"front_end/sources/module.json",
"front_end/snippets/module.json",
"front_end/temp_storage_shared_worker/module.json",
"front_end/utility_shared_worker/module.json",
"front_end/text_editor/module.json",
"front_end/timeline_model/module.json",
"front_end/timeline/module.json",
Expand Down Expand Up @@ -505,6 +506,7 @@ devtools_heap_snapshot_worker_js_files = [
]
devtools_layers_js_files = [
"front_end/layers/LayerPaintProfilerView.js",
"front_end/layers/LayerTreeModel.js",
"front_end/layers/LayersPanel.js",
]
devtools_network_js_files = [
Expand Down Expand Up @@ -684,8 +686,8 @@ devtools_snippets_js_files = [
"front_end/snippets/ScriptSnippetModel.js",
"front_end/snippets/SnippetStorage.js",
]
devtools_temp_storage_shared_worker_js_files =
[ "front_end/temp_storage_shared_worker/TempStorageSharedWorker.js" ]
devtools_utility_shared_worker_js_files =
[ "front_end/utility_shared_worker/TempStorage.js" ]
devtools_text_editor_js_files = [
"front_end/text_editor/cmdevtools.css",
"front_end/text_editor/CodeMirrorTextEditor.js",
Expand All @@ -700,7 +702,7 @@ devtools_terminal_js_files = [
"front_end/terminal/xterm.js/build/xterm.js",
]
devtools_timeline_model_js_files = [
"front_end/timeline_model/LayerTreeModel.js",
"front_end/timeline_model/TracingLayerTree.js",
"front_end/timeline_model/TimelineFrameModel.js",
"front_end/timeline_model/TimelineIRModel.js",
"front_end/timeline_model/TimelineJSProfile.js",
Expand All @@ -721,6 +723,7 @@ devtools_layer_viewer_js_files = [
devtools_timeline_js_files = [
"front_end/timeline/invalidationsTree.css",
"front_end/timeline/timelineFlamechartPopover.css",
"front_end/timeline/timelinePaintProfiler.css",
"front_end/timeline/timelinePanel.css",
"front_end/timeline/timelineStatusDialog.css",
"front_end/timeline/CountersGraph.js",
Expand Down Expand Up @@ -755,6 +758,8 @@ devtools_ui_lazy_js_files = [
"front_end/ui_lazy/TimelineOverviewPane.js",
"front_end/ui_lazy/ViewportDataGrid.js",
]
devtools_worker_service_js_files =
[ "front_end/worker_service/ServiceDispatcher.js" ]

# Third-party code.
devtools_cm_css_files = [ "front_end/cm/codemirror.css" ]
Expand Down Expand Up @@ -874,10 +879,10 @@ devtools_modules_js_files =
devtools_formatter_worker_js_files + devtools_settings_js_files +
devtools_services_js_files + devtools_snippets_js_files +
devtools_source_frame_js_files + devtools_sources_js_files +
devtools_temp_storage_shared_worker_js_files +
devtools_text_editor_js_files + devtools_terminal_js_files +
devtools_timeline_model_js_files + devtools_timeline_js_files +
devtools_ui_lazy_js_files + devtools_layer_viewer_js_files
devtools_utility_shared_worker_js_files + devtools_text_editor_js_files +
devtools_terminal_js_files + devtools_timeline_model_js_files +
devtools_timeline_js_files + devtools_ui_lazy_js_files +
devtools_layer_viewer_js_files + devtools_worker_service_js_files

all_devtools_files = devtools_cm_css_files + devtools_cm_js_files +
devtools_core_files + devtools_module_json_files +
Expand All @@ -900,7 +905,7 @@ generated_entry_files = [
generated_workers = [
"$resources_out_dir/formatter_worker.js",
"$resources_out_dir/heap_snapshot_worker.js",
"$resources_out_dir/temp_storage_shared_worker.js",
"$resources_out_dir/utility_shared_worker.js",
]

generated_bundled_modules = [
Expand All @@ -918,7 +923,6 @@ generated_bundled_modules = [
"$resources_out_dir/resources/resources_module.js",
"$resources_out_dir/sass/sass_module.js",
"$resources_out_dir/security/security_module.js",
"$resources_out_dir/services/services_module.js",
"$resources_out_dir/settings/settings_module.js",
"$resources_out_dir/snippets/snippets_module.js",
"$resources_out_dir/source_frame/source_frame_module.js",
Expand All @@ -943,7 +947,7 @@ devtools_applications = [
"toolbox",
"formatter_worker",
"heap_snapshot_worker",
"temp_storage_shared_worker",
"utility_shared_worker",
]

#-------------------------------------------------------------------------------
Expand Down
24 changes: 24 additions & 0 deletions front_end/Runtime.js
Original file line number Diff line number Diff line change
Expand Up @@ -1142,5 +1142,29 @@ Runtime.resolveSourceURL = function(path)
return "\n/*# sourceURL=" + sourceURL + " */";
}

/**
* @interface
*/
function ServicePort() { }

ServicePort.prototype = {
/**
* @param {function(string)} messageHandler
* @param {function(string)} closeHandler
*/
setHandlers: function(messageHandler, closeHandler) { },

/**
* @param {string} message
* @return {!Promise<boolean>}
*/
send: function(message) { },

/**
* @return {!Promise<boolean>}
*/
close: function() { }
}

/** @type {!Runtime} */
var runtime;
5 changes: 0 additions & 5 deletions front_end/audits/AuditsPanel.js
Original file line number Diff line number Diff line change
Expand Up @@ -531,11 +531,6 @@ WebInspector.AuditResultSidebarTreeElement.prototype = {
__proto__: TreeElement.prototype
}

WebInspector.AuditsPanel.show = function()
{
WebInspector.inspectorView.setCurrentPanel(WebInspector.AuditsPanel.instance());
}

/**
* @return {!WebInspector.AuditsPanel}
*/
Expand Down
5 changes: 3 additions & 2 deletions front_end/audits/module.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"extensions": [
{
"type": "@WebInspector.Panel",
"name": "audits",
"type": "view",
"location": "panel",
"id": "audits",
"title": "Audits",
"order": 90,
"className": "WebInspector.AuditsPanel"
Expand Down
20 changes: 16 additions & 4 deletions front_end/bindings/FileSystemWorkspaceBinding.js
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,22 @@ WebInspector.FileSystemWorkspaceBinding.FileSystem.prototype = {

populate: function()
{
this._fileSystem.requestFilesRecursive("", this._addFile.bind(this));
var chunkSize = 1000;
var filePaths = this._fileSystem.filePaths();
reportFileChunk.call(this, 0);

/**
* @param {number} from
* @this {WebInspector.FileSystemWorkspaceBinding.FileSystem}
*/
function reportFileChunk(from)
{
var to = Math.min(from + chunkSize, filePaths.length);
for (var i = from; i < to; ++i)
this._addFile(filePaths[i]);
if (to < filePaths.length)
setTimeout(reportFileChunk.bind(this, to), 100);
}
},

/**
Expand Down Expand Up @@ -499,9 +514,6 @@ WebInspector.FileSystemWorkspaceBinding.FileSystem.prototype = {
*/
_addFile: function(filePath)
{
if (!filePath)
console.assert(false);

var extension = this._extensionForPath(filePath);
var contentType = WebInspector.FileSystemWorkspaceBinding._contentTypeForExtension(extension);

Expand Down
50 changes: 6 additions & 44 deletions front_end/bindings/TempFile.js
Original file line number Diff line number Diff line change
Expand Up @@ -387,55 +387,17 @@ WebInspector.DeferredTempFile.prototype = {
}
}

/**
* @param {function(?)} fulfill
* @param {function(*)} reject
*/
WebInspector.TempFile._clearTempStorage = function(fulfill, reject)
{
/**
* @param {!Event} event
*/
function handleError(event)
{
WebInspector.console.error(WebInspector.UIString("Failed to clear temp storage: %s", event.data));
reject(event.data);
}

/**
* @param {!Event} event
*/
function handleMessage(event)
{
if (event.data.type === "tempStorageCleared") {
if (event.data.error)
WebInspector.console.error(event.data.error);
else
fulfill(undefined);
return;
}
reject(event.data);
}

try {
var worker = new WebInspector.Worker("temp_storage_shared_worker", "TempStorageCleaner");
worker.onerror = handleError;
worker.onmessage = handleMessage;
} catch (e) {
if (e.name === "URLMismatchError")
console.log("Shared worker wasn't started due to url difference. " + e);
else
throw e;
}
}

/**
* @return {!Promise.<undefined>}
*/
WebInspector.TempFile.ensureTempStorageCleared = function()
{
if (!WebInspector.TempFile._storageCleanerPromise)
WebInspector.TempFile._storageCleanerPromise = new Promise(WebInspector.TempFile._clearTempStorage);
if (!WebInspector.TempFile._storageCleanerPromise) {
WebInspector.TempFile._storageCleanerPromise = WebInspector.serviceManager.createWorkerService("utility_shared_worker", "TempStorage", true).then(service => {
if (service)
return service.send("clear");
});
}
return WebInspector.TempFile._storageCleanerPromise;
}

Expand Down
7 changes: 6 additions & 1 deletion front_end/bindings/module.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"dependencies": ["sdk", "platform", "workspace"],
"dependencies": [
"sdk",
"platform",
"services",
"workspace"
],
"scripts": [
"LiveLocation.js",
"CompilerScriptMapping.js",
Expand Down
13 changes: 10 additions & 3 deletions front_end/common/Settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -399,16 +399,15 @@ WebInspector.VersionController = function()
}

WebInspector.VersionController._currentVersionName = "inspectorVersion";
WebInspector.VersionController.currentVersion = 19;
WebInspector.VersionController.currentVersion = 20;

WebInspector.VersionController.prototype = {
updateVersion: function()
{
var localStorageVersion = window.localStorage ? window.localStorage[WebInspector.VersionController._currentVersionName] : 0;
var versionSetting = WebInspector.settings.createSetting(WebInspector.VersionController._currentVersionName, 0);
var currentVersion = WebInspector.VersionController.currentVersion;
// While localStorage version exists, treat it as the main one. It'll be erased once migrated to prefs.
var oldVersion = parseInt(localStorageVersion || "0", 10) || versionSetting.get();
var oldVersion = versionSetting.get() || parseInt(localStorageVersion || "0", 10);
if (oldVersion === 0) {
// First run, no need to do anything.
versionSetting.set(currentVersion);
Expand Down Expand Up @@ -727,6 +726,14 @@ WebInspector.VersionController.prototype = {
visibleColumnSettings.remove();
},

_updateVersionFrom19To20: function()
{
var oldSetting = WebInspector.settings.createSetting("InspectorView.panelOrder", {});
var newSetting = WebInspector.settings.createSetting("panel-tabOrder", {});
newSetting.set(oldSetting.get());
oldSetting.remove();
},

_migrateSettingsFromLocalStorage: function()
{
// This step migrates all the settings except for the ones below into the browser profile.
Expand Down
24 changes: 7 additions & 17 deletions front_end/common/Worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,18 @@
/**
* @constructor
* @param {string} appName
* @param {string=} workerName
*/
WebInspector.Worker = function(appName, workerName)
WebInspector.Worker = function(appName)
{
var url = appName + ".js";
var remoteBase = Runtime.queryParam("remoteBase");
if (remoteBase)
url += "?remoteBase=" + remoteBase;

/** @type {!Promise<!Worker|!SharedWorker>} */
/** @type {!Promise<!Worker>} */
this._workerPromise = new Promise(fulfill => {
var isSharedWorker = !!workerName;
if (isSharedWorker) {
this._worker = new SharedWorker(url, workerName);
this._worker.port.onmessage = onMessage.bind(this);
} else {
this._worker = new Worker(url);
this._worker.onmessage = onMessage.bind(this);
}
this._worker = new Worker(url);
this._worker.onmessage = onMessage.bind(this);

/**
* @param {!Event} event
Expand All @@ -58,10 +51,7 @@ WebInspector.Worker = function(appName, workerName)
function onMessage(event)
{
console.assert(event.data === "workerReady");
if (isSharedWorker)
this._worker.port.onmessage = null;
else
this._worker.onmessage = null;
this._worker.onmessage = null;
fulfill(this._worker);
// No need to hold a reference to worker anymore as it's stored in
// the resolved promise.
Expand Down Expand Up @@ -98,14 +88,14 @@ WebInspector.Worker.prototype = {
*/
set onmessage(listener)
{
this._workerPromise.then(worker => (worker.port || worker).onmessage = listener);
this._workerPromise.then(worker => worker.onmessage = listener);
},

/**
* @param {?function(!Event)} listener
*/
set onerror(listener)
{
this._workerPromise.then(worker => (worker.port || worker).onerror = listener);
this._workerPromise.then(worker => worker.onerror = listener);
}
}
Loading

0 comments on commit f855f61

Please sign in to comment.