diff --git a/docs/api/web-request.md b/docs/api/web-request.md index cf25ff634b0f0..eeb8b88de39cd 100644 --- a/docs/api/web-request.md +++ b/docs/api/web-request.md @@ -54,7 +54,7 @@ The following methods are available on instances of `WebRequest`: * `webContentsId` Integer (optional) * `webContents` WebContents (optional) * `frame` WebFrameMain (optional) - * `resourceType` String + * `resourceType` String - Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`, `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`. * `referrer` String * `timestamp` Double * `uploadData` [UploadData[]](structures/upload-data.md) @@ -99,7 +99,7 @@ Some examples of valid `urls`: * `webContentsId` Integer (optional) * `webContents` WebContents (optional) * `frame` WebFrameMain (optional) - * `resourceType` String + * `resourceType` String - Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`, `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`. * `referrer` String * `timestamp` Double * `requestHeaders` Record @@ -128,7 +128,7 @@ The `callback` has to be called with a `response` object. * `webContentsId` Integer (optional) * `webContents` WebContents (optional) * `frame` WebFrameMain (optional) - * `resourceType` String + * `resourceType` String - Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`, `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`. * `referrer` String * `timestamp` Double * `requestHeaders` Record @@ -150,7 +150,7 @@ response are visible by the time this listener is fired. * `webContentsId` Integer (optional) * `webContents` WebContents (optional) * `frame` WebFrameMain (optional) - * `resourceType` String + * `resourceType` String - Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`, `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`. * `referrer` String * `timestamp` Double * `statusLine` String @@ -184,7 +184,7 @@ The `callback` has to be called with a `response` object. * `webContentsId` Integer (optional) * `webContents` WebContents (optional) * `frame` WebFrameMain (optional) - * `resourceType` String + * `resourceType` String - Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`, `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`. * `referrer` String * `timestamp` Double * `responseHeaders` Record (optional) @@ -210,7 +210,7 @@ and response headers are available. * `webContentsId` Integer (optional) * `webContents` WebContents (optional) * `frame` WebFrameMain (optional) - * `resourceType` String + * `resourceType` String - Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`, `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`. * `referrer` String * `timestamp` Double * `redirectURL` String @@ -237,7 +237,7 @@ redirect is about to occur. * `webContentsId` Integer (optional) * `webContents` WebContents (optional) * `frame` WebFrameMain (optional) - * `resourceType` String + * `resourceType` String - Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`, `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`. * `referrer` String * `timestamp` Double * `responseHeaders` Record (optional) @@ -262,7 +262,7 @@ completed. * `webContentsId` Integer (optional) * `webContents` WebContents (optional) * `frame` WebFrameMain (optional) - * `resourceType` String + * `resourceType` String - Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`, `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`. * `referrer` String * `timestamp` Double * `fromCache` Boolean diff --git a/shell/browser/api/electron_api_web_request.cc b/shell/browser/api/electron_api_web_request.cc index 8dc4ed7a13330..621deff0cde20 100644 --- a/shell/browser/api/electron_api_web_request.cc +++ b/shell/browser/api/electron_api_web_request.cc @@ -29,19 +29,6 @@ namespace gin { -template <> -struct Converter { - static bool FromV8(v8::Isolate* isolate, - v8::Local val, - URLPattern* out) { - std::string pattern; - if (!ConvertFromV8(isolate, val, &pattern)) - return false; - *out = URLPattern(URLPattern::SCHEME_ALL); - return out->Parse(pattern) == URLPattern::ParseResult::kSuccess; - } -}; - template <> struct Converter { static v8::Local ToV8(v8::Isolate* isolate, @@ -63,12 +50,27 @@ struct Converter { case extensions::WebRequestResourceType::IMAGE: result = "image"; break; + case extensions::WebRequestResourceType::FONT: + result = "font"; + break; case extensions::WebRequestResourceType::OBJECT: result = "object"; break; case extensions::WebRequestResourceType::XHR: result = "xhr"; break; + case extensions::WebRequestResourceType::PING: + result = "ping"; + break; + case extensions::WebRequestResourceType::CSP_REPORT: + result = "cspReport"; + break; + case extensions::WebRequestResourceType::MEDIA: + result = "media"; + break; + case extensions::WebRequestResourceType::WEB_SOCKET: + result = "webSocket"; + break; default: result = "other"; }