mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: make WebContentsView take webPreferences as parameter (#22997)

Browse source 
* chore: add WebContentsView.webContents helper

* chore: no need to handle webContents option

* chore: Create WebContentsView in C++

* chore: make WebContentsView accept web_preferences

* fix: nativeWindowOpen still passes WebContents to BrowserWindow

* chore: no more need of WebContentsViewRelay

* test: WebContentsView now takes options

* fix: avoid creating 2 constructors
This commit is contained in:
Cheng Zhao 2020-04-09 16:01:16 +09:00 • committed by GitHub
parent de893360f7
commit ca947307db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 108 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

26
shell/browser/api/electron_api_web_contents_view.h
View file

@ -8,6 +8,10 @@
#include "content/public/browser/web_contents_observer.h"
#include "shell/browser/api/electron_api_view.h"
namespace gin_helper {
class Dictionary;
}
namespace electron {
class InspectableWebContents;
@ -18,22 +22,34 @@ class WebContents;
class WebContentsView : public View, public content::WebContentsObserver {
public:
static gin_helper::WrappableBase* New(gin_helper::Arguments* args,
gin::Handle<WebContents> web_contents);
// Create a new instance of WebContentsView.
static gin::Handle<WebContentsView> Create(
v8::Isolate* isolate,
const gin_helper::Dictionary& web_preferences);
// Return the cached constructor function.
static v8::Local<v8::Function> GetConstructor(v8::Isolate* isolate);
// gin_helper::Wrappable
static void BuildPrototype(v8::Isolate* isolate,
v8::Local<v8::FunctionTemplate> prototype);
// Public APIs.
gin::Handle<WebContents> GetWebContents(v8::Isolate* isolate);
protected:
WebContentsView(v8::Isolate* isolate,
gin::Handle<WebContents> web_contents,
InspectableWebContents* iwc);
// Takes an existing WebContents.
WebContentsView(v8::Isolate* isolate, gin::Handle<WebContents> web_contents);
~WebContentsView() override;
// content::WebContentsObserver:
void WebContentsDestroyed() override;
private:
static gin_helper::WrappableBase* New(
gin_helper::Arguments* args,
const gin_helper::Dictionary& web_preferences);
// Keep a reference to v8 wrapper.
v8::Global<v8::Value> web_contents_;
api::WebContents* api_web_contents_;