From 8142643cc6423d2ac86d39b4095e12a9b19aea7e Mon Sep 17 00:00:00 2001 From: Doyoun Kang Date: Tue, 4 Aug 2020 21:46:54 +0900 Subject: [PATCH] Revert "DSCompositor: add code to create DSWaylandExtension" This reverts commit 28205782954df472ab10742de453633fbcf39e5b. Change-Id: I6c2e4f728d7a006ae7610894182984659c7c083d --- src/DSCompositor/DSCompositor.cpp | 7 ------- src/DSCompositor/DSCompositorPrivate.h | 4 ---- 2 files changed, 11 deletions(-) diff --git a/src/DSCompositor/DSCompositor.cpp b/src/DSCompositor/DSCompositor.cpp index b6d4acb..f042897 100644 --- a/src/DSCompositor/DSCompositor.cpp +++ b/src/DSCompositor/DSCompositor.cpp @@ -7,7 +7,6 @@ #include "DSSeat.h" #include "DSInput.h" #include "DSWaylandCompositor.h" -#include "DSWaylandExtension.h" #include namespace display_server @@ -70,7 +69,6 @@ bool DSCompositorPrivate::run() __initializeWlDisplay(); __initializeOutputs(); __initializeBufferManager(); - __initializeExtension(); __canvas = pub->_onInitialized(); if (!__canvas) { DSLOG_ERR("Compositor", "_onInitialized() fails."); @@ -126,9 +124,4 @@ void DSCompositorPrivate::__initializeBufferManager() __dsBufferManager = DSBufferManager::getInstance(); } -void DSCompositorPrivate::__initializeExtension() -{ - __wlExtension = std::make_unique(__wlCompositor); -} - } // namespace display_server \ No newline at end of file diff --git a/src/DSCompositor/DSCompositorPrivate.h b/src/DSCompositor/DSCompositorPrivate.h index a72fdf2..e84424c 100644 --- a/src/DSCompositor/DSCompositorPrivate.h +++ b/src/DSCompositor/DSCompositorPrivate.h @@ -13,7 +13,6 @@ namespace display_server class DSSeat; class DSInput; class DSWaylandCompositor; -class DSWaylandExtension; class DSCompositorPrivate : public DSObjectPrivate { @@ -39,12 +38,9 @@ private: std::shared_ptr __canvas; DSBufferManager *__dsBufferManager; - std::unique_ptr __wlExtension; - void __initializeWlDisplay(); void __initializeOutputs(); void __initializeBufferManager(); - void __initializeExtension(); }; } -- 2.7.4