chore: remove native_mate (Part 9) (#20645)
* refactor: remove a few uses of native_mate/gfx_converter.h * refactor: deprecate mate::EventEmitter * refactor: add gin_helper::EventEmitter * refactor: convert a few classes to use gin_helper::EventEmitter * refactor: get rid of native_mate_converters/gfx_converter.h * fix: follow native_mate on reporting errors * fix: gin is weak at guessing parameter types * fix: incorrect full class name * fix: gin::Handle does not accept null
This commit is contained in:
Cheng Zhao
GitHub
parent
b155ebeeb3
commit
eb0e55c514
38 changed files with 532 additions and 326 deletions
|
|
@ -9,7 +9,6 @@
|
|||
|
||||
#include "electron/buildflags/buildflags.h"
|
||||
#include "gin/dictionary.h"
|
||||
#include "native_mate/handle.h"
|
||||
#include "native_mate/persistent_dictionary.h"
|
||||
#include "shell/browser/api/atom_api_browser_view.h"
|
||||
#include "shell/browser/api/atom_api_menu.h"
|
||||
|
|
@ -17,13 +16,13 @@
|
|||
#include "shell/browser/api/atom_api_web_contents.h"
|
||||
#include "shell/common/color_util.h"
|
||||
#include "shell/common/gin_converters/callback_converter.h"
|
||||
#include "shell/common/gin_converters/file_path_converter.h"
|
||||
#include "shell/common/gin_converters/gfx_converter.h"
|
||||
#include "shell/common/gin_converters/image_converter.h"
|
||||
#include "shell/common/native_mate_converters/file_path_converter.h"
|
||||
#include "shell/common/native_mate_converters/gfx_converter.h"
|
||||
#include "shell/common/native_mate_converters/image_converter.h"
|
||||
#include "shell/common/native_mate_converters/native_window_converter.h"
|
||||
#include "shell/common/native_mate_converters/string16_converter.h"
|
||||
#include "shell/common/native_mate_converters/value_converter.h"
|
||||
#include "shell/common/gin_converters/native_window_converter.h"
|
||||
#include "shell/common/gin_converters/value_converter_gin_adapter.h"
|
||||
#include "shell/common/gin_helper/dictionary.h"
|
||||
#include "shell/common/gin_helper/object_template_builder.h"
|
||||
#include "shell/common/node_includes.h"
|
||||
#include "shell/common/options_switches.h"
|
||||
|
||||
|
|
@ -36,11 +35,8 @@
|
|||
#include "ui/base/win/shell.h"
|
||||
#endif
|
||||
|
||||
// TODO(zcbenz): Remove this after removing mate::ObjectTemplateBuilder.
|
||||
#include "shell/common/native_mate_converters/callback_converter_deprecated.h"
|
||||
|
||||
#if defined(OS_WIN)
|
||||
namespace mate {
|
||||
namespace gin {
|
||||
|
||||
template <>
|
||||
struct Converter<electron::TaskbarHost::ThumbarButton> {
|
||||
|
|
@ -57,7 +53,7 @@ struct Converter<electron::TaskbarHost::ThumbarButton> {
|
|||
}
|
||||
};
|
||||
|
||||
} // namespace mate
|
||||
} // namespace gin
|
||||
#endif
|
||||
|
||||
namespace electron {
|
||||
|
|
@ -87,11 +83,11 @@ TopLevelWindow::TopLevelWindow(v8::Isolate* isolate,
|
|||
|
||||
#if BUILDFLAG(ENABLE_OSR)
|
||||
// Offscreen windows are always created frameless.
|
||||
mate::Dictionary web_preferences;
|
||||
gin_helper::Dictionary web_preferences;
|
||||
bool offscreen;
|
||||
if (options.Get(options::kWebPreferences, &web_preferences) &&
|
||||
web_preferences.Get(options::kOffscreen, &offscreen) && offscreen) {
|
||||
const_cast<mate::Dictionary&>(options).Set(options::kFrame, false);
|
||||
const_cast<gin_helper::Dictionary&>(options).Set(options::kFrame, false);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -108,7 +104,7 @@ TopLevelWindow::TopLevelWindow(v8::Isolate* isolate,
|
|||
#endif
|
||||
}
|
||||
|
||||
TopLevelWindow::TopLevelWindow(gin::Arguments* args,
|
||||
TopLevelWindow::TopLevelWindow(gin_helper::Arguments* args,
|
||||
const mate::Dictionary& options)
|
||||
: TopLevelWindow(args->isolate(), options) {
|
||||
InitWithArgs(args);
|
||||
|
|
@ -128,13 +124,16 @@ TopLevelWindow::~TopLevelWindow() {
|
|||
void TopLevelWindow::InitWith(v8::Isolate* isolate,
|
||||
v8::Local<v8::Object> wrapper) {
|
||||
AttachAsUserData(window_.get());
|
||||
mate::TrackableObject<TopLevelWindow>::InitWith(isolate, wrapper);
|
||||
mate::TrackableObject<
|
||||
TopLevelWindow, gin_helper::EventEmitter<
|
||||
mate::Wrappable<TopLevelWindow>>>::InitWith(isolate,
|
||||
wrapper);
|
||||
|
||||
// We can only append this window to parent window's child windows after this
|
||||
// window's JS wrapper gets initialized.
|
||||
if (!parent_window_.IsEmpty()) {
|
||||
mate::Handle<TopLevelWindow> parent;
|
||||
mate::ConvertFromV8(isolate, GetParentWindow(), &parent);
|
||||
gin::ConvertFromV8(isolate, GetParentWindow(), &parent);
|
||||
DCHECK(!parent.IsEmpty());
|
||||
parent->child_windows_.Set(isolate, weak_map_id(), wrapper);
|
||||
}
|
||||
|
|
@ -381,7 +380,8 @@ bool TopLevelWindow::IsFullscreen() {
|
|||
return window_->IsFullscreen();
|
||||
}
|
||||
|
||||
void TopLevelWindow::SetBounds(const gfx::Rect& bounds, mate::Arguments* args) {
|
||||
void TopLevelWindow::SetBounds(const gfx::Rect& bounds,
|
||||
gin_helper::Arguments* args) {
|
||||
bool animate = false;
|
||||
args->GetNext(&animate);
|
||||
window_->SetBounds(bounds, animate);
|
||||
|
|
@ -400,7 +400,7 @@ gfx::Rect TopLevelWindow::GetNormalBounds() {
|
|||
}
|
||||
|
||||
void TopLevelWindow::SetContentBounds(const gfx::Rect& bounds,
|
||||
mate::Arguments* args) {
|
||||
gin_helper::Arguments* args) {
|
||||
bool animate = false;
|
||||
args->GetNext(&animate);
|
||||
window_->SetContentBounds(bounds, animate);
|
||||
|
|
@ -410,7 +410,9 @@ gfx::Rect TopLevelWindow::GetContentBounds() {
|
|||
return window_->GetContentBounds();
|
||||
}
|
||||
|
||||
void TopLevelWindow::SetSize(int width, int height, mate::Arguments* args) {
|
||||
void TopLevelWindow::SetSize(int width,
|
||||
int height,
|
||||
gin_helper::Arguments* args) {
|
||||
bool animate = false;
|
||||
gfx::Size size = window_->GetMinimumSize();
|
||||
size.SetToMax(gfx::Size(width, height));
|
||||
|
|
@ -428,7 +430,7 @@ std::vector<int> TopLevelWindow::GetSize() {
|
|||
|
||||
void TopLevelWindow::SetContentSize(int width,
|
||||
int height,
|
||||
mate::Arguments* args) {
|
||||
gin_helper::Arguments* args) {
|
||||
bool animate = false;
|
||||
args->GetNext(&animate);
|
||||
window_->SetContentSize(gfx::Size(width, height), animate);
|
||||
|
|
@ -466,7 +468,8 @@ std::vector<int> TopLevelWindow::GetMaximumSize() {
|
|||
return result;
|
||||
}
|
||||
|
||||
void TopLevelWindow::SetSheetOffset(double offsetY, mate::Arguments* args) {
|
||||
void TopLevelWindow::SetSheetOffset(double offsetY,
|
||||
gin_helper::Arguments* args) {
|
||||
double offsetX = 0.0;
|
||||
args->GetNext(&offsetX);
|
||||
window_->SetSheetOffset(offsetX, offsetY);
|
||||
|
|
@ -520,7 +523,7 @@ bool TopLevelWindow::IsClosable() {
|
|||
return window_->IsClosable();
|
||||
}
|
||||
|
||||
void TopLevelWindow::SetAlwaysOnTop(bool top, mate::Arguments* args) {
|
||||
void TopLevelWindow::SetAlwaysOnTop(bool top, gin_helper::Arguments* args) {
|
||||
std::string level = "floating";
|
||||
int relative_level = 0;
|
||||
args->GetNext(&level);
|
||||
|
|
@ -539,7 +542,7 @@ void TopLevelWindow::Center() {
|
|||
window_->Center();
|
||||
}
|
||||
|
||||
void TopLevelWindow::SetPosition(int x, int y, mate::Arguments* args) {
|
||||
void TopLevelWindow::SetPosition(int x, int y, gin_helper::Arguments* args) {
|
||||
bool animate = false;
|
||||
args->GetNext(&animate);
|
||||
window_->SetPosition(gfx::Point(x, y), animate);
|
||||
|
|
@ -553,7 +556,7 @@ std::vector<int> TopLevelWindow::GetPosition() {
|
|||
return result;
|
||||
}
|
||||
void TopLevelWindow::MoveAbove(const std::string& sourceId,
|
||||
mate::Arguments* args) {
|
||||
gin_helper::Arguments* args) {
|
||||
#if BUILDFLAG(ENABLE_DESKTOP_CAPTURER)
|
||||
if (!window_->MoveAbove(sourceId))
|
||||
args->ThrowError("Invalid media source id");
|
||||
|
|
@ -655,8 +658,9 @@ bool TopLevelWindow::IsDocumentEdited() {
|
|||
return window_->IsDocumentEdited();
|
||||
}
|
||||
|
||||
void TopLevelWindow::SetIgnoreMouseEvents(bool ignore, mate::Arguments* args) {
|
||||
mate::Dictionary options;
|
||||
void TopLevelWindow::SetIgnoreMouseEvents(bool ignore,
|
||||
gin_helper::Arguments* args) {
|
||||
gin_helper::Dictionary options;
|
||||
bool forward = false;
|
||||
args->GetNext(&options) && options.Get("forward", &forward);
|
||||
return window_->SetIgnoreMouseEvents(ignore, forward);
|
||||
|
|
@ -676,7 +680,7 @@ void TopLevelWindow::SetMenu(v8::Isolate* isolate, v8::Local<v8::Value> value) {
|
|||
v8::Local<v8::Object> object;
|
||||
if (value->IsObject() && value->ToObject(context).ToLocal(&object) &&
|
||||
gin::V8ToString(isolate, object->GetConstructorName()) == "Menu" &&
|
||||
mate::ConvertFromV8(isolate, value, &menu) && !menu.IsEmpty()) {
|
||||
gin::ConvertFromV8(isolate, value, &menu) && !menu.IsEmpty()) {
|
||||
menu_.Reset(isolate, menu.ToV8());
|
||||
window_->SetMenu(menu->model());
|
||||
} else if (value->IsNull()) {
|
||||
|
|
@ -684,7 +688,7 @@ void TopLevelWindow::SetMenu(v8::Isolate* isolate, v8::Local<v8::Value> value) {
|
|||
window_->SetMenu(nullptr);
|
||||
} else {
|
||||
isolate->ThrowException(
|
||||
v8::Exception::TypeError(mate::StringToV8(isolate, "Invalid Menu")));
|
||||
v8::Exception::TypeError(gin::StringToV8(isolate, "Invalid Menu")));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -694,7 +698,7 @@ void TopLevelWindow::RemoveMenu() {
|
|||
}
|
||||
|
||||
void TopLevelWindow::SetParentWindow(v8::Local<v8::Value> value,
|
||||
mate::Arguments* args) {
|
||||
gin_helper::Arguments* args) {
|
||||
if (IsModal()) {
|
||||
args->ThrowError("Can not be called for modal window");
|
||||
return;
|
||||
|
|
@ -723,7 +727,7 @@ void TopLevelWindow::SetBrowserView(v8::Local<v8::Value> value) {
|
|||
void TopLevelWindow::AddBrowserView(v8::Local<v8::Value> value) {
|
||||
mate::Handle<BrowserView> browser_view;
|
||||
if (value->IsObject() &&
|
||||
mate::ConvertFromV8(isolate(), value, &browser_view)) {
|
||||
gin::ConvertFromV8(isolate(), value, &browser_view)) {
|
||||
auto get_that_view = browser_views_.find(browser_view->weak_map_id());
|
||||
if (get_that_view == browser_views_.end()) {
|
||||
window_->AddBrowserView(browser_view->view());
|
||||
|
|
@ -736,7 +740,7 @@ void TopLevelWindow::AddBrowserView(v8::Local<v8::Value> value) {
|
|||
void TopLevelWindow::RemoveBrowserView(v8::Local<v8::Value> value) {
|
||||
mate::Handle<BrowserView> browser_view;
|
||||
if (value->IsObject() &&
|
||||
mate::ConvertFromV8(isolate(), value, &browser_view)) {
|
||||
gin::ConvertFromV8(isolate(), value, &browser_view)) {
|
||||
auto get_that_view = browser_views_.find(browser_view->weak_map_id());
|
||||
if (get_that_view != browser_views_.end()) {
|
||||
window_->RemoveBrowserView(browser_view->view());
|
||||
|
|
@ -760,8 +764,9 @@ v8::Local<v8::Value> TopLevelWindow::GetNativeWindowHandle() {
|
|||
return ToBuffer(isolate(), &handle, sizeof(handle));
|
||||
}
|
||||
|
||||
void TopLevelWindow::SetProgressBar(double progress, mate::Arguments* args) {
|
||||
mate::Dictionary options;
|
||||
void TopLevelWindow::SetProgressBar(double progress,
|
||||
gin_helper::Arguments* args) {
|
||||
gin_helper::Dictionary options;
|
||||
std::string mode;
|
||||
args->GetNext(&options) && options.Get("mode", &mode);
|
||||
|
||||
|
|
@ -784,8 +789,8 @@ void TopLevelWindow::SetOverlayIcon(const gfx::Image& overlay,
|
|||
}
|
||||
|
||||
void TopLevelWindow::SetVisibleOnAllWorkspaces(bool visible,
|
||||
mate::Arguments* args) {
|
||||
mate::Dictionary options;
|
||||
gin_helper::Arguments* args) {
|
||||
gin_helper::Dictionary options;
|
||||
bool visibleOnFullScreen = false;
|
||||
args->GetNext(&options) &&
|
||||
options.Get("visibleOnFullScreen", &visibleOnFullScreen);
|
||||
|
|
@ -841,13 +846,13 @@ void TopLevelWindow::ToggleTabBar() {
|
|||
}
|
||||
|
||||
void TopLevelWindow::AddTabbedWindow(NativeWindow* window,
|
||||
mate::Arguments* args) {
|
||||
gin_helper::Arguments* args) {
|
||||
if (!window_->AddTabbedWindow(window))
|
||||
args->ThrowError("AddTabbedWindow cannot be called by a window on itself.");
|
||||
}
|
||||
|
||||
void TopLevelWindow::SetWindowButtonVisibility(bool visible,
|
||||
mate::Arguments* args) {
|
||||
gin_helper::Arguments* args) {
|
||||
if (!window_->SetWindowButtonVisibility(visible)) {
|
||||
args->ThrowError("Not supported for this window");
|
||||
}
|
||||
|
|
@ -870,14 +875,14 @@ bool TopLevelWindow::IsMenuBarVisible() {
|
|||
}
|
||||
|
||||
void TopLevelWindow::SetAspectRatio(double aspect_ratio,
|
||||
mate::Arguments* args) {
|
||||
gin_helper::Arguments* args) {
|
||||
gfx::Size extra_size;
|
||||
args->GetNext(&extra_size);
|
||||
window_->SetAspectRatio(aspect_ratio, extra_size);
|
||||
}
|
||||
|
||||
void TopLevelWindow::PreviewFile(const std::string& path,
|
||||
mate::Arguments* args) {
|
||||
gin_helper::Arguments* args) {
|
||||
std::string display_name;
|
||||
if (!args->GetNext(&display_name))
|
||||
display_name = path;
|
||||
|
|
@ -911,7 +916,7 @@ std::vector<v8::Local<v8::Object>> TopLevelWindow::GetChildWindows() const {
|
|||
}
|
||||
|
||||
v8::Local<v8::Value> TopLevelWindow::GetBrowserView(
|
||||
mate::Arguments* args) const {
|
||||
gin_helper::Arguments* args) const {
|
||||
if (browser_views_.size() == 0) {
|
||||
return v8::Null(isolate());
|
||||
} else if (browser_views_.size() == 1) {
|
||||
|
|
@ -939,7 +944,7 @@ bool TopLevelWindow::IsModal() const {
|
|||
return window_->is_modal();
|
||||
}
|
||||
|
||||
bool TopLevelWindow::SetThumbarButtons(mate::Arguments* args) {
|
||||
bool TopLevelWindow::SetThumbarButtons(gin_helper::Arguments* args) {
|
||||
#if defined(OS_WIN)
|
||||
std::vector<TaskbarHost::ThumbarButton> buttons;
|
||||
if (!args->GetNext(&buttons)) {
|
||||
|
|
@ -998,7 +1003,7 @@ bool TopLevelWindow::SetThumbnailToolTip(const std::string& tooltip) {
|
|||
window_->GetAcceleratedWidget(), tooltip);
|
||||
}
|
||||
|
||||
void TopLevelWindow::SetAppDetails(const mate::Dictionary& options) {
|
||||
void TopLevelWindow::SetAppDetails(const gin_helper::Dictionary& options) {
|
||||
base::string16 app_id;
|
||||
base::FilePath app_icon_path;
|
||||
int app_icon_index = 0;
|
||||
|
|
@ -1024,9 +1029,9 @@ int32_t TopLevelWindow::GetID() const {
|
|||
void TopLevelWindow::ResetBrowserViews() {
|
||||
for (auto& item : browser_views_) {
|
||||
mate::Handle<BrowserView> browser_view;
|
||||
if (mate::ConvertFromV8(isolate(),
|
||||
v8::Local<v8::Value>::New(isolate(), item.second),
|
||||
&browser_view) &&
|
||||
if (gin::ConvertFromV8(isolate(),
|
||||
v8::Local<v8::Value>::New(isolate(), item.second),
|
||||
&browser_view) &&
|
||||
!browser_view.IsEmpty()) {
|
||||
window_->RemoveBrowserView(browser_view->view());
|
||||
browser_view->web_contents()->SetOwnerWindow(nullptr);
|
||||
|
|
@ -1043,7 +1048,7 @@ void TopLevelWindow::RemoveFromParentChildWindows() {
|
|||
return;
|
||||
|
||||
mate::Handle<TopLevelWindow> parent;
|
||||
if (!mate::ConvertFromV8(isolate(), GetParentWindow(), &parent) ||
|
||||
if (!gin::ConvertFromV8(isolate(), GetParentWindow(), &parent) ||
|
||||
parent.IsEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -1052,7 +1057,7 @@ void TopLevelWindow::RemoveFromParentChildWindows() {
|
|||
}
|
||||
|
||||
// static
|
||||
mate::WrappableBase* TopLevelWindow::New(gin::Arguments* args) {
|
||||
mate::WrappableBase* TopLevelWindow::New(gin_helper::Arguments* args) {
|
||||
mate::Dictionary options = mate::Dictionary::CreateEmpty(args->isolate());
|
||||
args->GetNext(&options);
|
||||
|
||||
|
|
@ -1062,9 +1067,9 @@ mate::WrappableBase* TopLevelWindow::New(gin::Arguments* args) {
|
|||
// static
|
||||
void TopLevelWindow::BuildPrototype(v8::Isolate* isolate,
|
||||
v8::Local<v8::FunctionTemplate> prototype) {
|
||||
prototype->SetClassName(mate::StringToV8(isolate, "TopLevelWindow"));
|
||||
prototype->SetClassName(gin::StringToV8(isolate, "TopLevelWindow"));
|
||||
gin_helper::Destroyable::MakeDestroyable(isolate, prototype);
|
||||
mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
|
||||
gin_helper::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
|
||||
.SetMethod("setContentView", &TopLevelWindow::SetContentView)
|
||||
.SetMethod("close", &TopLevelWindow::Close)
|
||||
.SetMethod("focus", &TopLevelWindow::Focus)
|
||||
|
|
@ -1240,15 +1245,14 @@ void Initialize(v8::Local<v8::Object> exports,
|
|||
TopLevelWindow::SetConstructor(isolate,
|
||||
base::BindRepeating(&TopLevelWindow::New));
|
||||
|
||||
mate::Dictionary constructor(isolate, TopLevelWindow::GetConstructor(isolate)
|
||||
->GetFunction(context)
|
||||
.ToLocalChecked());
|
||||
constructor.SetMethod("fromId",
|
||||
&mate::TrackableObject<TopLevelWindow>::FromWeakMapID);
|
||||
constructor.SetMethod("getAllWindows",
|
||||
&mate::TrackableObject<TopLevelWindow>::GetAll);
|
||||
gin_helper::Dictionary constructor(isolate,
|
||||
TopLevelWindow::GetConstructor(isolate)
|
||||
->GetFunction(context)
|
||||
.ToLocalChecked());
|
||||
constructor.SetMethod("fromId", &TopLevelWindow::FromWeakMapID);
|
||||
constructor.SetMethod("getAllWindows", &TopLevelWindow::GetAll);
|
||||
|
||||
mate::Dictionary dict(isolate, exports);
|
||||
gin_helper::Dictionary dict(isolate, exports);
|
||||
dict.Set("TopLevelWindow", constructor);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue