github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: potential dangling pointer in api::Screen (#49536)

Browse Source 
fixes a regression from #49506
This commit is contained in:
Charles Kerr
2026-01-27 15:27:38 -06:00
committed by GitHub
parent 441729c3a0
commit 8364b62f68
2 changed files with 52 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
shell/browser/api/electron_api_screen.h
View File

@@ -7,7 +7,6 @@
#include <vector>
#include "base/memory/raw_ptr.h"
#include "gin/wrappable.h"
#include "shell/browser/event_emitter_mixin.h"
#include "ui/display/display_observer.h"
@@ -43,22 +42,16 @@ class Screen final : public gin::Wrappable<Screen>,
Screen& operator=(const Screen&) = delete;
// Make public for cppgc::MakeGarbageCollected.
explicit Screen(display::Screen* screen);
Screen();
~Screen() override;
gfx::Point GetCursorScreenPoint(v8::Isolate* isolate);
display::Display GetPrimaryDisplay() const {
return screen_->GetPrimaryDisplay();
}
const std::vector<display::Display>& GetAllDisplays() const {
return screen_->GetAllDisplays();
}
display::Display GetDisplayNearestPoint(const gfx::Point& point) const {
return screen_->GetDisplayNearestPoint(point);
}
display::Display GetDisplayMatching(const gfx::Rect& match_rect) const {
return screen_->GetDisplayMatching(match_rect);
}
[[nodiscard]] gfx::Point GetCursorScreenPoint(v8::Isolate* isolate);
[[nodiscard]] display::Display GetPrimaryDisplay() const;
[[nodiscard]] std::vector<display::Display> GetAllDisplays() const;
[[nodiscard]] display::Display GetDisplayNearestPoint(
const gfx::Point& point) const;
[[nodiscard]] display::Display GetDisplayMatching(
const gfx::Rect& match_rect) const;
gfx::PointF ScreenToDIPPoint(const gfx::PointF& point_px);
gfx::Point DIPToScreenPoint(const gfx::Point& point_dip);
@@ -68,9 +61,6 @@ class Screen final : public gin::Wrappable<Screen>,
void OnDisplaysRemoved(const display::Displays& removed_displays) override;
void OnDisplayMetricsChanged(const display::Display& display,
uint32_t changed_metrics) override;
private:
raw_ptr<display::Screen> screen_;
};
} // namespace electron::api