Browse Source

chore: cleanup dead <webview> related code (#29039)

Milan Burda 4 years ago
parent
commit
cbba602eae

+ 4 - 4
lib/browser/guest-view-manager.ts

@@ -34,12 +34,12 @@ const createGuest = function (embedder: Electron.WebContents, params: Record<str
   const guest = (webContents as typeof ElectronInternal.WebContents).create({
     type: 'webview',
     partition: params.partition,
-    embedder: embedder
+    embedder
   });
   const guestInstanceId = guest.id;
   guestInstances.set(guestInstanceId, {
-    guest: guest,
-    embedder: embedder
+    guest,
+    embedder
   });
 
   // Clear the guest from map when it is destroyed.
@@ -165,7 +165,7 @@ const attachGuest = function (event: Electron.IpcMainInvokeEvent,
       : null;
 
   const webPreferences: Electron.WebPreferences = {
-    guestInstanceId: guestInstanceId,
+    guestInstanceId,
     nodeIntegration: params.nodeintegration != null ? params.nodeintegration : false,
     nodeIntegrationInSubFrames: params.nodeintegrationinsubframes != null ? params.nodeintegrationinsubframes : false,
     plugins: params.plugins,

+ 0 - 1
lib/renderer/web-view/web-view-constants.ts

@@ -17,7 +17,6 @@ export const enum WEB_VIEW_CONSTANTS {
 
   // Error messages.
   ERROR_MSG_ALREADY_NAVIGATED = 'The object has already navigated, so its partition cannot be changed.',
-  ERROR_MSG_CANNOT_INJECT_SCRIPT = '<webview> = ' + 'Script cannot be injected into content until the page has loaded.',
   ERROR_MSG_INVALID_PARTITION_ATTRIBUTE = 'Invalid partition attribute.',
   ERROR_MSG_INVALID_PRELOAD_ATTRIBUTE = 'Only "file:" protocol is supported in "preload" attribute.'
 }

+ 0 - 3
lib/renderer/web-view/web-view-element.ts

@@ -18,8 +18,6 @@ type IWebViewImpl = webViewImplModule.WebViewImpl;
 const defineWebViewElement = (v8Util: NodeJS.V8UtilBinding, webViewImpl: typeof webViewImplModule) => {
   const { guestViewInternal, WebViewImpl } = webViewImpl;
   return class WebViewElement extends HTMLElement {
-    public internalInstanceId?: number;
-
     static get observedAttributes () {
       return [
         WEB_VIEW_CONSTANTS.ATTRIBUTE_PARTITION,
@@ -78,7 +76,6 @@ const defineWebViewElement = (v8Util: NodeJS.V8UtilBinding, webViewImpl: typeof
         guestViewInternal.detachGuest(internal.guestInstanceId);
       }
       internal.elementAttached = false;
-      this.internalInstanceId = 0;
       internal.reset();
     }
   };

+ 0 - 10
typings/internal-electron.d.ts

@@ -285,16 +285,6 @@ declare namespace ElectronInternal {
     loader: ModuleLoader;
   }
 
-  interface WebFrameResizeEvent extends WebViewEvent {
-    newWidth: number;
-    newHeight: number;
-  }
-
-  interface WebViewEvent extends Event {
-    url: string;
-    isMainFrame: boolean;
-  }
-
   class WebViewElement extends HTMLElement {
     static observedAttributes: Array<string>;