mirror of
https://github.com/electron/electron.git
synced 2026-01-09 15:38:08 -05:00
chore: bump chromium to 140.0.7309.0 (main) (#47848)
* chore: bump chromium in DEPS to 140.0.7309.0 * 6762172: Replace MSG_ROUTING_NONE with IPC::mojom::kRoutingIdNone. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6762172 * 6759543: [exit-time-destructors] Exclude target with warnings Refs https://chromium-review.googlesource.com/c/chromium/src/+/6759543 * 6765167: Split PreconnectManager into interface and implementation. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6765167 * 6766775: [media] Clarify coded and visible size in FrameResources Refs https://chromium-review.googlesource.com/c/chromium/src/+/6766775 * 6760878: Move PreconnectRequest to //content/public Refs https://chromium-review.googlesource.com/c/chromium/src/+/6760878 * 6718973: Implement media playback trust check for the video PiP overlay window Refs https://chromium-review.googlesource.com/c/chromium/src/+/6718973 * chore: add missing include of <iterator> in ada * chore: update patches * chore: node gen-libc++-filenames.js * 6759633: [media] Use format from shared image in FrameResources Refs https://chromium-review.googlesource.com/c/chromium/src/+/6759633 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
This commit is contained in:
committed by
GitHub
parent
51bfe07da9
commit
9e2f7065a0
@@ -8,10 +8,10 @@ respond to the first mouse click in their window, which is desirable for some
|
||||
kinds of utility windows. Similarly for `disableAutoHideCursor`.
|
||||
|
||||
diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
|
||||
index 97e95c04030206d244766ee10df2640b32b519aa..8563eb9aa5b5dca04e45d55a3bdd32a135232f00 100644
|
||||
index 068f395680bfe54ced74ac3406b56f2b09ebaccc..2d5cad5d7a4ab9292a5f966123687dee06f4512b 100644
|
||||
--- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
|
||||
+++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
|
||||
@@ -171,6 +171,15 @@ void ExtractUnderlines(NSAttributedString* string,
|
||||
@@ -167,6 +167,15 @@ void ExtractUnderlines(NSAttributedString* string,
|
||||
|
||||
} // namespace
|
||||
|
||||
@@ -27,7 +27,7 @@ index 97e95c04030206d244766ee10df2640b32b519aa..8563eb9aa5b5dca04e45d55a3bdd32a1
|
||||
// RenderWidgetHostViewCocoa ---------------------------------------------------
|
||||
|
||||
// Private methods:
|
||||
@@ -785,6 +794,9 @@ - (AcceptMouseEvents)acceptsMouseEventsOption {
|
||||
@@ -781,6 +790,9 @@ - (AcceptMouseEvents)acceptsMouseEventsOption {
|
||||
}
|
||||
|
||||
- (BOOL)acceptsFirstMouse:(NSEvent*)theEvent {
|
||||
@@ -37,7 +37,7 @@ index 97e95c04030206d244766ee10df2640b32b519aa..8563eb9aa5b5dca04e45d55a3bdd32a1
|
||||
// Enable "click-through" if mouse clicks are accepted in inactive windows.
|
||||
return
|
||||
[self acceptsMouseEventsOption] > AcceptMouseEvents::kWhenInActiveWindow;
|
||||
@@ -937,6 +949,10 @@ - (BOOL)shouldIgnoreMouseEvent:(NSEvent*)theEvent {
|
||||
@@ -933,6 +945,10 @@ - (BOOL)shouldIgnoreMouseEvent:(NSEvent*)theEvent {
|
||||
// its parent view.
|
||||
BOOL hitSelf = NO;
|
||||
while (view) {
|
||||
@@ -48,7 +48,7 @@ index 97e95c04030206d244766ee10df2640b32b519aa..8563eb9aa5b5dca04e45d55a3bdd32a1
|
||||
if (view == self)
|
||||
hitSelf = YES;
|
||||
if ([view isKindOfClass:[self class]] && ![view isEqual:self] &&
|
||||
@@ -1271,6 +1287,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv {
|
||||
@@ -1267,6 +1283,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv {
|
||||
eventType == NSEventTypeKeyDown &&
|
||||
!(modifierFlags & NSEventModifierFlagCommand);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user