Merge from vscode 0a7364f00514c46c9caceece15e1f82f82e3712f

src/vs/platform/webview/common/resourceLoader.ts

@@ -106,7 +106,6 @@ function normalizeRequestPath(requestUri: URI) {
 				return `${scheme}://`; // Url has own authority.
 			}
 		}));
-		console.log(requestUri, resourceUri);
 		return resourceUri.with({
 			query: requestUri.query,
 			fragment: requestUri.fragment

src/vs/platform/webview/electron-main/webviewProtocolProvider.ts

@@ -174,7 +174,7 @@ export class WebviewProtocolProvider extends Disposable {
 
 				const fileService = {
 					readFileStream: async (resource: URI): Promise<VSBufferReadableStream> => {
-						if (uri.scheme === Schemas.file) {
+						if (resource.scheme === Schemas.file) {
 							return (await this.fileService.readFileStream(resource)).value;
 						}