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

chore: bump chromium to adc5df74b86afdff676989ced8cd3 (master) (#26223)

Browse source 
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
This commit is contained in:
Electron Bot 2020-11-13 16:16:56 -08:00 • committed by GitHub
parent d6019634f9
commit e017d8714e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
95 changed files with 496 additions and 804 deletions
Download patch file Download diff file Expand all files Collapse all files

2
shell/browser/api/electron_api_app.cc
View file

@ -473,8 +473,6 @@ int GetPathConstant(const std::string& name) {
else if (name == "recent")
return electron::DIR_RECENT;
#endif
else if (name == "pepperFlashSystemPlugin")
return chrome::FILE_PEPPER_FLASH_SYSTEM_PLUGIN;
else
return -1;
}

5
shell/browser/api/electron_api_cookies.cc
View file

@ -307,6 +307,9 @@ v8::Local<v8::Promise> Cookies::Set(v8::Isolate* isolate,
promise.RejectWithErrorMessage(error);
return handle;
}
bool same_party =
details.FindBoolKey("sameParty")
.value_or(secure && same_site != net::CookieSameSite::STRICT_MODE);
GURL url(url_string ? *url_string : "");
if (!url.is_valid()) {
@ -322,7 +325,7 @@ v8::Local<v8::Promise> Cookies::Set(v8::Isolate* isolate,
ParseTimeProperty(details.FindDoubleKey("creationDate")),
ParseTimeProperty(details.FindDoubleKey("expirationDate")),
ParseTimeProperty(details.FindDoubleKey("lastAccessDate")), secure,
http_only, same_site, net::COOKIE_PRIORITY_DEFAULT);
http_only, same_site, net::COOKIE_PRIORITY_DEFAULT, same_party);
if (!canonical_cookie || !canonical_cookie->IsCanonical()) {
promise.RejectWithErrorMessage(
InclusionStatusToString(net::CookieInclusionStatus(

2
shell/browser/api/electron_api_power_save_blocker.cc
View file

@ -6,7 +6,7 @@
#include <string>
#include "base/bind_helpers.h"
#include "base/callback_helpers.h"
#include "base/task/post_task.h"
#include "base/threading/thread_task_runner_handle.h"
#include "content/public/browser/device_service.h"

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

@ -38,8 +38,6 @@
#include "content/browser/renderer_host/render_frame_host_manager.h" // nogncheck
#include "content/browser/renderer_host/render_widget_host_impl.h" // nogncheck
#include "content/browser/renderer_host/render_widget_host_view_base.h" // nogncheck
#include "content/common/widget_messages.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/child_process_security_policy.h"
#include "content/public/browser/context_menu_params.h"
#include "content/public/browser/download_request_utils.h"
@ -62,6 +60,7 @@
#include "content/public/browser/storage_partition.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/referrer_type_converters.h"
#include "content/public/common/webplugininfo.h"
#include "electron/buildflags/buildflags.h"
#include "electron/shell/common/api/api.mojom.h"
#include "gin/arguments.h"
@ -1315,12 +1314,6 @@ void WebContents::RequestToLockMouse(content::WebContents* web_contents,
permission_helper->RequestPointerLockPermission(user_gesture);
}
std::unique_ptr<content::BluetoothChooser> WebContents::RunBluetoothChooser(
content::RenderFrameHost* frame,
const content::BluetoothChooser::EventHandler& event_handler) {
return std::make_unique<BluetoothChooser>(this, event_handler);
}
content::JavaScriptDialogManager* WebContents::GetJavaScriptDialogManager(
content::WebContents* source) {
if (!dialog_manager_)

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

@ -571,9 +571,6 @@ class WebContents : public gin::Wrappable<WebContents>,
void RequestToLockMouse(content::WebContents* web_contents,
bool user_gesture,
bool last_unlocked_by_target) override;
std::unique_ptr<content::BluetoothChooser> RunBluetoothChooser(
content::RenderFrameHost* frame,
const content::BluetoothChooser::EventHandler& handler) override;
content::JavaScriptDialogManager* GetJavaScriptDialogManager(
content::WebContents* source) override;
void OnAudioStateChanged(bool audible) override;

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

@ -10,6 +10,7 @@
#include "base/stl_util.h"
#include "base/values.h"
#include "extensions/browser/api/web_request/web_request_resource_type.h"
#include "gin/converter.h"
#include "gin/dictionary.h"
#include "gin/object_template_builder.h"
@ -40,30 +41,30 @@ struct Converter<URLPattern> {
};
template <>
struct Converter<blink::mojom::ResourceType> {
struct Converter<extensions::WebRequestResourceType> {
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
blink::mojom::ResourceType type) {
extensions::WebRequestResourceType type) {
const char* result;
switch (type) {
case blink::mojom::ResourceType::kMainFrame:
case extensions::WebRequestResourceType::MAIN_FRAME:
result = "mainFrame";
break;
case blink::mojom::ResourceType::kSubFrame:
case extensions::WebRequestResourceType::SUB_FRAME:
result = "subFrame";
break;
case blink::mojom::ResourceType::kStylesheet:
case extensions::WebRequestResourceType::STYLESHEET:
result = "stylesheet";
break;
case blink::mojom::ResourceType::kScript:
case extensions::WebRequestResourceType::SCRIPT:
result = "script";
break;
case blink::mojom::ResourceType::kImage:
case extensions::WebRequestResourceType::IMAGE:
result = "image";
break;
case blink::mojom::ResourceType::kObject:
case extensions::WebRequestResourceType::OBJECT:
result = "object";
break;
case blink::mojom::ResourceType::kXhr:
case extensions::WebRequestResourceType::XHR:
result = "xhr";
break;
default:
@ -144,7 +145,7 @@ void ToDictionary(gin::Dictionary* details, extensions::WebRequestInfo* info) {
details->Set("url", info->url);
details->Set("method", info->method);
details->Set("timestamp", base::Time::Now().ToDoubleT() * 1000);
details->Set("resourceType", info->type);
details->Set("resourceType", info->web_request_type);
if (!info->response_ip.empty())
details->Set("ip", info->response_ip);
if (info->response_headers) {