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

Unified Diff: ui/ozone/platform/drm/gpu/hardware_display_plane_manager_atomic.h

Issue 994503004: Preliminary atomic patch (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: change gyp var Created 5 years, 9 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_atomic.h
diff --git a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_legacy.h b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_atomic.h
similarity index 60%
copy from ui/ozone/platform/drm/gpu/hardware_display_plane_manager_legacy.h
copy to ui/ozone/platform/drm/gpu/hardware_display_plane_manager_atomic.h
index 8bf80cd3f19ad9b489fa47b0db0b7d6575dce54a..f59ff5297cc0be6b5aa211313e549164ebe912d4 100644
--- a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_legacy.h
+++ b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_atomic.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2015 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.
@@ -10,13 +10,17 @@
namespace ui {
-class OZONE_EXPORT HardwareDisplayPlaneManagerLegacy
+class OZONE_EXPORT HardwareDisplayPlaneManagerAtomic
: public HardwareDisplayPlaneManager {
public:
- HardwareDisplayPlaneManagerLegacy();
- ~HardwareDisplayPlaneManagerLegacy() override;
+ HardwareDisplayPlaneManagerAtomic();
+ ~HardwareDisplayPlaneManagerAtomic() override;
// HardwareDisplayPlaneManager:
+ bool AssignOverlayPlanes(HardwareDisplayPlaneList* plane_list,
+ const OverlayPlaneList& overlay_list,
+ uint32_t crtc_id,
+ CrtcController* crtc) override;
bool Commit(HardwareDisplayPlaneList* plane_list, bool is_sync) override;
private:
@@ -27,7 +31,11 @@ class OZONE_EXPORT HardwareDisplayPlaneManagerLegacy
const gfx::Rect& src_rect,
CrtcController* crtc) override;
- DISALLOW_COPY_AND_ASSIGN(HardwareDisplayPlaneManagerLegacy);
+ scoped_ptr<HardwareDisplayPlane> CreatePlane(
+ uint32_t plane_id,
+ uint32_t possible_crtcs) override;
+
+ DISALLOW_COPY_AND_ASSIGN(HardwareDisplayPlaneManagerAtomic);
};
} // namespace ui

Powered by Google App Engine
This is Rietveld 408576698