diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/components/exo/wayland/wl_output.cc | |
parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
download | qtwebengine-chromium-85-based.tar.gz |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/exo/wayland/wl_output.cc')
-rw-r--r-- | chromium/components/exo/wayland/wl_output.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/chromium/components/exo/wayland/wl_output.cc b/chromium/components/exo/wayland/wl_output.cc index b6b80bf515b..b95c1969890 100644 --- a/chromium/components/exo/wayland/wl_output.cc +++ b/chromium/components/exo/wayland/wl_output.cc @@ -28,15 +28,17 @@ void output_release(wl_client* client, wl_resource* resource) { const struct wl_output_interface output_implementation = {output_release}; -void bind_output(wl_client* client, void* data, uint32_t version, uint32_t id) { +void bind_output(wl_client* client, + void* data, + uint32_t version, + uint32_t output_id) { WaylandDisplayOutput* output = static_cast<WaylandDisplayOutput*>(data); - wl_resource* resource = wl_resource_create( - client, &wl_output_interface, std::min(version, kWlOutputVersion), id); - - SetImplementation( - resource, &output_implementation, - std::make_unique<WaylandDisplayObserver>(output->id(), resource)); + wl_resource* resource = + wl_resource_create(client, &wl_output_interface, + std::min(version, kWlOutputVersion), output_id); + SetImplementation(resource, &output_implementation, + std::make_unique<WaylandDisplayObserver>(output, resource)); } } // namespace wayland |