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

refactor: stop using isolate() in WebContents (#24602)

Browse source
This commit is contained in:
Jeremy Rose 2020-07-16 14:11:44 -07:00 • committed by GitHub
parent f649e604be
commit eb7c04c7c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 58 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
shell/browser/api/electron_api_web_contents.cc
View file

@ -721,10 +721,12 @@ void WebContents::AddNewContents(
auto* tracker = ChildWebContentsTracker::FromWebContents(new_contents.get()); auto* tracker = ChildWebContentsTracker::FromWebContents(new_contents.get());
DCHECK(tracker); DCHECK(tracker);
v8::Locker locker(isolate()); v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
v8::HandleScope handle_scope(isolate());
v8::Locker locker(isolate);
v8::HandleScope handle_scope(isolate);
auto api_web_contents = auto api_web_contents =
CreateAndTake(isolate(), std::move(new_contents), Type::BROWSER_WINDOW); CreateAndTake(isolate, std::move(new_contents), Type::BROWSER_WINDOW);
if (Emit("-add-new-contents", api_web_contents, disposition, user_gesture, if (Emit("-add-new-contents", api_web_contents, disposition, user_gesture,
initial_rect.x(), initial_rect.y(), initial_rect.width(), initial_rect.x(), initial_rect.y(), initial_rect.width(),
initial_rect.height(), tracker->url, tracker->frame_name, initial_rect.height(), tracker->url, tracker->frame_name,
@ -896,9 +898,10 @@ void WebContents::FindReply(content::WebContents* web_contents,
if (!final_update) if (!final_update)
return; return;
v8::Locker locker(isolate()); v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
v8::HandleScope handle_scope(isolate()); v8::Locker locker(isolate);
gin_helper::Dictionary result = gin::Dictionary::CreateEmpty(isolate()); v8::HandleScope handle_scope(isolate);
gin_helper::Dictionary result = gin::Dictionary::CreateEmpty(isolate);
result.Set("requestId", request_id); result.Set("requestId", request_id);
result.Set("matches", number_of_matches); result.Set("matches", number_of_matches);
result.Set("selectionArea", selection_rect); result.Set("selectionArea", selection_rect);
@ -1003,9 +1006,9 @@ void WebContents::RenderViewDeleted(content::RenderViewHost* render_view_host) {
void WebContents::RenderProcessGone(base::TerminationStatus status) { void WebContents::RenderProcessGone(base::TerminationStatus status) {
Emit("crashed", status == base::TERMINATION_STATUS_PROCESS_WAS_KILLED); Emit("crashed", status == base::TERMINATION_STATUS_PROCESS_WAS_KILLED);
v8::HandleScope handle_scope(isolate()); v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
gin_helper::Dictionary details = v8::HandleScope handle_scope(isolate);
gin_helper::Dictionary::CreateEmpty(isolate()); gin_helper::Dictionary details = gin_helper::Dictionary::CreateEmpty(isolate);
details.Set("reason", status); details.Set("reason", status);
Emit("render-process-gone", details); Emit("render-process-gone", details);
} }
@ -1153,11 +1156,12 @@ void WebContents::Invoke(bool internal,
void WebContents::ReceivePostMessage(const std::string& channel, void WebContents::ReceivePostMessage(const std::string& channel,
blink::TransferableMessage message) { blink::TransferableMessage message) {
v8::HandleScope handle_scope(isolate()); v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
v8::HandleScope handle_scope(isolate);
auto wrapped_ports = auto wrapped_ports =
MessagePort::EntanglePorts(isolate(), std::move(message.ports)); MessagePort::EntanglePorts(isolate, std::move(message.ports));
v8::Local<v8::Value> message_value = v8::Local<v8::Value> message_value =
electron::DeserializeV8Value(isolate(), message); electron::DeserializeV8Value(isolate, message);
EmitWithSender("-ipc-ports", receivers_.current_context(), InvokeCallback(), EmitWithSender("-ipc-ports", receivers_.current_context(), InvokeCallback(),
false, channel, message_value, std::move(wrapped_ports)); false, channel, message_value, std::move(wrapped_ports));
} }
@ -1165,8 +1169,9 @@ void WebContents::ReceivePostMessage(const std::string& channel,
void WebContents::PostMessage(const std::string& channel, void WebContents::PostMessage(const std::string& channel,
v8::Local<v8::Value> message_value, v8::Local<v8::Value> message_value,
base::Optional<v8::Local<v8::Value>> transfer) { base::Optional<v8::Local<v8::Value>> transfer) {
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
blink::TransferableMessage transferable_message; blink::TransferableMessage transferable_message;
if (!electron::SerializeV8Value(isolate(), message_value, if (!electron::SerializeV8Value(isolate, message_value,
&transferable_message)) { &transferable_message)) {
// SerializeV8Value sets an exception. // SerializeV8Value sets an exception.
return; return;
@ -1174,16 +1179,16 @@ void WebContents::PostMessage(const std::string& channel,
std::vector<gin::Handle<MessagePort>> wrapped_ports; std::vector<gin::Handle<MessagePort>> wrapped_ports;
if (transfer) { if (transfer) {
if (!gin::ConvertFromV8(isolate(), *transfer, &wrapped_ports)) { if (!gin::ConvertFromV8(isolate, *transfer, &wrapped_ports)) {
isolate()->ThrowException(v8::Exception::Error( isolate->ThrowException(v8::Exception::Error(
gin::StringToV8(isolate(), "Invalid value for transfer"))); gin::StringToV8(isolate, "Invalid value for transfer")));
return; return;
} }
} }
bool threw_exception = false; bool threw_exception = false;
transferable_message.ports = transferable_message.ports =
MessagePort::DisentanglePorts(isolate(), wrapped_ports, &threw_exception); MessagePort::DisentanglePorts(isolate, wrapped_ports, &threw_exception);
if (threw_exception) if (threw_exception)
return; return;
@ -1211,8 +1216,9 @@ void WebContents::MessageTo(bool internal,
const std::string& channel, const std::string& channel,
blink::CloneableMessage arguments) { blink::CloneableMessage arguments) {
TRACE_EVENT1("electron", "WebContents::MessageTo", "channel", channel); TRACE_EVENT1("electron", "WebContents::MessageTo", "channel", channel);
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
auto* web_contents = gin_helper::TrackableObject<WebContents>::FromWeakMapID( auto* web_contents = gin_helper::TrackableObject<WebContents>::FromWeakMapID(
isolate(), web_contents_id); isolate, web_contents_id);
if (web_contents) { if (web_contents) {
web_contents->SendIPCMessageWithSender(internal, send_to_all, channel, web_contents->SendIPCMessageWithSender(internal, send_to_all, channel,
@ -1352,11 +1358,12 @@ void WebContents::DevToolsFocused() {
} }
void WebContents::DevToolsOpened() { void WebContents::DevToolsOpened() {
v8::Locker locker(isolate()); v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
v8::HandleScope handle_scope(isolate()); v8::Locker locker(isolate);
v8::HandleScope handle_scope(isolate);
auto handle = auto handle =
FromOrCreate(isolate(), managed_web_contents()->GetDevToolsWebContents()); FromOrCreate(isolate, managed_web_contents()->GetDevToolsWebContents());
devtools_web_contents_.Reset(isolate(), handle.ToV8()); devtools_web_contents_.Reset(isolate, handle.ToV8());
// Set inspected tabID. // Set inspected tabID.
base::Value tab_id(ID()); base::Value tab_id(ID());
@ -1373,8 +1380,9 @@ void WebContents::DevToolsOpened() {
} }
void WebContents::DevToolsClosed() { void WebContents::DevToolsClosed() {
v8::Locker locker(isolate()); v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
v8::HandleScope handle_scope(isolate()); v8::Locker locker(isolate);
v8::HandleScope handle_scope(isolate);
devtools_web_contents_.Reset(); devtools_web_contents_.Reset();
Emit("devtools-closed"); Emit("devtools-closed");
@ -1656,7 +1664,8 @@ std::string WebContents::GetUserAgent() {
v8::Local<v8::Promise> WebContents::SavePage( v8::Local<v8::Promise> WebContents::SavePage(
const base::FilePath& full_file_path, const base::FilePath& full_file_path,
const content::SavePageType& save_type) { const content::SavePageType& save_type) {
gin_helper::Promise<void> promise(isolate()); v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
gin_helper::Promise<void> promise(isolate);
v8::Local<v8::Promise> handle = promise.GetHandle(); v8::Local<v8::Promise> handle = promise.GetHandle();
auto* handler = new SavePageHandler(web_contents(), std::move(promise)); auto* handler = new SavePageHandler(web_contents(), std::move(promise));
@ -2074,7 +2083,8 @@ std::vector<printing::PrinterBasicInfo> WebContents::GetPrinterList() {
} }
v8::Local<v8::Promise> WebContents::PrintToPDF(base::DictionaryValue settings) { v8::Local<v8::Promise> WebContents::PrintToPDF(base::DictionaryValue settings) {
gin_helper::Promise<v8::Local<v8::Value>> promise(isolate()); v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
gin_helper::Promise<v8::Local<v8::Value>> promise(isolate);
v8::Local<v8::Promise> handle = promise.GetHandle(); v8::Local<v8::Promise> handle = promise.GetHandle();
PrintPreviewMessageHandler::FromWebContents(web_contents()) PrintPreviewMessageHandler::FromWebContents(web_contents())
->PrintToPDF(std::move(settings), std::move(promise)); ->PrintToPDF(std::move(settings), std::move(promise));
@ -2216,10 +2226,11 @@ bool WebContents::SendIPCMessage(bool internal,
bool send_to_all, bool send_to_all,
const std::string& channel, const std::string& channel,
v8::Local<v8::Value> args) { v8::Local<v8::Value> args) {
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
blink::CloneableMessage message; blink::CloneableMessage message;
if (!gin::ConvertFromV8(isolate(), args, &message)) { if (!gin::ConvertFromV8(isolate, args, &message)) {
isolate()->ThrowException(v8::Exception::Error( isolate->ThrowException(v8::Exception::Error(
gin::StringToV8(isolate(), "Failed to serialize arguments"))); gin::StringToV8(isolate, "Failed to serialize arguments")));
return false; return false;
} }
return SendIPCMessageWithSender(internal, send_to_all, channel, return SendIPCMessageWithSender(internal, send_to_all, channel,
@ -2256,10 +2267,11 @@ bool WebContents::SendIPCMessageToFrame(bool internal,
int32_t frame_id, int32_t frame_id,
const std::string& channel, const std::string& channel,
v8::Local<v8::Value> args) { v8::Local<v8::Value> args) {
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
blink::CloneableMessage message; blink::CloneableMessage message;
if (!gin::ConvertFromV8(isolate(), args, &message)) { if (!gin::ConvertFromV8(isolate, args, &message)) {
isolate()->ThrowException(v8::Exception::Error( isolate->ThrowException(v8::Exception::Error(
gin::StringToV8(isolate(), "Failed to serialize arguments"))); gin::StringToV8(isolate, "Failed to serialize arguments")));
return false; return false;
} }
auto frames = web_contents()->GetAllFrames(); auto frames = web_contents()->GetAllFrames();
@ -2384,7 +2396,7 @@ void WebContents::StartDrag(const gin_helper::Dictionary& item,
v8::Local<v8::Promise> WebContents::CapturePage(gin_helper::Arguments* args) { v8::Local<v8::Promise> WebContents::CapturePage(gin_helper::Arguments* args) {
gfx::Rect rect; gfx::Rect rect;
gin_helper::Promise<gfx::Image> promise(isolate()); gin_helper::Promise<gfx::Image> promise(args->isolate());
v8::Local<v8::Promise> handle = promise.GetHandle(); v8::Local<v8::Promise> handle = promise.GetHandle();
// get rect arguments if they exist // get rect arguments if they exist
@ -2595,11 +2607,12 @@ v8::Local<v8::Value> WebContents::GetLastWebPreferences(
return gin::ConvertToV8(isolate, *web_preferences->last_preference()); return gin::ConvertToV8(isolate, *web_preferences->last_preference());
} }
v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() const { v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow(
v8::Isolate* isolate) const {
if (owner_window()) if (owner_window())
return BrowserWindow::From(isolate(), owner_window()); return BrowserWindow::From(isolate, owner_window());
else else
return v8::Null(isolate()); return v8::Null(isolate);
} }
int32_t WebContents::ID() const { int32_t WebContents::ID() const {
@ -2640,12 +2653,12 @@ void WebContents::SetDevToolsWebContents(const WebContents* devtools) {
managed_web_contents()->SetDevToolsWebContents(devtools->web_contents()); managed_web_contents()->SetDevToolsWebContents(devtools->web_contents());
} }
v8::Local<v8::Value> WebContents::GetNativeView() const { v8::Local<v8::Value> WebContents::GetNativeView(v8::Isolate* isolate) const {
gfx::NativeView ptr = web_contents()->GetNativeView(); gfx::NativeView ptr = web_contents()->GetNativeView();
auto buffer = node::Buffer::Copy(isolate(), reinterpret_cast<char*>(&ptr), auto buffer = node::Buffer::Copy(isolate, reinterpret_cast<char*>(&ptr),
sizeof(gfx::NativeView)); sizeof(gfx::NativeView));
if (buffer.IsEmpty()) if (buffer.IsEmpty())
return v8::Null(isolate()); return v8::Null(isolate);
else else
return buffer.ToLocalChecked(); return buffer.ToLocalChecked();
} }
@ -2681,8 +2694,9 @@ void WebContents::NotifyUserActivation() {
} }
v8::Local<v8::Promise> WebContents::TakeHeapSnapshot( v8::Local<v8::Promise> WebContents::TakeHeapSnapshot(
v8::Isolate* isolate,
const base::FilePath& file_path) { const base::FilePath& file_path) {
gin_helper::Promise<void> promise(isolate()); gin_helper::Promise<void> promise(isolate);
v8::Local<v8::Promise> handle = promise.GetHandle(); v8::Local<v8::Promise> handle = promise.GetHandle();
base::ThreadRestrictions::ScopedAllowIO allow_io; base::ThreadRestrictions::ScopedAllowIO allow_io;

7
shell/browser/api/electron_api_web_contents.h
View file

@ -232,7 +232,7 @@ class WebContents : public gin_helper::TrackableObject<WebContents>,
bool IsCurrentlyAudible(); bool IsCurrentlyAudible();
void SetEmbedder(const WebContents* embedder); void SetEmbedder(const WebContents* embedder);
void SetDevToolsWebContents(const WebContents* devtools); void SetDevToolsWebContents(const WebContents* devtools);
v8::Local<v8::Value> GetNativeView() const; v8::Local<v8::Value> GetNativeView(v8::Isolate* isolate) const;
void IncrementCapturerCount(gin_helper::Arguments* args); void IncrementCapturerCount(gin_helper::Arguments* args);
void DecrementCapturerCount(gin_helper::Arguments* args); void DecrementCapturerCount(gin_helper::Arguments* args);
bool IsBeingCaptured(); bool IsBeingCaptured();
@ -359,7 +359,7 @@ class WebContents : public gin_helper::TrackableObject<WebContents>,
v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate) const; v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate) const;
// Returns the owner window. // Returns the owner window.
v8::Local<v8::Value> GetOwnerBrowserWindow() const; v8::Local<v8::Value> GetOwnerBrowserWindow(v8::Isolate* isolate) const;
// Grants the child process the capability to access URLs with the origin of // Grants the child process the capability to access URLs with the origin of
// the specified URL. // the specified URL.
@ -368,7 +368,8 @@ class WebContents : public gin_helper::TrackableObject<WebContents>,
// Notifies the web page that there is user interaction. // Notifies the web page that there is user interaction.
void NotifyUserActivation(); void NotifyUserActivation();
v8::Local<v8::Promise> TakeHeapSnapshot(const base::FilePath& file_path); v8::Local<v8::Promise> TakeHeapSnapshot(v8::Isolate* isolate,
const base::FilePath& file_path);
// Properties. // Properties.
int32_t ID() const; int32_t ID() const;