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

refactor: cleanup WebFrameMain + improve tests (#27455)

Browse source
This commit is contained in:
Milan Burda 2021-01-26 22:46:09 +01:00 • committed by GitHub
parent ddf3ef0a5f
commit bde714c1c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

24
shell/browser/api/electron_api_web_frame_main.cc
View file

@ -156,7 +156,7 @@ v8::Local<v8::Promise> WebFrameMain::ExecuteJavaScriptInIsolatedWorld(
return handle;
}
bool WebFrameMain::Reload(v8::Isolate* isolate) {
bool WebFrameMain::Reload() {
if (!CheckRenderFrame())
return false;
return render_frame_->Reload();
@ -219,19 +219,19 @@ void WebFrameMain::PostMessage(v8::Isolate* isolate,
std::move(transferable_message));
}
int WebFrameMain::FrameTreeNodeID(v8::Isolate* isolate) const {
int WebFrameMain::FrameTreeNodeID() const {
if (!CheckRenderFrame())
return -1;
return render_frame_->GetFrameTreeNodeId();
}
std::string WebFrameMain::Name(v8::Isolate* isolate) const {
std::string WebFrameMain::Name() const {
if (!CheckRenderFrame())
return std::string();
return render_frame_->GetFrameName();
}
base::ProcessId WebFrameMain::OSProcessID(v8::Isolate* isolate) const {
base::ProcessId WebFrameMain::OSProcessID() const {
if (!CheckRenderFrame())
return -1;
base::ProcessHandle process_handle =
@ -239,38 +239,37 @@ base::ProcessId WebFrameMain::OSProcessID(v8::Isolate* isolate) const {
return base::GetProcId(process_handle);
}
int WebFrameMain::ProcessID(v8::Isolate* isolate) const {
int WebFrameMain::ProcessID() const {
if (!CheckRenderFrame())
return -1;
return render_frame_->GetProcess()->GetID();
}
int WebFrameMain::RoutingID(v8::Isolate* isolate) const {
int WebFrameMain::RoutingID() const {
if (!CheckRenderFrame())
return -1;
return render_frame_->GetRoutingID();
}
GURL WebFrameMain::URL(v8::Isolate* isolate) const {
GURL WebFrameMain::URL() const {
if (!CheckRenderFrame())
return GURL::EmptyGURL();
return render_frame_->GetLastCommittedURL();
}
content::RenderFrameHost* WebFrameMain::Top(v8::Isolate* isolate) const {
content::RenderFrameHost* WebFrameMain::Top() const {
if (!CheckRenderFrame())
return nullptr;
return render_frame_->GetMainFrame();
}
content::RenderFrameHost* WebFrameMain::Parent(v8::Isolate* isolate) const {
content::RenderFrameHost* WebFrameMain::Parent() const {
if (!CheckRenderFrame())
return nullptr;
return render_frame_->GetParent();
}
std::vector<content::RenderFrameHost*> WebFrameMain::Frames(
v8::Isolate* isolate) const {
std::vector<content::RenderFrameHost*> WebFrameMain::Frames() const {
std::vector<content::RenderFrameHost*> frame_hosts;
if (!CheckRenderFrame())
return frame_hosts;
@ -283,8 +282,7 @@ std::vector<content::RenderFrameHost*> WebFrameMain::Frames(
return frame_hosts;
}
std::vector<content::RenderFrameHost*> WebFrameMain::FramesInSubtree(
v8::Isolate* isolate) const {
std::vector<content::RenderFrameHost*> WebFrameMain::FramesInSubtree() const {
std::vector<content::RenderFrameHost*> frame_hosts;
if (!CheckRenderFrame())
return frame_hosts;