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

chore: bump chromium to 7264889ce3aad1568ff3d211c81fe (master) (#27003)

Browse source 
* chore: bump chromium in DEPS to 91c9f44297abe2844f593ec7956e6ce79c81f463

* chore: update chromium patches

* chore: update v8 patches

* build: service_names.mojom has been deleted

Refs: 2568681

* chore: add DISPLAY_CAPTURE permission to converter

Refs: 2551098

* chore: handle AXPropertyFilter::SCRIPT in accessibility_ui

Refs: 2563923

* refactor: web_isolated_world_ids.h has been deleted

Refs: 2585255

* refactor: ResourceType has been deprecated / removed in ExtensionsBrowserClient

Refs: 2562002

* chore: fix lint

* chore: remove deleted headers

* build: disable gn check for blink header

* fix: refactor X11 event handling

Refs: 2577887
Refs: 2585750

* chore: update patches

* chore: bump chromium in DEPS to bfd8e7dbd37af8b1bc40d887815edd5a29496fa3

* chore: update patches

* refactor: xeventobserver is now x11:eventobserver

Refs: 2585750

* refactor: remove UseWebUIBindingsForURL

Refs: 2583590

* chore: DidProcessXEvent has been removed

* chore: bump chromium in DEPS to b13e791d7244a08d9d61dbfa2bb2b6cdf1ff6294

* chore: update patches

* build: change gfx::GetAtom to x11:GetAtom

Refs: d972a0ae4a

* build: change gfx namespace to x11

Ref: d972a0ae4a

* build: change ui namespace to x11

Refs: c38f8571a8:ui/gfx/x/xproto_util.h;dlc=ba9145d0c7f2b10e869e2ba482ca05b75ca35812

* chore: add patch to fix blink prefs fetching during frame swap

* chore: fix lint

* fix: do not make invalid SKImageRep in FrameSubscriber

Refs: 2572896

Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
This commit is contained in:
Electron Bot 2020-12-22 14:14:44 -08:00 • committed by GitHub
parent 729c45637d
commit 8383c14aba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
78 changed files with 465 additions and 462 deletions
Download patch file Download diff file Expand all files Collapse all files

25
shell/browser/extensions/electron_extensions_browser_client.cc
View file

@ -179,17 +179,18 @@ void ElectronExtensionsBrowserClient::LoadResourceFromResourceBundle(
}
namespace {
bool AllowCrossRendererResourceLoad(const network::ResourceRequest& request,
blink::mojom::ResourceType resource_type,
ui::PageTransition page_transition,
int child_id,
bool is_incognito,
const extensions::Extension* extension,
const extensions::ExtensionSet& extensions,
const extensions::ProcessMap& process_map,
bool* allowed) {
bool AllowCrossRendererResourceLoad(
const network::ResourceRequest& request,
network::mojom::RequestDestination destination,
ui::PageTransition page_transition,
int child_id,
bool is_incognito,
const extensions::Extension* extension,
const extensions::ExtensionSet& extensions,
const extensions::ProcessMap& process_map,
bool* allowed) {
if (extensions::url_request_util::AllowCrossRendererResourceLoad(
request, resource_type, page_transition, child_id, is_incognito,
request, destination, page_transition, child_id, is_incognito,
extension, extensions, process_map, allowed)) {
return true;
}
@ -210,7 +211,7 @@ bool AllowCrossRendererResourceLoad(const network::ResourceRequest& request,
bool ElectronExtensionsBrowserClient::AllowCrossRendererResourceLoad(
const network::ResourceRequest& request,
blink::mojom::ResourceType resource_type,
network::mojom::RequestDestination destination,
ui::PageTransition page_transition,
int child_id,
bool is_incognito,
@ -219,7 +220,7 @@ bool ElectronExtensionsBrowserClient::AllowCrossRendererResourceLoad(
const extensions::ProcessMap& process_map) {
bool allowed = false;
if (::electron::AllowCrossRendererResourceLoad(
request, resource_type, page_transition, child_id, is_incognito,
request, destination, page_transition, child_id, is_incognito,
extension, extensions, process_map, &allowed)) {
return allowed;
}