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

Expose TopLevelWindow to JavaScript

Browse source
This commit is contained in:
Cheng Zhao 2018-04-17 16:29:16 +09:00
parent cfed9fa4b9
commit 71ebd99dfa
6 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/api/atom_api_browser_window.cc
View file

@ -29,7 +29,7 @@ namespace api {
BrowserWindow::BrowserWindow(v8::Isolate* isolate,
v8::Local<v8::Object> wrapper,
const mate::Dictionary& options)
: TopLevelWindow(isolate, wrapper, options), weak_factory_(this) {
: TopLevelWindow(isolate, options), weak_factory_(this) {
mate::Handle<class WebContents> web_contents;
// Use options.webPreferences in WebContents.

10
atom/browser/api/atom_api_top_level_window.cc
View file

@ -70,7 +70,6 @@ v8::Local<v8::Value> ToBuffer(v8::Isolate* isolate, void* val, int size) {
} // namespace
TopLevelWindow::TopLevelWindow(v8::Isolate* isolate,
v8::Local<v8::Object> wrapper,
const mate::Dictionary& options)
: weak_factory_(this) {
// The parent window.
@ -101,6 +100,15 @@ TopLevelWindow::TopLevelWindow(v8::Isolate* isolate,
#endif
}
TopLevelWindow::TopLevelWindow(v8::Isolate* isolate,
v8::Local<v8::Object> wrapper,
const mate::Dictionary& options)
: TopLevelWindow(isolate, options) {
InitWith(isolate, wrapper);
// Init window after everything has been setup.
window()->InitFromOptions(options);
}
TopLevelWindow::~TopLevelWindow() {
if (!window_->IsClosed())
window_->CloseImmediately();

3
atom/browser/api/atom_api_top_level_window.h
View file

@ -35,6 +35,9 @@ class TopLevelWindow : public mate::TrackableObject<TopLevelWindow>,
NativeWindow* window() const { return window_.get(); }
protected:
// Common constructor.
TopLevelWindow(v8::Isolate* isolate, const mate::Dictionary& options);
// Creating independent TopLevelWindow instance.
TopLevelWindow(v8::Isolate* isolate,
v8::Local<v8::Object> wrapper,
const mate::Dictionary& options);