![trop[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 142.0.7401.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * 6911185: Reland "Send touch moves async immediately after scroll starts." https://chromium-review.googlesource.com/c/chromium/src/+/6911185 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6906887: mac: click through content area in main window https://chromium-review.googlesource.com/c/chromium/src/+/6906887 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6916667: Expose helper to eliminate duplicate recipes. https://chromium-review.googlesource.com/c/chromium/src/+/6916667 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6909842: Switch LegacyRenderWidgetHostHWND from atlcrack.h to msg_util.h. https://chromium-review.googlesource.com/c/chromium/src/+/6909842 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6884056: Remove the SecKeychain implementation for the Keychain interface https://chromium-review.googlesource.com/c/chromium/src/+/6884056 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6904906: Remove `WTF::` in renderer/core/[p-x].*/ https://chromium-review.googlesource.com/c/chromium/src/+/6904906 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6556585: [persistent_cache]: PersistentCache for CodeCache https://chromium-review.googlesource.com/c/chromium/src/+/6556585 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6904864: Layout: Support abort on the text placeholder layout https://chromium-review.googlesource.com/c/chromium/src/+/6904864 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: fixup patch indices Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: bump chromium in DEPS to 142.0.7402.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * fixup! 6556585: [persistent_cache]: PersistentCache for CodeCache Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: fixup patch indices Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6905244: [api] Remove deprecated `GetIsolate` https://chromium-review.googlesource.com/c/v8/v8/+/6905244 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6897694: Remove NativeTheme::UserHasContrastPreference(). https://chromium-review.googlesource.com/c/chromium/src/+/6897694 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6897477: Remove GetPlatformHighContrastColorScheme() and enum. https://chromium-review.googlesource.com/c/chromium/src/+/6897477 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6918198: Reland "Rename display::Screen::GetScreen() to display::Screen::Get()" https://chromium-review.googlesource.com/c/chromium/src/+/6918198 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6907147: [LNA] add use counter for websocket mixed-content issues https://chromium-review.googlesource.com/c/chromium/src/+/6907147 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6914538: Replace WTF::String with blink::String https://chromium-review.googlesource.com/c/website/+/6914538 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6892538: [video pip] Allow touchscreen users to toggle live caption https://chromium-review.googlesource.com/c/chromium/src/+/6892538 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: fix patch Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: bump chromium in DEPS to 142.0.7403.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * build: remove ninja logs Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: fixup patch indices Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6920670: [PDF] Change pdf_extension_util to return dictionaries https://chromium-review.googlesource.com/c/chromium/src/+/6920670 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6917864: Devirtualize and inline various NativeTheme getters. https://chromium-review.googlesource.com/c/chromium/src/+/6917864 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6920873: [PDF] Simplify PDFDocumentHelperClient::OnSaveURL() https://chromium-review.googlesource.com/c/chromium/src/+/6920873 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * build: don't kill blink/web_tests Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6923655: Roll libc++ from 954086abf121 to b87b2bb112f8 (4 revisions) https://chromium-review.googlesource.com/c/chromium/src/+/6923655 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6905242: Reland "[CSP] Clarify report-only console messages." https://chromium-review.googlesource.com/c/chromium/src/+/6905242 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * fixup! 6897694: Remove NativeTheme::UserHasContrastPreference(). Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: bump chromium in DEPS to 142.0.7405.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * 6910012: [LNA] Enable LNA enforcement by default https://chromium-review.googlesource.com/c/chromium/src/+/6910012 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6929444: Combine GetInstanceForXXX() implementations. https://chromium-review.googlesource.com/c/chromium/src/+/6929444 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6927873: Rename native_widget_types.h -> native_ui_types.h https://chromium-review.googlesource.com/c/chromium/src/+/6927873 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6853978: Init perfetto really early in WebView https://chromium-review.googlesource.com/c/chromium/src/+/6853978 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6874886: Use only one picker observer to avoid getting duplicate notifications https://chromium-review.googlesource.com/c/chromium/src/+/6874886 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: fixup patch indices Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * fix: Protocol complex inline dtor Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: bump chromium in DEPS to 142.0.7407.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 142.0.7409.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 142.0.7411.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 142.0.7413.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * fixup! 6905242: Reland "[CSP] Clarify report-only console messages." Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6927233: Remove NativeTheme "use dark colors" bit. https://chromium-review.googlesource.com/c/chromium/src/+/6927233 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: fixup patch indices Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6899206: [PermissionOptions] Multi-state permission subscriptions & setting changes https://chromium-review.googlesource.com/c/chromium/src/+/6899206 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: bump chromium in DEPS to 142.0.7415.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * 6936895: [headless] Remove headless flag from views::Widget class https://chromium-review.googlesource.com/c/chromium/src/+/6936895 We should probably followup on this to see if there is a way to do this without reverting this CL. Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * 6937023: Reland "Use new DBus type system in dbus_xdg::Request" https://chromium-review.googlesource.com/c/chromium/src/+/6937023 Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * chore: update patches Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * 6944749: Add GN visibility list to //components/os_crypt/sync https://chromium-review.googlesource.com/c/chromium/src/+/6944749 Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * Further replace sub_capture_target_version with CaptureVersion https://chromium-review.googlesource.com/c/chromium/src/+/6935455 Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * fixup for lint Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * chore: update filenames.libcxx.gni Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * chore: bump chromium in DEPS to 142.0.7417.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * 6944136: Reorder NativeTheme headers/.cc files. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6944136 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * 6939701: [DSSC][4] Make FSVCI objects aware of their capture-version-source Refs https://chromium-review.googlesource.com/c/chromium/src/+/6939701 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * 6944404: Remove extraneous callback call Refs https://chromium-review.googlesource.com/c/chromium/src/+/6944404 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * 6936124: [FPF-CI]: Introduce blink::NoiseToken for fingerprinting protection Refs https://chromium-review.googlesource.com/c/chromium/src/+/6936124 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * chore: update patches Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * fixup! 6927233: Remove NativeTheme "use dark colors" bit. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6927233 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * fixup! 6917864: Devirtualize and inline various NativeTheme getters. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6917864 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * 6937588: Add initial OsSettingsProvider object, supplying caret blink interval. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6937588 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * fixup! 6905242: Reland "[CSP] Clarify report-only console messages." Refs https://chromium-review.googlesource.com/c/chromium/src/+/6905242 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * 6907515: Replace SingletonHwndObserver with a CallbackList on SingletonHwnd. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6907515 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * 6910482: [Save to Drive] Implement retry functionality Refs https://chromium-review.googlesource.com/c/chromium/src/+/6910482 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * fixup! 6927233: Remove NativeTheme "use dark colors" bit. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6927233 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * Revert "build: remove ninja logs" This reverts commit 72874740fdfca4101404ce7855e976791cfc79ef. Co-authored-by: Alice Zhao <alicelovescake@anthropic.com> * test: fix flakey test picked from PR 48205 Co-authored-by: Alice Zhao <alicelovescake@anthropic.com> * chore: update patches --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: David Sanders <dsanders11@ucsbalum.com> Co-authored-by: Alice Zhao <alicelovescake@anthropic.com>
233 lines
7.7 KiB
C++
233 lines
7.7 KiB
C++
// Copyright (c) 2013 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/electron_api_screen.h"
|
|
|
|
#include <string>
|
|
#include <string_view>
|
|
|
|
#include "base/functional/bind.h"
|
|
#include "shell/browser/browser.h"
|
|
#include "shell/common/gin_converters/callback_converter.h"
|
|
#include "shell/common/gin_converters/gfx_converter.h"
|
|
#include "shell/common/gin_converters/native_window_converter.h"
|
|
#include "shell/common/gin_helper/dictionary.h"
|
|
#include "shell/common/gin_helper/error_thrower.h"
|
|
#include "shell/common/gin_helper/handle.h"
|
|
#include "shell/common/gin_helper/object_template_builder.h"
|
|
#include "shell/common/node_includes.h"
|
|
#include "ui/display/display.h"
|
|
#include "ui/display/screen.h"
|
|
#include "ui/gfx/geometry/point.h"
|
|
#include "ui/gfx/geometry/point_conversions.h"
|
|
#include "ui/gfx/geometry/point_f.h"
|
|
#include "ui/gfx/geometry/vector2d_conversions.h"
|
|
|
|
#if BUILDFLAG(IS_WIN)
|
|
#include "ui/display/win/screen_win.h"
|
|
#endif
|
|
|
|
#if BUILDFLAG(IS_LINUX)
|
|
#include "shell/browser/linux/x11_util.h"
|
|
#endif
|
|
|
|
#if defined(USE_OZONE)
|
|
#include "ui/ozone/public/ozone_platform.h"
|
|
#endif
|
|
|
|
namespace electron::api {
|
|
|
|
gin::DeprecatedWrapperInfo Screen::kWrapperInfo = {gin::kEmbedderNativeGin};
|
|
|
|
namespace {
|
|
|
|
// Convert the changed_metrics bitmask to string array.
|
|
std::vector<std::string> MetricsToArray(uint32_t metrics) {
|
|
std::vector<std::string> array;
|
|
if (metrics & display::DisplayObserver::DISPLAY_METRIC_BOUNDS)
|
|
array.emplace_back("bounds");
|
|
if (metrics & display::DisplayObserver::DISPLAY_METRIC_WORK_AREA)
|
|
array.emplace_back("workArea");
|
|
if (metrics & display::DisplayObserver::DISPLAY_METRIC_DEVICE_SCALE_FACTOR)
|
|
array.emplace_back("scaleFactor");
|
|
if (metrics & display::DisplayObserver::DISPLAY_METRIC_ROTATION)
|
|
array.emplace_back("rotation");
|
|
return array;
|
|
}
|
|
|
|
void DelayEmit(Screen* screen,
|
|
const std::string_view name,
|
|
const display::Display& display) {
|
|
screen->Emit(name, display);
|
|
}
|
|
|
|
void DelayEmitWithMetrics(Screen* screen,
|
|
const std::string_view name,
|
|
const display::Display& display,
|
|
const std::vector<std::string>& metrics) {
|
|
screen->Emit(name, display, metrics);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
Screen::Screen(v8::Isolate* isolate, display::Screen* screen)
|
|
: screen_(screen) {
|
|
screen_->AddObserver(this);
|
|
}
|
|
|
|
Screen::~Screen() {
|
|
screen_->RemoveObserver(this);
|
|
}
|
|
|
|
gfx::Point Screen::GetCursorScreenPoint(v8::Isolate* isolate) {
|
|
#if defined(USE_OZONE)
|
|
// Wayland will crash unless a window is created prior to calling
|
|
// GetCursorScreenPoint.
|
|
if (!ui::OzonePlatform::IsInitialized()) {
|
|
gin_helper::ErrorThrower thrower(isolate);
|
|
thrower.ThrowError(
|
|
"screen.getCursorScreenPoint() cannot be called before a window has "
|
|
"been created.");
|
|
return {};
|
|
}
|
|
#endif
|
|
return screen_->GetCursorScreenPoint();
|
|
}
|
|
|
|
#if BUILDFLAG(IS_WIN)
|
|
|
|
static gfx::Rect ScreenToDIPRect(electron::NativeWindow* window,
|
|
const gfx::Rect& rect) {
|
|
HWND hwnd = window ? window->GetAcceleratedWidget() : nullptr;
|
|
return display::win::GetScreenWin()->ScreenToDIPRect(hwnd, rect);
|
|
}
|
|
|
|
static gfx::Rect DIPToScreenRect(electron::NativeWindow* window,
|
|
const gfx::Rect& rect) {
|
|
HWND hwnd = window ? window->GetAcceleratedWidget() : nullptr;
|
|
return display::win::GetScreenWin()->DIPToScreenRect(hwnd, rect);
|
|
}
|
|
|
|
#endif
|
|
|
|
void Screen::OnDisplayAdded(const display::Display& new_display) {
|
|
base::SingleThreadTaskRunner::GetCurrentDefault()->PostNonNestableTask(
|
|
FROM_HERE, base::BindOnce(&DelayEmit, base::Unretained(this),
|
|
"display-added", new_display));
|
|
}
|
|
|
|
void Screen::OnDisplaysRemoved(const display::Displays& old_displays) {
|
|
for (const auto& old_display : old_displays) {
|
|
base::SingleThreadTaskRunner::GetCurrentDefault()->PostNonNestableTask(
|
|
FROM_HERE, base::BindOnce(&DelayEmit, base::Unretained(this),
|
|
"display-removed", old_display));
|
|
}
|
|
}
|
|
|
|
void Screen::OnDisplayMetricsChanged(const display::Display& display,
|
|
uint32_t changed_metrics) {
|
|
base::SingleThreadTaskRunner::GetCurrentDefault()->PostNonNestableTask(
|
|
FROM_HERE, base::BindOnce(&DelayEmitWithMetrics, base::Unretained(this),
|
|
"display-metrics-changed", display,
|
|
MetricsToArray(changed_metrics)));
|
|
}
|
|
|
|
gfx::PointF Screen::ScreenToDIPPoint(const gfx::PointF& point_px) {
|
|
#if BUILDFLAG(IS_WIN)
|
|
return display::win::GetScreenWin()->ScreenToDIPPoint(point_px);
|
|
#elif BUILDFLAG(IS_LINUX)
|
|
if (x11_util::IsX11()) {
|
|
gfx::Point pt_px = gfx::ToFlooredPoint(point_px);
|
|
display::Display display = GetDisplayNearestPoint(pt_px);
|
|
gfx::Vector2d delta_px = pt_px - display.native_origin();
|
|
gfx::Vector2dF delta_dip =
|
|
gfx::ScaleVector2d(delta_px, 1.0 / display.device_scale_factor());
|
|
return gfx::PointF(display.bounds().origin()) + delta_dip;
|
|
} else {
|
|
return point_px;
|
|
}
|
|
#else
|
|
return point_px;
|
|
#endif
|
|
}
|
|
|
|
gfx::Point Screen::DIPToScreenPoint(const gfx::Point& point_dip) {
|
|
#if BUILDFLAG(IS_WIN)
|
|
return display::win::GetScreenWin()->DIPToScreenPoint(point_dip);
|
|
#elif BUILDFLAG(IS_LINUX)
|
|
if (x11_util::IsX11()) {
|
|
display::Display display = GetDisplayNearestPoint(point_dip);
|
|
gfx::Rect bounds_dip = display.bounds();
|
|
gfx::Vector2d delta_dip = point_dip - bounds_dip.origin();
|
|
gfx::Vector2d delta_px = gfx::ToFlooredVector2d(
|
|
gfx::ScaleVector2d(delta_dip, display.device_scale_factor()));
|
|
return display.native_origin() + delta_px;
|
|
} else {
|
|
return point_dip;
|
|
}
|
|
#else
|
|
return point_dip;
|
|
#endif
|
|
}
|
|
|
|
// static
|
|
v8::Local<v8::Value> Screen::Create(gin_helper::ErrorThrower error_thrower) {
|
|
if (!Browser::Get()->is_ready()) {
|
|
error_thrower.ThrowError(
|
|
"The 'screen' module can't be used before the app 'ready' event");
|
|
return v8::Null(error_thrower.isolate());
|
|
}
|
|
|
|
display::Screen* screen = display::Screen::Get();
|
|
if (!screen) {
|
|
error_thrower.ThrowError("Failed to get screen information");
|
|
return v8::Null(error_thrower.isolate());
|
|
}
|
|
|
|
return gin_helper::CreateHandle(error_thrower.isolate(),
|
|
new Screen(error_thrower.isolate(), screen))
|
|
.ToV8();
|
|
}
|
|
|
|
gin::ObjectTemplateBuilder Screen::GetObjectTemplateBuilder(
|
|
v8::Isolate* isolate) {
|
|
return gin_helper::EventEmitterMixin<Screen>::GetObjectTemplateBuilder(
|
|
isolate)
|
|
.SetMethod("getCursorScreenPoint", &Screen::GetCursorScreenPoint)
|
|
.SetMethod("getPrimaryDisplay", &Screen::GetPrimaryDisplay)
|
|
.SetMethod("getAllDisplays", &Screen::GetAllDisplays)
|
|
.SetMethod("getDisplayNearestPoint", &Screen::GetDisplayNearestPoint)
|
|
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
|
|
.SetMethod("screenToDipPoint", &Screen::ScreenToDIPPoint)
|
|
.SetMethod("dipToScreenPoint", &Screen::DIPToScreenPoint)
|
|
#endif
|
|
#if BUILDFLAG(IS_WIN)
|
|
.SetMethod("screenToDipRect", &ScreenToDIPRect)
|
|
.SetMethod("dipToScreenRect", &DIPToScreenRect)
|
|
#endif
|
|
.SetMethod("getDisplayMatching", &Screen::GetDisplayMatching);
|
|
}
|
|
|
|
const char* Screen::GetTypeName() {
|
|
return "Screen";
|
|
}
|
|
|
|
} // namespace electron::api
|
|
|
|
namespace {
|
|
|
|
using electron::api::Screen;
|
|
|
|
void Initialize(v8::Local<v8::Object> exports,
|
|
v8::Local<v8::Value> unused,
|
|
v8::Local<v8::Context> context,
|
|
void* priv) {
|
|
v8::Isolate* const isolate = electron::JavascriptEnvironment::GetIsolate();
|
|
gin_helper::Dictionary dict(isolate, exports);
|
|
dict.SetMethod("createScreen", base::BindRepeating(&Screen::Create));
|
|
}
|
|
|
|
} // namespace
|
|
|
|
NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_screen, Initialize)
|