commit 1c5e55680d9165d8f9bb2bc6e2c4261574b5d41d
author Puneet Kumar <puneetster@google.com> Thu Jul 30 03:35:38 2015 +0000
committer Puneet Kumar <puneetster@google.com> Thu Jul 30 03:35:38 2015 +0000
tree 59dfc0090c4c085ad306f8d0789a144fb620f8b0
parent 7912438911de042dc035cf1ea39daaf4e56bf9f3

Revert "drm_hwcomposer: remove compositor interface"

This reverts commit 7912438911de042dc035cf1ea39daaf4e56bf9f3.

For now until we can get back to a stable SF/compositor.

Change-Id: I2ba7cab4f1cccfe44b3d35fb18c7784125e88fd6

drmcompositor.h

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