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.

drmcompositor.h

diff --git a/drmcompositor.h b/drmcompositor.h
index 5f47034..aa4a876 100644
--- a/drmcompositor.h
+++ b/drmcompositor.h
@@ -17,7 +17,7 @@
 #ifndef ANDROID_DRM_COMPOSITOR_H_
 #define ANDROID_DRM_COMPOSITOR_H_
 
-#include "compositor.h"
+#include "drmcomposition.h"
 #include "drmdisplaycompositor.h"
 #include "importer.h"
 
@@ -26,22 +26,18 @@
 
 namespace android {
 
-class DrmCompositor : public Compositor {
+class DrmCompositor {
  public:
   DrmCompositor(DrmResources *drm);
   ~DrmCompositor();
 
-  virtual int Init();
+  int Init();
 
-  virtual Targeting *targeting() {
-    return NULL;
-  }
+  DrmComposition *CreateComposition(Importer *importer);
 
-  virtual Composition *CreateComposition(Importer *importer);
-
-  virtual int QueueComposition(Composition *composition);
-  virtual int Composite();
-  virtual void Dump(std::ostringstream *out) const;
+  int QueueComposition(DrmComposition *composition);
+  int Composite();
+  void Dump(std::ostringstream *out) const;
 
  private:
   DrmCompositor(const DrmCompositor &) = delete;