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

chore: bump chromium to 117.0.5938.0 (main) (#39375)

Browse source 
* chore: bump chromium in DEPS to 117.0.5929.0

* chore: bump chromium in DEPS to 117.0.5931.0

* chore: bump chromium in DEPS to 117.0.5932.0

* chore: update patches

* 4728317: Prevent PrintRenderFrameHelper from printing when already printing
 | 4728317

* 4739501: Use base::SequenceBound to manage SerialPortManagerImpl |
 4739501

* 4702051: Allow overriding source in install-sysroot.py | 4702051

* chore: update filenames.libcxx.gni

* 4727002: Rename "enable_arc2" to "enable_arc" |
4727002

* chore: bump chromium in DEPS to 117.0.5934.0

* 4736873: Rename ColorSpaces methods on display::Display | 4736873

* 4727203: Replace bool with an enum in as suggested in DevtoolsManagerDelegate. | 4727203

* 4744479: [DevTools] Add 'generateTaggedPDF' option to DevTools Page.printToPDF | 4744479

* 4735893: Don't share WebUSB permissions with webviews | 4735893

* revert: update filenames.libcxx.gni

* chore: bump chromium in DEPS to 117.0.5936.0

* chore: update patches

* 4746465: SAA: Query for embargoed StorageAccess permissions | 4746465

* 4666325: Move buildtools/third_party/lib*/trunk source paths to third_party/lib*/src. | 4666325

* chore: bump chromium in DEPS to 117.0.5938.0

* chore: bump chromium in DEPS to 118.0.5939.0

* chore: update patches

* Send line bounds through CursorAnchorInfo on requestCursorUpdate

4394588

* Fixup lint for Move buildtools/third_party/lib*/trunk source paths to third_party/lib*/src

* 4700305: [mac] Fix override of CHILD_PROCESS_EXE

4700305

Needed because of 4729689: Reland "Remove redundant existence check in PathService" | 4729689

* 4753759: More consistent icon handling for menus.

4753759

* chore: bump chromium in DEPS to 118.0.5941.0

* chore: update patches

* chore: bump chromium in DEPS to 117.0.5938.0

* test: update nan-spec-runner cflags

* build: fix isystem include path in nan-spec-runner

* fixup! 4666325: Move buildtools/third_party/lib*/trunk source paths to third_party/lib*/src. | 4666325

fix a few more instances of the old path

libc++.a and libc++abi.a are still in buildtools/

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: VerteDinde <vertedinde@electronjs.org>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
electron-roller[bot] 2023-08-15 10:49:41 -05:00 • committed by GitHub
parent bee5d94886
commit c3036d4557
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
94 changed files with 1513 additions and 1600 deletions
Download patch file Download diff file Expand all files Collapse all files

30
shell/browser/usb/electron_usb_delegate.cc
View file

@ -25,6 +25,7 @@
#include "base/containers/fixed_flat_set.h"
#include "chrome/common/chrome_features.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/guest_view/web_view/web_view_guest.h"
#include "extensions/common/constants.h"
#include "extensions/common/extension.h"
#include "services/device/public/mojom/usb_device.mojom.h"
@ -286,4 +287,33 @@ void ElectronUsbDelegate::DeleteControllerForFrame(
controller_map_.erase(render_frame_host);
}
bool ElectronUsbDelegate::PageMayUseUsb(content::Page& page) {
content::RenderFrameHost& main_rfh = page.GetMainDocument();
#if BUILDFLAG(ENABLE_EXTENSIONS)
// WebViewGuests have no mechanism to show permission prompts and their
// embedder can't grant USB access through its permissionrequest API. Also
// since webviews use a separate StoragePartition, they must not gain access
// through permissions granted in non-webview contexts.
if (extensions::WebViewGuest::FromRenderFrameHost(&main_rfh)) {
return false;
}
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
// USB permissions are scoped to a BrowserContext instead of a
// StoragePartition, so we need to be careful about usage across
// StoragePartitions. Until this is scoped correctly, we'll try to avoid
// inappropriate sharing by restricting access to the API. We can't be as
// strict as we'd like, as cases like extensions and Isolated Web Apps still
// need USB access in non-default partitions, so we'll just guard against
// HTTP(S) as that presents a clear risk for inappropriate sharing.
// TODO(crbug.com/1469672): USB permissions should be explicitly scoped to
// StoragePartitions.
if (main_rfh.GetStoragePartition() !=
main_rfh.GetBrowserContext()->GetDefaultStoragePartition()) {
return !main_rfh.GetLastCommittedURL().SchemeIsHTTPOrHTTPS();
}
return true;
}
} // namespace electron