X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fwindow-system%2Fubuntu-x11%2Fpixmap-render-surface-ecore-x.cpp;h=2e9314054afb963fe5f353d18067b2b0ec4b1d6f;hb=8786ea8fbb26a9cb555a613518cf108017467c69;hp=5ff47a6f7a839de3aa41ed379de5c4aea0e2a692;hpb=db79997004ac2fef8c6c958d5aae6e10adb1258a;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.cpp b/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.cpp
old mode 100755
new mode 100644
index 5ff47a6..2e93140
--- a/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.cpp
+++ b/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,22 +22,19 @@
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-
 #include <X11/extensions/Xfixes.h> // for damage notify
 #include <X11/extensions/Xdamage.h> // for damage notify
-
 #include <dali/integration-api/gl-abstraction.h>
 #include <dali/integration-api/debug.h>
 #include <dali/devel-api/threading/mutex.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/thread-synchronization-interface.h>
-#include <dali/internal/system/common/trigger-event.h>
-#include <dali/internal/window-system/common/display-connection.h>
-#include <dali/internal/graphics/gles/egl-graphics.h>
+#include <dali/integration-api/adaptor-framework/thread-synchronization-interface.h>
 #include <dali/internal/adaptor/common/adaptor-impl.h>
 #include <dali/internal/adaptor/common/adaptor-internal-services.h>
-
+#include <dali/internal/graphics/gles/egl-graphics.h>
+#include <dali/internal/system/common/trigger-event.h>
+#include <dali/internal/window-system/common/display-connection.h>
 
 namespace Dali
 {
@@ -150,11 +147,6 @@ void PixmapRenderSurfaceEcoreX::GetDpi( unsigned int& dpiHorizontal, unsigned in
   dpiVertical   = int( yres + 0.5f );
 }
 
-int PixmapRenderSurfaceEcoreX::GetOrientation() const
-{
-  return 0;
-}
-
 void PixmapRenderSurfaceEcoreX::InitializeGraphics()
 {
   mGraphics = &mAdaptor->GetGraphicsInterface();
@@ -234,15 +226,6 @@ bool PixmapRenderSurfaceEcoreX::PreRender( bool )
   return true;
 }
 
-void PixmapRenderSurfaceEcoreX::SetDamagedRect( const Dali::DamagedRect& damagedRect, Dali::DamagedRect& mergedRect )
-{
-}
-
-int32_t PixmapRenderSurfaceEcoreX::GetBufferAge()
-{
-  return 0;
-}
-
 void PixmapRenderSurfaceEcoreX::PostRender( bool renderToFbo, bool replacingSurface, bool resizingSurface )
 {
   auto eglGraphics = static_cast<EglGraphics *>(mGraphics);
@@ -326,9 +309,9 @@ void PixmapRenderSurfaceEcoreX::ReleaseLock()
   }
 }
 
-Integration::RenderSurface::Type PixmapRenderSurfaceEcoreX::GetSurfaceType()
+Dali::RenderSurfaceInterface::Type PixmapRenderSurfaceEcoreX::GetSurfaceType()
 {
-  return Integration::RenderSurface::PIXMAP_RENDER_SURFACE;
+  return Dali::RenderSurfaceInterface::PIXMAP_RENDER_SURFACE;
 }
 
 void PixmapRenderSurfaceEcoreX::MakeContextCurrent()