DSDisplayDeviceHWCWindow: remove getWindow method

Change-Id: Ia0428733ab9d6fc6c9af21c47415ae322b697019

diff --git a/src/DSDisplayArea/DSDisplayArea.cpp b/src/DSDisplayArea/DSDisplayArea.cpp
index 0630043..2862419 100644 (file)
--- a/src/DSDisplayArea/DSDisplayArea.cpp
+++ b/src/DSDisplayArea/DSDisplayArea.cpp
@@ -153,15 +153,6 @@ void DSDisplayAreaPrivate::__onWindowDestroy(std::shared_ptr<DSWindow> window)
                        break;
                }
        }
-
-       for (auto displayDeviceHWCWindow : __displayDeviceHWCWindowList) {
-               auto tmpHWCWindow = displayDeviceHWCWindow->getWindow();
-               if (tmpHWCWindow.get() == window.get()) {
-                       __displayDeviceHWCWindowList.remove(displayDeviceHWCWindow);
-                       displayDeviceHWCWindow.reset();
-                       break;
-               }
-       }
 }
 
 void DSDisplayAreaPrivate::__onEventIdleEnterer(void *data)

diff --git a/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMImpl.cpp b/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMImpl.cpp
index 2b19be8..121ca63 100644 (file)
--- a/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMImpl.cpp
+++ b/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMImpl.cpp
@@ -55,9 +55,4 @@ void DSDisplayDeviceHWCWindowTDMImpl::onPresentFrameDone()
        /* TODO:: */
 }
 
-std::shared_ptr<DSWindow> DSDisplayDeviceHWCWindowTDMImpl::getWindow()
-{
-       return __window;
-}
-
 }

diff --git a/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMImpl.h b/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMImpl.h
index 5550190..2cc68c3 100644 (file)
--- a/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMImpl.h
+++ b/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMImpl.h
@@ -41,10 +41,8 @@ public:
        bool updateFrame() override;
        void presentFrame() override;
        void onPresentFrameDone() override;
-       std::shared_ptr<DSWindow> getWindow() override;
 
 private:
-       std::shared_ptr<DSWindow> __window;
        tdm_hwc_window *__twindow;
 };
 

diff --git a/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMTargetImpl.cpp b/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMTargetImpl.cpp
index abc3893..37269ec 100644 (file)
--- a/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMTargetImpl.cpp
+++ b/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMTargetImpl.cpp
@@ -91,11 +91,6 @@ void DSDisplayDeviceHWCWindowTDMTargetImpl::onPresentFrameDone()
        __presentedBuffer = std::move(__presentBuffer);
 }
 
-std::shared_ptr<DSWindow> DSDisplayDeviceHWCWindowTDMTargetImpl::getWindow()
-{
-       return nullptr;
-}
-
 Eina_Bool DSDisplayDeviceHWCWindowTDMTargetImpl::__onFdHandler(void *data, Ecore_Fd_Handler *hdlr)
 {
        int len;

diff --git a/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMTargetImpl.h b/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMTargetImpl.h
index 756b920..4f644f6 100644 (file)
--- a/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMTargetImpl.h
+++ b/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMTargetImpl.h
@@ -27,7 +27,6 @@
 #include "IDSDisplayDeviceHWCWindow.h"
 #include "IDSDisplayDeviceHWC.h"
 #include "IDSBufferQueue.h"
-#include "DSWindow.h"
 #include "IDSBuffer.h"
 #include <tdm.h>
 #include <Ecore.h>
@@ -43,7 +42,6 @@ public:
        bool updateFrame() override;
        void presentFrame() override;
        void onPresentFrameDone() override;
-       std::shared_ptr<DSWindow> getWindow() override;
 
 private:
        static Eina_Bool __onFdHandler(void *data, Ecore_Fd_Handler *hdlr);

diff --git a/src/DSDisplayDevice/IDSDisplayDeviceHWCWindow.h b/src/DSDisplayDevice/IDSDisplayDeviceHWCWindow.h
index e8eb85f..b3d5e21 100644 (file)
--- a/src/DSDisplayDevice/IDSDisplayDeviceHWCWindow.h
+++ b/src/DSDisplayDevice/IDSDisplayDeviceHWCWindow.h
@@ -24,8 +24,6 @@
 #ifndef _I_DS_DISPLAY_DEVICE_HWC_WINDOW_H_
 #define _I_DS_DISPLAY_DEVICE_HWC_WINDOW_H_
 
-#include "DSWindow.h"
-
 namespace display_server
 {
 class IDSDisplayDeviceHWCWindow
@@ -35,7 +33,6 @@ public:
        virtual bool updateFrame() = 0;
        virtual void presentFrame() = 0;
        virtual void onPresentFrameDone() = 0;
-       virtual std::shared_ptr<DSWindow> getWindow() = 0;
 };
 }