-
Notifications
You must be signed in to change notification settings - Fork 6.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ozone/wayland: use struct traits instead of TypeConverter
TypeConverter uses unnecessary copies and it's suggested to use StructTraits instead. This should slightly improve speed of serialization and deserialization as it avoids copies. Bug: 1295527 Change-Id: I1480be154dea59f82c521a8e6ad9a8400a744e08 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3623479 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: Maksim Sisov <msisov@igalia.com> Reviewed-by: Lei Zhang <thestig@chromium.org> Reviewed-by: Kramer Ge <fangzhoug@chromium.org> Cr-Commit-Position: refs/heads/main@{#1002511}
- Loading branch information
Showing
23 changed files
with
553 additions
and
332 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
ui/ozone/platform/wayland/common/wayland_overlay_config.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| // Copyright 2022 The Chromium Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #include "ui/ozone/platform/wayland/common/wayland_overlay_config.h" | ||
|
|
||
| namespace wl { | ||
|
|
||
| WaylandOverlayConfig::WaylandOverlayConfig() = default; | ||
|
|
||
| WaylandOverlayConfig::WaylandOverlayConfig(WaylandOverlayConfig&& other) = | ||
| default; | ||
|
|
||
| WaylandOverlayConfig::WaylandOverlayConfig(const gfx::OverlayPlaneData& data, | ||
| std::unique_ptr<gfx::GpuFence> fence, | ||
| BufferId buffer_id, | ||
| float scale_factor) | ||
| : z_order(data.z_order), | ||
| transform(data.plane_transform), | ||
| buffer_id(buffer_id), | ||
| surface_scale_factor(scale_factor), | ||
| bounds_rect(data.display_bounds), | ||
| crop_rect(data.crop_rect), | ||
| damage_region(data.damage_rect), | ||
| enable_blend(data.enable_blend), | ||
| opacity(data.opacity), | ||
| access_fence_handle(fence ? fence->GetGpuFenceHandle().Clone() | ||
| : gfx::GpuFenceHandle()), | ||
| priority_hint(data.priority_hint), | ||
| rounded_clip_bounds(data.rounded_corners), | ||
| background_color(data.color) {} | ||
|
|
||
| WaylandOverlayConfig& WaylandOverlayConfig::operator=( | ||
| WaylandOverlayConfig&& other) = default; | ||
|
|
||
| WaylandOverlayConfig::~WaylandOverlayConfig() = default; | ||
|
|
||
| } // namespace wl |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| // Copyright 2022 The Chromium Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #ifndef UI_OZONE_PLATFORM_WAYLAND_COMMON_WAYLAND_OVERLAY_CONFIG_H_ | ||
| #define UI_OZONE_PLATFORM_WAYLAND_COMMON_WAYLAND_OVERLAY_CONFIG_H_ | ||
|
|
||
| #include <memory> | ||
|
|
||
| #include "ui/gfx/gpu_fence.h" | ||
| #include "ui/gfx/gpu_fence_handle.h" | ||
| #include "ui/gfx/overlay_plane_data.h" | ||
| #include "ui/gfx/overlay_priority_hint.h" | ||
| #include "ui/gfx/overlay_transform.h" | ||
|
|
||
| namespace wl { | ||
|
|
||
| using BufferId = uint32_t; | ||
|
|
||
| struct WaylandOverlayConfig { | ||
| WaylandOverlayConfig(); | ||
| WaylandOverlayConfig(WaylandOverlayConfig&& other); | ||
| WaylandOverlayConfig(const gfx::OverlayPlaneData& data, | ||
| std::unique_ptr<gfx::GpuFence> fence, | ||
| BufferId buffer_id, | ||
| float scale_factor); | ||
| WaylandOverlayConfig& operator=(WaylandOverlayConfig&& other); | ||
|
|
||
| ~WaylandOverlayConfig(); | ||
|
|
||
| // Specifies the stacking order of this overlay plane, relative to primary | ||
| // plane. | ||
| int z_order = 0; | ||
|
|
||
| // Specifies how the buffer is to be transformed during composition. | ||
| gfx::OverlayTransform transform = | ||
| gfx::OverlayTransform::OVERLAY_TRANSFORM_NONE; | ||
|
|
||
| // A unique id for the buffer, which is used to identify imported wl_buffers | ||
| // on the browser process. | ||
| uint32_t buffer_id = 0; | ||
|
|
||
| // Scale factor of the GPU side surface with respect to a display where the | ||
| // surface is located at. | ||
| float surface_scale_factor = 1.f; | ||
|
|
||
| // Specifies where it is supposed to be on the display in physical pixels. | ||
| // This, after scaled by buffer_scale sets the destination rectangle of | ||
| // Wayland Viewport. | ||
| gfx::RectF bounds_rect; | ||
|
|
||
| // Specifies the region within the buffer to be placed inside |bounds_rect|. | ||
| // This sets the source rectangle of Wayland Viewport. | ||
| gfx::RectF crop_rect = {1.f, 1.f}; | ||
|
|
||
| // Describes the changed region of the buffer. Optional to hint a partial | ||
| // swap. | ||
| gfx::Rect damage_region; | ||
|
|
||
| // Specifies if alpha blending, with premultiplied alpha should be applied at | ||
| // scanout. | ||
| bool enable_blend = false; | ||
|
|
||
| // Opacity of the overlay independent of buffer alpha. | ||
| // Valid values are [0.0, 1.0f]. | ||
| float opacity = 1.f; | ||
|
|
||
| // Specifies a GpuFenceHandle to be waited on before content of the buffer can | ||
| // be accessed by the display controller for overlay, or by the gpu for | ||
| // compositing. | ||
| gfx::GpuFenceHandle access_fence_handle; | ||
|
|
||
| // Specifies priority of this overlay if delegated composition is supported | ||
| // and enabled. | ||
| gfx::OverlayPriorityHint priority_hint = gfx::OverlayPriorityHint::kNone; | ||
|
|
||
| // Specifies rounded clip bounds of the overlay if delegated composition is | ||
| // supported and enabled. | ||
| gfx::RRectF rounded_clip_bounds; | ||
|
|
||
| // Optional: background color of this overlay plane. | ||
| absl::optional<SkColor> background_color; | ||
| }; | ||
|
|
||
| } // namespace wl | ||
|
|
||
| #endif // COMPONENTS_VIZ_COMMON_QUADS_COMPOSITOR_FRAME_H_ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.