1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
--- ui/ozone/platform/wayland/host/wayland_window.cc.orig 2024-03-22 14:16:19 UTC
+++ ui/ozone/platform/wayland/host/wayland_window.cc
@@ -245,7 +245,7 @@ void WaylandWindow::OnPointerFocusChanged(bool focused
// Whenever the window gets the pointer focus back, the cursor shape must be
// updated. Otherwise, it is invalidated upon wl_pointer::leave and is not
// restored by the Wayland compositor.
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (focused && async_cursor_) {
async_cursor_->AddCursorLoadedCallback(
base::BindOnce(&WaylandWindow::OnCursorLoaded,
@@ -506,7 +506,7 @@ bool WaylandWindow::ShouldUseNativeFrame() const {
void WaylandWindow::SetCursor(scoped_refptr<PlatformCursor> platform_cursor) {
DCHECK(platform_cursor);
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
auto async_cursor = WaylandAsyncCursor::FromPlatformCursor(platform_cursor);
if (async_cursor_ == async_cursor) {
@@ -716,7 +716,7 @@ std::string WaylandWindow::WindowStates::ToString() co
} else {
base::TrimString(states, " ", &states);
}
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
states += "; tiled_edges: ";
std::string tiled = "";
if (tiled_edges.left) {
@@ -1185,12 +1185,12 @@ void WaylandWindow::UpdateCursorShape(scoped_refptr<Bi
cursor->bitmaps(), hotspot_in_dips,
std::ceil(cursor->cursor_image_scale_factor()));
}
-#if !BUILDFLAG(IS_LINUX)
+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
cursor_ = cursor;
#endif
}
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
void WaylandWindow::OnCursorLoaded(scoped_refptr<WaylandAsyncCursor> cursor,
scoped_refptr<BitmapCursor> bitmap_cursor) {
if (HasPointerFocus() && async_cursor_ == cursor && bitmap_cursor) {
|
