mirror of
https://github.com/electron/electron.git
synced 2026-02-26 03:01:17 -05:00
* chore: Bump 78.0.3894.0 * chore: bump chromium to 32e0bab929213da1019992bf31d29 (master) (#19488) * chore: bump chromium to cbeb16cf544f79c1990f1eae4d4fe (master) (#19610) Co-authored-by: Erick Zhao <erickzhao@github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by Micha Hanselmann <DeerMichel@github.com> * chore: bump chromium to 62327c655093c821aa0fcfc6db53f5fd943e08c7 (master) (#19792) * chore: bump chromium in DEPS to f3bf493731e868e1f5f48e7e1adc02ea5eccfbbd * chore: bump chromium in DEPS to 4db0c87d4aa6f27ffa0b5fc77d20e10047962484 * chore: bump chromium in DEPS to d933a504c264dc8fe85267f47aef3588531875b5 * chore: bump chromium in DEPS to 34afdb68980f581ae911b85b727bc17e126cf5f9 * update disable-redraw-lock.patch https://chromium-review.googlesource.com/c/chromium/src/+/1600387 * update desktop_media_list.patch https://chromium-review.googlesource.com/c/chromium/src/+/1729156 * update notification_provenance.patch https://chromium-review.googlesource.com/c/chromium/src/+/1742779 * update printing.patch https://chromium-review.googlesource.com/c/chromium/src/+/1646772 * update verbose_generate_bpad_syms.patch https://chromium-review.googlesource.com/c/chromium/src/+/1745986 * update patch metadata * remove printing_compositor manifests https://chromium-review.googlesource.com/c/chromium/src/+/1742734 * update for URLLoaderFactoryType enum https://chromium-review.googlesource.com/c/chromium/src/+/1754716 * remove gin string16 converter https://chromium-review.googlesource.com/c/chromium/src/+/1750093 * ClearCompositorFrame() has been removed https://chromium-review.googlesource.com/c/chromium/src/+/1746301 * message_loop -> message_loop_current https://chromium-review.googlesource.com/c/chromium/src/+/1738552 * include resource_response header * pdf compositor no longer uses service manager https://chromium-review.googlesource.com/c/chromium/src/+/1742734 * chore: bump chromium in DEPS to 00d5933101d8d8dc9546eadbe7ee1b41077e6db1 * pane focus fns aren't pure virtual anymore https://chromium-review.googlesource.com/c/chromium/src/+/1708767 * fix: make std::hash value-non-const broken by https://chromium-review.googlesource.com/c/chromium/src/+/1711202 * update swiftshader in zip_manifests https://swiftshader-review.googlesource.com/c/SwiftShader/+/34911 * address feedback from @deepak1556 * don't enable kLegacyWindowsDWriteFontFallback https://chromium-review.googlesource.com/c/chromium/src/+/1753006 * chore: bump chromium in DEPS to 84497314005e1968da06804f8fde539d9872310e * update printing.patch remove bottom diff owing to https://chromium-review.googlesource.com/c/chromium/src/+/1678182 and update for https://chromium-review.googlesource.com/c/chromium/src/+/1678182 * convert CookieChangeListener to new Mojo types https://chromium-review.googlesource.com/c/chromium/src/+/1753371 * rename ui::ClipboardType -> ui::ClipboardBuffer https://chromium-review.googlesource.com/c/chromium/src/+/1758730 * logging::LoggingSettings log_file -> log_file_path https://chromium-review.googlesource.com/c/chromium/src/+/1699477 * roll DEPS to latest lkgr * fix: override GetFontLookupTableCacheDir() When Chromium goes to use its fallback font table creation code paths, it creates the cache directory it uses by calling GetFontLookupTableCacheDir() with a path that doesn't exist in Electron. To ensure that a legitimate file path is created, we need to override it with Electron's DIR_USER_DATA so it doesn't use chrome::DIR_USER_DATA. * chore: bump chromium in DEPS to 6758a0879931bc4df630a80a36c82d7855ae3155 * update pthread_fchdir patch https://chromium-review.googlesource.com/c/chromium/src/+/1759149 * update printing patch * update cookie usage and fn signatures https://chromium-review.googlesource.com/c/chromium/src/+/1758437 * chore: bump chromium in DEPS to bdaca97e1cc27fb977e56f30f74cdb906da9527e * remove fix_make_std_hash_value-non-const.patch https://chromium-review.googlesource.com/c/chromium/src/+/1762335 * Convert enum to enum class for FocusManager::FocusChangeReason https://chromium-review.googlesource.com/c/chromium/src/+/1767281 * roll DEPS to latest lkgr * update dom_storage_limits.patch https://chromium-review.googlesource.com/c/chromium/src/+/1767556 * chore: remove pre network service classes from shell/browser/net (#19644) * refactor: rm IOThread class * chore: rm expose-net-observer-api.patch * chore: rm unused shell/browser/net/ classes * chore: mv CertVerifierClient to separate header * chore: rm url_request_context_getter references * chore: update patches * Require task posters to specify an explicit destination https://chromium-review.googlesource.com/c/chromium/src/+/1769080 * chore: Revert "Cleanup: Remove Menu Subtitles/Sublabels" * chore: Bump chromium 78.0.3896.0 * build: add checkout_openxr=False to DEPS Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1745502 * chore: update patches * Convert TrustedURLLoaderHeaderClient and TrustedHeaderClient to new mojo types https://chromium-review.googlesource.com/c/chromium/src/+/1767298 https://chromium-review.googlesource.com/c/chromium/src/+/1768841 * skia: more rect api simplifications https://skia-review.googlesource.com/c/skia/+/237038 * iwyu * test: fix clearAuthCache test (#20015) * fix: nws13n: make ses.setUserAgent work (#20014) * refactor tests to better control window creation * fix: nws13n: make ses.setUserAgent work * chore: update v8 patches * Add enterprise policy for renderer CIG. https://chromium-review.googlesource.com/c/chromium/src/+/1758589 * Convert enum to enum class for Wigdet::FrameType https://chromium-review.googlesource.com/c/chromium/src/+/1767292 * [JJI] Convert to use string16 for data from JavaScript/Java https://chromium-review.googlesource.com/c/chromium/src/+/1750093 * chore: Bump chromium 78.0.3896.6
141 lines
4.7 KiB
Plaintext
141 lines
4.7 KiB
Plaintext
// Copyright (c) 2018 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/api/atom_api_browser_window.h"
|
|
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#import <Cocoa/Cocoa.h>
|
|
|
|
#include "base/mac/scoped_nsobject.h"
|
|
#include "shell/browser/native_browser_view.h"
|
|
#include "shell/browser/native_window_mac.h"
|
|
#include "shell/browser/ui/inspectable_web_contents_view.h"
|
|
|
|
@interface NSView (WebContentsView)
|
|
- (void)setMouseDownCanMoveWindow:(BOOL)can_move;
|
|
@end
|
|
|
|
@interface ControlRegionView : NSView
|
|
@end
|
|
|
|
@implementation ControlRegionView
|
|
|
|
- (BOOL)mouseDownCanMoveWindow {
|
|
return NO;
|
|
}
|
|
|
|
- (NSView*)hitTest:(NSPoint)aPoint {
|
|
return nil;
|
|
}
|
|
|
|
@end
|
|
|
|
namespace electron {
|
|
|
|
namespace api {
|
|
|
|
namespace {
|
|
|
|
// Return a vector of non-draggable regions that fill a window of size
|
|
// |width| by |height|, but leave gaps where the window should be draggable.
|
|
std::vector<gfx::Rect> CalculateNonDraggableRegions(
|
|
std::unique_ptr<SkRegion> draggable,
|
|
int width,
|
|
int height) {
|
|
std::vector<gfx::Rect> result;
|
|
SkRegion non_draggable;
|
|
non_draggable.op({0, 0, width, height}, SkRegion::kUnion_Op);
|
|
non_draggable.op(*draggable, SkRegion::kDifference_Op);
|
|
for (SkRegion::Iterator it(non_draggable); !it.done(); it.next()) {
|
|
result.push_back(gfx::SkIRectToRect(it.rect()));
|
|
}
|
|
return result;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
void BrowserWindow::OverrideNSWindowContentView(InspectableWebContents* iwc) {
|
|
// Make NativeWindow use a NSView as content view.
|
|
static_cast<NativeWindowMac*>(window())->OverrideNSWindowContentView();
|
|
// Add webview to contentView.
|
|
NSView* webView = iwc->GetView()->GetNativeView().GetNativeNSView();
|
|
NSView* contentView =
|
|
[window()->GetNativeWindow().GetNativeNSWindow() contentView];
|
|
[webView setFrame:[contentView bounds]];
|
|
|
|
// ensure that buttons view is floated to top of view hierarchy
|
|
NSArray* subviews = [contentView subviews];
|
|
NSView* last = subviews.lastObject;
|
|
[contentView addSubview:webView positioned:NSWindowBelow relativeTo:last];
|
|
|
|
[contentView viewDidMoveToWindow];
|
|
}
|
|
|
|
void BrowserWindow::UpdateDraggableRegions(
|
|
const std::vector<mojom::DraggableRegionPtr>& regions) {
|
|
if (window_->has_frame())
|
|
return;
|
|
|
|
// All ControlRegionViews should be added as children of the WebContentsView,
|
|
// because WebContentsView will be removed and re-added when entering and
|
|
// leaving fullscreen mode.
|
|
NSView* webView = web_contents()->GetNativeView().GetNativeNSView();
|
|
NSInteger webViewWidth = NSWidth([webView bounds]);
|
|
NSInteger webViewHeight = NSHeight([webView bounds]);
|
|
|
|
if ([webView respondsToSelector:@selector(setMouseDownCanMoveWindow:)]) {
|
|
[webView setMouseDownCanMoveWindow:YES];
|
|
}
|
|
|
|
// Remove all ControlRegionViews that are added last time.
|
|
// Note that [webView subviews] returns the view's mutable internal array and
|
|
// it should be copied to avoid mutating the original array while enumerating
|
|
// it.
|
|
base::scoped_nsobject<NSArray> subviews([[webView subviews] copy]);
|
|
for (NSView* subview in subviews.get())
|
|
if ([subview isKindOfClass:[ControlRegionView class]])
|
|
[subview removeFromSuperview];
|
|
|
|
// Draggable regions is implemented by having the whole web view draggable
|
|
// (mouseDownCanMoveWindow) and overlaying regions that are not draggable.
|
|
draggable_regions_.clear();
|
|
for (const auto& r : regions)
|
|
draggable_regions_.push_back(r.Clone());
|
|
std::vector<gfx::Rect> drag_exclude_rects;
|
|
if (regions.empty()) {
|
|
drag_exclude_rects.push_back(gfx::Rect(0, 0, webViewWidth, webViewHeight));
|
|
} else {
|
|
drag_exclude_rects = CalculateNonDraggableRegions(
|
|
DraggableRegionsToSkRegion(regions), webViewWidth, webViewHeight);
|
|
}
|
|
|
|
auto browser_views = window_->browser_views();
|
|
for (NativeBrowserView* view : browser_views) {
|
|
view->UpdateDraggableRegions(drag_exclude_rects);
|
|
}
|
|
|
|
// Create and add a ControlRegionView for each region that needs to be
|
|
// excluded from the dragging.
|
|
for (const auto& rect : drag_exclude_rects) {
|
|
base::scoped_nsobject<NSView> controlRegion(
|
|
[[ControlRegionView alloc] initWithFrame:NSZeroRect]);
|
|
[controlRegion setFrame:NSMakeRect(rect.x(), webViewHeight - rect.bottom(),
|
|
rect.width(), rect.height())];
|
|
[webView addSubview:controlRegion];
|
|
}
|
|
|
|
// AppKit will not update its cache of mouseDownCanMoveWindow unless something
|
|
// changes. Previously we tried adding an NSView and removing it, but for some
|
|
// reason it required reposting the mouse-down event, and didn't always work.
|
|
// Calling the below seems to be an effective solution.
|
|
[[webView window] setMovableByWindowBackground:NO];
|
|
[[webView window] setMovableByWindowBackground:YES];
|
|
}
|
|
|
|
} // namespace api
|
|
|
|
} // namespace electron
|