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

Unified Diff: ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc

Issue 1294113005: Atomic: Don’t keep track of Cursor planes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
Index: ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc
diff --git a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc
index 4bf1c84d631e26a953a3db3275ff44c8e9cb2214..c5a79c6a67874f52941d75f577cbb56f82dda7be 100644
--- a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc
+++ b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc
@@ -107,7 +107,7 @@ bool HardwareDisplayPlaneManager::Initialize(DrmDevice* drm) {
for (uint32_t j = 0; j < formats_size; j++)
supported_formats.push_back(drm_plane->formats[j]);
- if (plane->Initialize(drm, supported_formats)) {
+ if (plane->Initialize(drm, supported_formats, false)) {
planes_.push_back(plane.Pass());
}
}
@@ -121,8 +121,7 @@ bool HardwareDisplayPlaneManager::Initialize(DrmDevice* drm) {
if (plane_ids.find(resources->crtcs[i] - 1) == plane_ids.end()) {
scoped_ptr<HardwareDisplayPlane> dummy_plane(
CreatePlane(resources->crtcs[i] - 1, (1 << i)));
- dummy_plane->set_is_dummy(true);
- if (dummy_plane->Initialize(drm, std::vector<uint32_t>())) {
+ if (dummy_plane->Initialize(drm, std::vector<uint32_t>(), true)) {
planes_.push_back(dummy_plane.Pass());
}
}
@@ -193,7 +192,7 @@ bool HardwareDisplayPlaneManager::AssignOverlayPlanes(
}
gfx::Rect fixed_point_rect;
- if (!hw_plane->is_dummy()) {
+ if (hw_plane->type() != HardwareDisplayPlane::Dummy) {
const gfx::Size& size = plane.buffer->GetSize();
gfx::RectF crop_rect = plane.crop_rect;
crop_rect.Scale(size.width(), size.height());

Powered by Google App Engine
This is Rietveld 408576698