refactor: consolidate WebContents::{Create,New} (electron#26521)

nornagon · web-flow · commit 92643a5a1c78 · 2020-11-17T14:14:33.000-08:00
diff --git a/lib/browser/api/web-contents.ts b/lib/browser/api/web-contents.ts
@@ -729,8 +729,8 @@ WebContents.prototype._init = function () {
 };
 
 // Public APIs.
-export function create (options = {}) {
-  return binding.create(options);
+export function create (options = {}): Electron.WebContents {
+  return new (WebContents as any)(options);
 }
 
 export function fromId (id: string) {
diff --git a/shell/browser/api/electron_api_browser_view.cc b/shell/browser/api/electron_api_browser_view.cc
@@ -79,7 +79,7 @@ BrowserView::BrowserView(gin::Arguments* args,
   options.Get(options::kWebPreferences, &web_preferences);
   web_preferences.Set("type", "browserView");
   gin::Handle<class WebContents> web_contents =
-      WebContents::Create(isolate, web_preferences);
+      WebContents::New(isolate, web_preferences);
 
   web_contents_.Reset(isolate, web_contents.ToV8());
   api_web_contents_ = web_contents.get();
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
@@ -3727,7 +3727,7 @@ ElectronBrowserContext* WebContents::GetBrowserContext() const {
 }
 
 // static
-gin::Handle<WebContents> WebContents::Create(
+gin::Handle<WebContents> WebContents::New(
     v8::Isolate* isolate,
     const gin_helper::Dictionary& options) {
   gin::Handle<WebContents> handle =
@@ -3736,13 +3736,6 @@ gin::Handle<WebContents> WebContents::Create(
   return handle;
 }
 
-// static
-gin::Handle<WebContents> WebContents::New(
-    v8::Isolate* isolate,
-    const gin_helper::Dictionary& options) {
-  return Create(isolate, options);
-}
-
 // static
 gin::Handle<WebContents> WebContents::CreateAndTake(
     v8::Isolate* isolate,
@@ -3809,7 +3802,6 @@ void Initialize(v8::Local<v8::Object> exports,
   v8::Isolate* isolate = context->GetIsolate();
   gin_helper::Dictionary dict(isolate, exports);
   dict.Set("WebContents", WebContents::GetConstructor(context));
-  dict.SetMethod("create", &WebContents::Create);
   dict.SetMethod("fromId", &WebContents::FromID);
   dict.SetMethod("getAllWebContents", &GetAllWebContentsAsV8);
 }
diff --git a/shell/browser/api/electron_api_web_contents.h b/shell/browser/api/electron_api_web_contents.h
@@ -111,8 +111,6 @@ class WebContents : public gin::Wrappable<WebContents>,
   };
 
   // Create a new WebContents and return the V8 wrapper of it.
-  static gin::Handle<WebContents> Create(v8::Isolate* isolate,
-                                         const gin_helper::Dictionary& options);
   static gin::Handle<WebContents> New(v8::Isolate* isolate,
                                       const gin_helper::Dictionary& options);
 
diff --git a/shell/browser/api/electron_api_web_contents_view.cc b/shell/browser/api/electron_api_web_contents_view.cc
@@ -113,7 +113,7 @@ gin_helper::WrappableBase* WebContentsView::New(
     }
   } else {
     // Create one if not.
-    web_contents = WebContents::Create(args->isolate(), web_preferences);
+    web_contents = WebContents::New(args->isolate(), web_preferences);
   }
   // Constructor call.
   auto* view = new WebContentsView(args->isolate(), web_contents);

Original file line number	Diff line number	Diff line change
`@@ -729,8 +729,8 @@ WebContents.prototype._init = function () {`
`729`	`729`	`};`
`730`	`730`
`731`	`731`	`// Public APIs.`
`732`		`-export function create (options = {}) {`
`733`		`- return binding.create(options);`
	`732`	`+export function create (options = {}): Electron.WebContents {`
	`733`	`+ return new (WebContents as any)(options);`
`734`	`734`	`}`
`735`	`735`
`736`	`736`	`export function fromId (id: string) {`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ gin_helper::WrappableBase* WebContentsView::New(`
`113`	`113`	`}`
`114`	`114`	`} else {`
`115`	`115`	`// Create one if not.`
`116`		`- web_contents = WebContents::Create(args->isolate(), web_preferences);`
	`116`	`+ web_contents = WebContents::New(args->isolate(), web_preferences);`
`117`	`117`	`}`
`118`	`118`	`// Constructor call.`
`119`	`119`	`auto* view = new WebContentsView(args->isolate(), web_contents);`