d02c9f8bc6
* chore: bump chromium in DEPS to 111.0.5522.0 * chore: bump chromium in DEPS to 111.0.5524.0 * chore: bump chromium in DEPS to 111.0.5526.0 * chore: bump chromium in DEPS to 111.0.5528.0 * chore: update patches/chromium/mas_avoid_usage_of_private_macos_apis.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4132807 Fix simple code shear * chore: update patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4130675 Fix simple code shear * chore: update patches/chromium/hack_plugin_response_interceptor_to_point_to_electron.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/disable_unload_metrics.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4126173 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/feat_add_data_parameter_to_processsingleton.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/preconnect_manager.patch https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/v8/force_cppheapcreateparams_to_be_noncopyable.patch https://chromium-review.googlesource.com/c/v8/v8/+/3533019 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches * chore: update patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4128765 Upstream added a new call to HeaderContext(), whose signature we have patched * chore: bump chromium in DEPS to 111.0.5530.0 * chore: update patches * Move ChildProcessHost* from content/common to content/browser Xref: Move ChildProcessHost* from content/common to content/browser * Remove RenderViewHostChanged Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134103 [upstream removal of RenderViewHostChanged] Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4092763 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4093234 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133892 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134103 [examples of upstream code adjusting to the change] Upstream handles this change in roughly two approaches: 1. Move the code over to RenderFrameHostChanged(old_host, new_host) but test for new_host->IsInPrimaryMainFrame() before acting 2. Migrate to the PrimaryPageChanged(page) API and use page.GetMainDocument() to get the RenderFrameHost. I've chosen 1. because electron_api_web_contents needed that pointer to old_host to call RemoveInputEventListener(), but I may be missing some context & would appreciate review on this commit. * Make electron/shell/browser/relauncher_win.cc use <winternl.h> Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4129135 Many internal Windows types are now available in winternl.h so upstrem no longer defines the types themselves. * Move ChildProcessHost* from content/common to content/browser Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134795 * fixup! Make electron/shell/browser/relauncher_win.cc use <winternl.h> winternl.h does not define the field we need, so clone the struct Chromium was using into unnamed namespace * fixup! Move ChildProcessHost* from content/common to content/browser chore: update #includes too * chore: bump chromium in DEPS to 111.0.5532.0 * chore: sync patches/chromium/pepper_plugin_support.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 manually reync patch; no code changes * chore: sync patches/chromium/mas_no_private_api.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4143865 the content/common/pseudonymization_salt.cc patch is no longer needed * chore: sync patches/chromium/mas_disable_remote_accessibility.patch patch-fuzz update; no manual changes * chore: sync patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4111725 manually reync patch; no code changes * chore: sync patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 manually reync patch; no code changes * chore: sync patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch Xref: https://chromium-review.googlesource.com/c/v8/v8/+/4127230 patch-fuzz update; no manual changes * chore: rebuild patches * fixup! Remove RenderViewHostChanged Use PrimaryPageChanged() * chore: remove unused method TabsUpdateFunction::OnExecuteCodeFinished() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133991 This private, already-unused function showed up as a FTBFS because it took a base::ListValue parameter and ListValue was removed upstream. * task posting v3: remove includes of runner handles and IWYU task runners Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 * chore: lint * chore: more lint * fixup! task posting v3: remove includes of runner handles and IWYU task runners macOS, too * fixup! task posting v3: remove includes of runner handles and IWYU task runners * chore: bump chromium in DEPS to 111.0.5534.0 * chore: sync patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141862 patch-fuzz update; no manual changes * chore: sync patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4153110 Sync to minor upstream changes. Add const correctness. * chore: sync electron/patches/chromium/feat_configure_launch_options_for_service_process.patch https://chromium-review.googlesource.com/c/chromium/src/+/4141862 patch-fuzz update; no manual changes * chore: patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch sync https://chromium-review.googlesource.com/c/v8/v8/+/4147787 patch-fuzz update; no manual changes * chore: update patches * chore: bump chromium in DEPS to 111.0.5536.0 * chore: sync patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141863 Sync with upstream code changes. Minor code golf for readability. Note: upstream is laying groundwork for being able to work off of env vars instead of switches. Doesn't affect us yet but worth being aware of. > + // Environment variables could be supported in the future, but are not > + // currently supported when launching with the zygote. * chore: update patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4126836 patch-fuzz update; no manual changes * chore: sync electron/patches/chromium/feat_configure_launch_options_for_service_process.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141863 manual sync * chore: sync electron/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch https://chromium-review.googlesource.com/c/v8/v8/+/4147788 fuzz-patch * chore: rebuild patches * chore: bump chromium in DEPS to 111.0.5538.0 * chore: bump chromium in DEPS to 111.0.5540.0 * chore: update patches * Remove sdk_forward_declarations https://chromium-review.googlesource.com/c/chromium/src/+/4166680 * task posting v3: Remove task runner handles from codebase entirely Refs https://chromium-review.googlesource.com/c/chromium/src/+/4150928 * Cleanup child_process_launcher_helper* Refs https://chromium-review.googlesource.com/c/chromium/src/+/4141863 * fix: utilityprocess spec on macOS * fix: build on windows Refs https://chromium-review.googlesource.com/c/chromium/src/+/4141863 * chore: fix lint * chore: bump chromium 111.0.5544.3 * chore: gen filenames.libcxx.gni * Add check for Executable+Writable handles in renderer processes. Refs https://chromium-review.googlesource.com/c/chromium/src/+/3774416 * fixup! Add check for Executable+Writable handles in renderer processes. * 4143761: [110] Disable SwiftShader for WebGL on M1 Macs. https://chromium-review.googlesource.com/c/chromium/src/+/4143761 (cherry picked from commit 2f74db3c2139424c416f92d9169aeaa8a2f9c1ec) * chore: bump chromium to 111.0.5555.0 * 56085: Remove hmac.h include from ssl.h. https://boringssl-review.googlesource.com/c/boringssl/+/56085 * 4167020: Remove forwarding headers https://chromium-review.googlesource.com/c/chromium/src/+/4167020 * chore: bump chromium to 111.0.5559.0 * 4181044: Restrict WebCursor usage to RenderWidgetHostViewAura https://chromium-review.googlesource.com/c/chromium/src/+/4181044 * 4189437: views: rename ink_drop_host_view to ink_drop_host https://chromium-review.googlesource.com/c/chromium/src/+/4189437 * chore: bump chromium to 111.0.5560.0 * 4167016: win7dep: remove non aeroglass code https://chromium-review.googlesource.com/c/chromium/src/+/4167016 * fixup after rebase: Remove forwarding header s https://chromium-review.googlesource.com/c/chromium/src/+/4167020 * 4125755: Reland "Reject getDisplayMedia calls without user activation" https://chromium-review.googlesource.com/c/chromium/src/+/4125755 * test: add workaround * chore: update patches * fix: alter coreModuleRegExp to prevent arm crash * Revert "fix: alter coreModuleRegExp to prevent arm crash" This reverts commit 7e50630c98137831a711c5abdbc8809e60cf1d73. * 4218354: Disable the use of preserve_most on arm64 Windows https://chromium-review.googlesource.com/c/v8/v8/+/4218354 * chore: review changes --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
157 lines
6.5 KiB
C++
157 lines
6.5 KiB
C++
// Copyright (c) 2017 The Chromium Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE-CHROMIUM file.
|
|
|
|
#include "shell/browser/ui/views/electron_views_delegate.h"
|
|
|
|
#include <dwmapi.h>
|
|
#include <shellapi.h>
|
|
|
|
#include <utility>
|
|
|
|
#include "base/functional/bind.h"
|
|
#include "base/task/thread_pool.h"
|
|
|
|
namespace {
|
|
|
|
bool MonitorHasAutohideTaskbarForEdge(UINT edge, HMONITOR monitor) {
|
|
APPBARDATA taskbar_data = {sizeof(APPBARDATA), NULL, 0, edge};
|
|
taskbar_data.hWnd = ::GetForegroundWindow();
|
|
|
|
// MSDN documents an ABM_GETAUTOHIDEBAREX, which supposedly takes a monitor
|
|
// rect and returns autohide bars on that monitor. This sounds like a good
|
|
// idea for multi-monitor systems. Unfortunately, it appears to not work at
|
|
// least some of the time (erroneously returning NULL) and there's almost no
|
|
// online documentation or other sample code using it that suggests ways to
|
|
// address this problem. We do the following:-
|
|
// 1. Use the ABM_GETAUTOHIDEBAR message. If it works, i.e. returns a valid
|
|
// window we are done.
|
|
// 2. If the ABM_GETAUTOHIDEBAR message does not work we query the auto hide
|
|
// state of the taskbar and then retrieve its position. That call returns
|
|
// the edge on which the taskbar is present. If it matches the edge we
|
|
// are looking for, we are done.
|
|
// NOTE: This call spins a nested run loop.
|
|
HWND taskbar = reinterpret_cast<HWND>(
|
|
SHAppBarMessage(ABM_GETAUTOHIDEBAR, &taskbar_data));
|
|
if (!::IsWindow(taskbar)) {
|
|
APPBARDATA new_taskbar_data = {sizeof(APPBARDATA), 0, 0, 0};
|
|
unsigned int taskbar_state =
|
|
SHAppBarMessage(ABM_GETSTATE, &new_taskbar_data);
|
|
if (!(taskbar_state & ABS_AUTOHIDE))
|
|
return false;
|
|
|
|
new_taskbar_data.hWnd = ::FindWindow(L"Shell_TrayWnd", NULL);
|
|
if (!::IsWindow(new_taskbar_data.hWnd))
|
|
return false;
|
|
|
|
SHAppBarMessage(ABM_GETTASKBARPOS, &new_taskbar_data);
|
|
if (new_taskbar_data.uEdge == edge)
|
|
taskbar = new_taskbar_data.hWnd;
|
|
}
|
|
|
|
// There is a potential race condition here:
|
|
// 1. A maximized chrome window is fullscreened.
|
|
// 2. It is switched back to maximized.
|
|
// 3. In the process the window gets a WM_NCCALCSIZE message which calls us to
|
|
// get the autohide state.
|
|
// 4. The worker thread is invoked. It calls the API to get the autohide
|
|
// state. On Windows versions earlier than Windows 7, taskbars could
|
|
// easily be always on top or not.
|
|
// This meant that we only want to look for taskbars which have the topmost
|
|
// bit set. However this causes problems in cases where the window on the
|
|
// main thread is still in the process of switching away from fullscreen.
|
|
// In this case the taskbar might not yet have the topmost bit set.
|
|
// 5. The main thread resumes and does not leave space for the taskbar and
|
|
// hence it does not pop when hovered.
|
|
//
|
|
// To address point 4 above, it is best to not check for the WS_EX_TOPMOST
|
|
// window style on the taskbar, as starting from Windows 7, the topmost
|
|
// style is always set. We don't support XP and Vista anymore.
|
|
if (::IsWindow(taskbar)) {
|
|
if (MonitorFromWindow(taskbar, MONITOR_DEFAULTTONEAREST) == monitor)
|
|
return true;
|
|
// In some cases like when the autohide taskbar is on the left of the
|
|
// secondary monitor, the MonitorFromWindow call above fails to return the
|
|
// correct monitor the taskbar is on. We fallback to MonitorFromPoint for
|
|
// the cursor position in that case, which seems to work well.
|
|
POINT cursor_pos = {0};
|
|
GetCursorPos(&cursor_pos);
|
|
if (MonitorFromPoint(cursor_pos, MONITOR_DEFAULTTONEAREST) == monitor)
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
int GetAppbarAutohideEdgesOnWorkerThread(HMONITOR monitor) {
|
|
DCHECK(monitor);
|
|
|
|
int edges = 0;
|
|
if (MonitorHasAutohideTaskbarForEdge(ABE_LEFT, monitor))
|
|
edges |= views::ViewsDelegate::EDGE_LEFT;
|
|
if (MonitorHasAutohideTaskbarForEdge(ABE_TOP, monitor))
|
|
edges |= views::ViewsDelegate::EDGE_TOP;
|
|
if (MonitorHasAutohideTaskbarForEdge(ABE_RIGHT, monitor))
|
|
edges |= views::ViewsDelegate::EDGE_RIGHT;
|
|
if (MonitorHasAutohideTaskbarForEdge(ABE_BOTTOM, monitor))
|
|
edges |= views::ViewsDelegate::EDGE_BOTTOM;
|
|
return edges;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
namespace electron {
|
|
|
|
HICON ViewsDelegate::GetDefaultWindowIcon() const {
|
|
// Use current exe's icon as default window icon.
|
|
return LoadIcon(GetModuleHandle(NULL),
|
|
MAKEINTRESOURCE(1 /* IDR_MAINFRAME */));
|
|
}
|
|
|
|
HICON ViewsDelegate::GetSmallWindowIcon() const {
|
|
return GetDefaultWindowIcon();
|
|
}
|
|
|
|
bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const {
|
|
return false;
|
|
}
|
|
|
|
int ViewsDelegate::GetAppbarAutohideEdges(HMONITOR monitor,
|
|
base::OnceClosure callback) {
|
|
// Initialize the map with EDGE_BOTTOM. This is important, as if we return an
|
|
// initial value of 0 (no auto-hide edges) then we'll go fullscreen and
|
|
// windows will automatically remove WS_EX_TOPMOST from the appbar resulting
|
|
// in us thinking there is no auto-hide edges. By returning at least one edge
|
|
// we don't initially go fullscreen until we figure out the real auto-hide
|
|
// edges.
|
|
if (!appbar_autohide_edge_map_.count(monitor))
|
|
appbar_autohide_edge_map_[monitor] = EDGE_BOTTOM;
|
|
|
|
// We use the SHAppBarMessage API to get the taskbar autohide state. This API
|
|
// spins a modal loop which could cause callers to be reentered. To avoid
|
|
// that we retrieve the taskbar state in a worker thread.
|
|
if (monitor && !in_autohide_edges_callback_) {
|
|
// TODO(robliao): Annotate this task with .WithCOM() once supported.
|
|
// https://crbug.com/662122
|
|
base::ThreadPool::PostTaskAndReplyWithResult(
|
|
FROM_HERE, {base::MayBlock(), base::TaskPriority::USER_BLOCKING},
|
|
base::BindOnce(&GetAppbarAutohideEdgesOnWorkerThread, monitor),
|
|
base::BindOnce(&ViewsDelegate::OnGotAppbarAutohideEdges,
|
|
weak_factory_.GetWeakPtr(), std::move(callback), monitor,
|
|
appbar_autohide_edge_map_[monitor]));
|
|
}
|
|
return appbar_autohide_edge_map_[monitor];
|
|
}
|
|
|
|
void ViewsDelegate::OnGotAppbarAutohideEdges(base::OnceClosure callback,
|
|
HMONITOR monitor,
|
|
int returned_edges,
|
|
int edges) {
|
|
appbar_autohide_edge_map_[monitor] = edges;
|
|
if (returned_edges == edges)
|
|
return;
|
|
|
|
base::AutoReset<bool> in_callback_setter(&in_autohide_edges_callback_, true);
|
|
std::move(callback).Run();
|
|
}
|
|
|
|
} // namespace electron
|