commit 459a5a9ccd014224882e5522d2957aba10413691
author Zach Reizner <zachr@google.com> Fri Jul 31 15:12:49 2015 -0700
committer Zach Reizner <zachr@google.com> Fri Aug 07 15:49:33 2015 -0700
tree 44009f67acf89938e0876d08fef7e4fd7bedac89
parent 810ecc67ae408e752325497c836cf6fdccd5ce55

Revert "Revert "drm_hwcomposer: remove compositor interface""

This reverts commit 1c5e55680d9165d8f9bb2bc6e2c4261574b5d41d.

drmcomposition.h

diff --git a/drmcomposition.h b/drmcomposition.h
index 06af71d..69bf6d9 100644
--- a/drmcomposition.h
+++ b/drmcomposition.h
@@ -17,7 +17,6 @@
 #ifndef ANDROID_DRM_COMPOSITION_H_
 #define ANDROID_DRM_COMPOSITION_H_
 
-#include "compositor.h"
 #include "drm_hwcomposer.h"
 #include "drmdisplaycomposition.h"
 #include "drmplane.h"
@@ -32,15 +31,15 @@
 
 namespace android {
 
-class DrmComposition : public Composition {
+class DrmComposition {
  public:
   DrmComposition(DrmResources *drm, Importer *importer);
   ~DrmComposition();
 
-  virtual int Init();
+  int Init();
 
-  virtual unsigned GetRemainingLayers(int display, unsigned num_needed) const;
-  virtual int AddLayer(int display, hwc_layer_1_t *layer, hwc_drm_bo_t *bo);
+  unsigned GetRemainingLayers(int display, unsigned num_needed) const;
+  int AddLayer(int display, hwc_layer_1_t *layer, hwc_drm_bo_t *bo);
   int AddDpmsMode(int display, uint32_t dpms_mode);
 
   int DisableUnusedPlanes();