22 files changed, 45 insertions, 1420 deletions

diff --git a/hwc2/platforms/PlatFactory.cpp b/hwc2/platforms/PlatFactory.cpp
index c73eddf..47a789e 100644
--- a/hwc2/platforms/PlatFactory.cpp
+++ b/hwc2/platforms/PlatFactory.cpp
@@ -43,14 +43,14 @@ IDisplayDevice* PlatFactory::createDisplayDevice(int disp)
     //when createDisplayDevice is called, Hwcomposer has already finished construction.
     Hwcomposer &hwc = Hwcomposer::getInstance();
 
-    class PlatDeviceControlFactory: public DeviceControlFactory {
+    class PlatcComposerFactory: public IComposeDeviceFactory {
     public:
-        virtual IComposer* createComposer(IDisplayDevice& disp)       {return new GE2DComposer(disp);}
+        virtual IComposeDevice* createComposer(IDisplayDevice& disp)       {return new GE2DComposer(disp);}
     };
 
     switch (disp) {
         case IDisplayDevice::DEVICE_PRIMARY:
-            return new PrimaryDevice(hwc, new PlatDeviceControlFactory());
+            return new PrimaryDevice(hwc, new PlatcComposerFactory());
         case IDisplayDevice::DEVICE_VIRTUAL:
             return new VirtualDevice(hwc);
         case IDisplayDevice::DEVICE_EXTERNAL: