Index: ui/ozone/platform/wayland/wayland_output.cc |
diff --git a/ui/ozone/platform/wayland/wayland_output.cc b/ui/ozone/platform/wayland/wayland_output.cc |
index 39bdfd98f9dcd54317128f8e9b092d382a9d4cf9..d1b8a93bd7f9caf32ce6976a17d92a59f9d25435 100644 |
--- a/ui/ozone/platform/wayland/wayland_output.cc |
+++ b/ui/ozone/platform/wayland/wayland_output.cc |
@@ -10,8 +10,8 @@ |
namespace ui { |
-WaylandOutput::WaylandOutput(wl_output* output) |
- : output_(output), rect_(0, 0, 0, 0), observer_(nullptr) { |
+WaylandOutput::WaylandOutput(wl_output* output, uint32_t name) |
+ : output_(output), name_(name), rect_(0, 0, 0, 0) { |
static const wl_output_listener output_listener = { |
&WaylandOutput::OutputHandleGeometry, &WaylandOutput::OutputHandleMode, |
}; |
@@ -48,8 +48,11 @@ void WaylandOutput::OutputHandleMode(void* data, |
output->rect_.set_width(width); |
output->rect_.set_height(height); |
- if (output->observer()) |
- output->observer()->OnOutputReadyForUse(); |
+ if (!WaylandConnection::GetInstance()) |
+ return; |
+ |
+ WaylandConnection::GetInstance()->OnOutputGeometryChanged(output->name_, |
+ output->rect_); |
} |
} |