Merge from vscode 0a7364f00514c46c9caceece15e1f82f82e3712f

src/vs/workbench/workbench.web.api.ts

@@ -18,6 +18,7 @@ import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
 import { IWorkspaceProvider, IWorkspace } from 'vs/workbench/services/host/browser/browserHostService';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { IProductConfiguration } from 'vs/platform/product/common/productService';
+import { mark } from 'vs/base/common/performance';
 
 interface IResourceUriProvider {
 	(uri: URI): URI;
@@ -294,6 +295,11 @@ interface IWorkbenchConstructionOptions {
 	 */
 	readonly defaultLayout?: IDefaultLayout;
 
+	/**
+	 * Optional configuration default overrides contributed to the workbench.
+	 */
+	readonly configurationDefaults?: Record<string, any>;
+
 	//#endregion
 
 
@@ -359,6 +365,10 @@ let workbenchPromiseResolve: Function;
 const workbenchPromise = new Promise<IWorkbench>(resolve => workbenchPromiseResolve = resolve);
 async function create(domElement: HTMLElement, options: IWorkbenchConstructionOptions): Promise<void> {
 
+	// Mark start of workbench
+	mark('didLoadWorkbenchMain');
+	performance.mark('workbench-start');
+
 	// Assert that the workbench is not created more than once. We currently
 	// do not support this and require a full context switch to clean-up.
 	if (created) {