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 58% |
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..e49315c7a26277dd503a1027cb10b50a8f00d5c3 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,22 +1,22 @@ |
-// 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. |
#ifndef UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_PLANE_MANAGER_ATOMIC_H_ |
#define UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_PLANE_MANAGER_ATOMIC_H_ |
-#include "ui/ozone/ozone_export.h" |
#include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h" |
namespace ui { |
-class OZONE_EXPORT HardwareDisplayPlaneManagerLegacy |
- : public HardwareDisplayPlaneManager { |
+class HardwareDisplayPlaneManagerAtomic : public HardwareDisplayPlaneManager { |
public: |
- HardwareDisplayPlaneManagerLegacy(); |
- ~HardwareDisplayPlaneManagerLegacy() override; |
+ HardwareDisplayPlaneManagerAtomic(); |
dnicoara
2015/03/09 20:10:41
virtual destructor
achaulk
2015/03/09 20:23:49
Done.
|
- // HardwareDisplayPlaneManager: |
+ bool AssignOverlayPlanes(HardwareDisplayPlaneList* plane_list, |
dnicoara
2015/03/09 20:10:41
// HardwareDisplayPlaneManager:
achaulk
2015/03/09 20:23:49
Done.
|
+ const OverlayPlaneList& overlay_list, |
+ uint32_t crtc_id, |
+ CrtcController* crtc) override; |
bool Commit(HardwareDisplayPlaneList* plane_list, bool is_sync) override; |
private: |
@@ -27,7 +27,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 |