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

refactor: use getter for frame in webrequest details (#30830)

Browse source
This commit is contained in:
Samuel Maddock 2021-09-06 20:13:16 -04:00 • committed by GitHub
parent f39ba9281c
commit 1546cb6e6c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
shell/browser/api/electron_api_web_request.cc
View file

@ -26,6 +26,7 @@
#include "shell/common/gin_converters/net_converter.h" #include "shell/common/gin_converters/net_converter.h"
#include "shell/common/gin_converters/std_converter.h" #include "shell/common/gin_converters/std_converter.h"
#include "shell/common/gin_converters/value_converter.h" #include "shell/common/gin_converters/value_converter.h"
#include "shell/common/gin_helper/dictionary.h"
namespace gin { namespace gin {
@ -144,7 +145,8 @@ v8::Local<v8::Value> HttpResponseHeadersToV8(
} }
// Overloaded by multiple types to fill the |details| object. // Overloaded by multiple types to fill the |details| object.
void ToDictionary(gin::Dictionary* details, extensions::WebRequestInfo* info) { void ToDictionary(gin_helper::Dictionary* details,
extensions::WebRequestInfo* info) {
details->Set("id", info->id); details->Set("id", info->id);
details->Set("url", info->url); details->Set("url", info->url);
details->Set("method", info->method); details->Set("method", info->method);
@ -163,7 +165,7 @@ void ToDictionary(gin::Dictionary* details, extensions::WebRequestInfo* info) {
auto* render_frame_host = auto* render_frame_host =
content::RenderFrameHost::FromID(info->render_process_id, info->frame_id); content::RenderFrameHost::FromID(info->render_process_id, info->frame_id);
if (render_frame_host) { if (render_frame_host) {
details->Set("frame", render_frame_host); details->SetGetter("frame", render_frame_host);
auto* web_contents = auto* web_contents =
content::WebContents::FromRenderFrameHost(render_frame_host); content::WebContents::FromRenderFrameHost(render_frame_host);
auto* api_web_contents = WebContents::From(web_contents); auto* api_web_contents = WebContents::From(web_contents);
@ -174,34 +176,34 @@ void ToDictionary(gin::Dictionary* details, extensions::WebRequestInfo* info) {
} }
} }
void ToDictionary(gin::Dictionary* details, void ToDictionary(gin_helper::Dictionary* details,
const network::ResourceRequest& request) { const network::ResourceRequest& request) {
details->Set("referrer", request.referrer); details->Set("referrer", request.referrer);
if (request.request_body) if (request.request_body)
details->Set("uploadData", *request.request_body); details->Set("uploadData", *request.request_body);
} }
void ToDictionary(gin::Dictionary* details, void ToDictionary(gin_helper::Dictionary* details,
const net::HttpRequestHeaders& headers) { const net::HttpRequestHeaders& headers) {
details->Set("requestHeaders", headers); details->Set("requestHeaders", headers);
} }
void ToDictionary(gin::Dictionary* details, const GURL& location) { void ToDictionary(gin_helper::Dictionary* details, const GURL& location) {
details->Set("redirectURL", location); details->Set("redirectURL", location);
} }
void ToDictionary(gin::Dictionary* details, int net_error) { void ToDictionary(gin_helper::Dictionary* details, int net_error) {
details->Set("error", net::ErrorToString(net_error)); details->Set("error", net::ErrorToString(net_error));
} }
// Helper function to fill |details| with arbitrary |args|. // Helper function to fill |details| with arbitrary |args|.
template <typename Arg> template <typename Arg>
void FillDetails(gin::Dictionary* details, Arg arg) { void FillDetails(gin_helper::Dictionary* details, Arg arg) {
ToDictionary(details, arg); ToDictionary(details, arg);
} }
template <typename Arg, typename... Args> template <typename Arg, typename... Args>
void FillDetails(gin::Dictionary* details, Arg arg, Args... args) { void FillDetails(gin_helper::Dictionary* details, Arg arg, Args... args) {
ToDictionary(details, arg); ToDictionary(details, arg);
FillDetails(details, args...); FillDetails(details, args...);
} }
@ -446,7 +448,7 @@ void WebRequest::HandleSimpleEvent(SimpleEvent event,
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate(); v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
v8::HandleScope handle_scope(isolate); v8::HandleScope handle_scope(isolate);
gin::Dictionary details(isolate, v8::Object::New(isolate)); gin_helper::Dictionary details(isolate, v8::Object::New(isolate));
FillDetails(&details, request_info, args...); FillDetails(&details, request_info, args...);
info.listener.Run(gin::ConvertToV8(isolate, details)); info.listener.Run(gin::ConvertToV8(isolate, details));
} }
@ -469,7 +471,7 @@ int WebRequest::HandleResponseEvent(ResponseEvent event,
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate(); v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
v8::HandleScope handle_scope(isolate); v8::HandleScope handle_scope(isolate);
gin::Dictionary details(isolate, v8::Object::New(isolate)); gin_helper::Dictionary details(isolate, v8::Object::New(isolate));
FillDetails(&details, request_info, args...); FillDetails(&details, request_info, args...);
ResponseCallback response = ResponseCallback response =