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.

hwcomposer.cpp

diff --git a/hwcomposer.cpp b/hwcomposer.cpp
index b4b1a50..a83c247 100644
--- a/hwcomposer.cpp
+++ b/hwcomposer.cpp
@@ -110,7 +110,7 @@
 
 static void hwc_set_cleanup(size_t num_displays,
                             hwc_display_contents_1_t **display_contents,
-                            Composition *composition) {
+                            DrmComposition *composition) {
   for (int i = 0; i < (int)num_displays; ++i) {
     if (!display_contents[i])
       continue;
@@ -133,7 +133,7 @@
 }
 
 static int hwc_add_layer(int display, hwc_context_t *ctx, hwc_layer_1_t *layer,
-                         Composition *composition) {
+                         DrmComposition *composition) {
   hwc_drm_bo_t bo;
   int ret = ctx->importer->ImportBuffer(layer->handle, &bo);
   if (ret) {
@@ -171,7 +171,7 @@
                    hwc_display_contents_1_t **display_contents) {
   ATRACE_CALL();
   struct hwc_context_t *ctx = (struct hwc_context_t *)&dev->common;
-  Composition *composition =
+  DrmComposition *composition =
       ctx->drm.compositor()->CreateComposition(ctx->importer);
   if (!composition) {
     ALOGE("Drm composition init failed");