Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(135)

Unified Diff: ui/ozone/platform/wayland/wayland_output.cc

Issue 2027943002: [WIP] Make content_shell run under Wayland Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: (09.28.2016)Rebase on master Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/ozone/platform/wayland/wayland_output.h ('k') | ui/ozone/public/ozone_platform.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_);
}
}
« no previous file with comments | « ui/ozone/platform/wayland/wayland_output.h ('k') | ui/ozone/public/ozone_platform.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698