Merge "remove obsolete (unused) create default surface method and clean up documentat...

diff --git a/adaptors/base/interfaces/trigger-event-interface.h b/adaptors/base/interfaces/trigger-event-interface.h
index 5a4ad92..15eb377 100644 (file)
--- a/adaptors/base/interfaces/trigger-event-interface.h
+++ b/adaptors/base/interfaces/trigger-event-interface.h
@@ -50,7 +50,7 @@ public:
 
   /**
    * @brief Triggers the event.
-   *
+   * This method cannot ever block, it needs to return immediately.
    * This can be called from one thread in order to wake up another thread.
    */
   virtual void Trigger() = 0;

diff --git a/adaptors/public-api/adaptor-framework/render-surface.cpp b/adaptors/public-api/adaptor-framework/render-surface.cpp
deleted file mode 100644 (file)
index 7c29409..0000000
--- a/adaptors/public-api/adaptor-framework/render-surface.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2014 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <render-surface.h>
-
-// INTERNAL INCLUDES
-#include <render-surface-impl.h>
-#include <pixmap-render-surface.h>
-#include <window-render-surface.h>
-
-namespace Dali
-{
-
-RenderSurface::RenderSurface()
-{
-}
-
-RenderSurface::~RenderSurface()
-{
-}
-
-RenderSurface* CreateDefaultSurface( RenderSurface::SurfaceType type, PositionSize positionSize, const std::string& name )
-{
-  // create a Ecore window by default
-  Any surface;
-  Any display;
-
-  Internal::Adaptor::ECore::RenderSurface* renderSurface(NULL);
-  if( RenderSurface::WINDOW == type )
-  {
-    renderSurface = new Internal::Adaptor::ECore::WindowRenderSurface( positionSize, surface, display, name );
-  }
-  else
-  {
-    renderSurface = new Internal::Adaptor::ECore::PixmapRenderSurface( positionSize, surface, display, name );
-  }
-
-  return renderSurface;
-}
-
-} // namespace Dali

diff --git a/adaptors/public-api/adaptor-framework/render-surface.h b/adaptors/public-api/adaptor-framework/render-surface.h
index 6d9e9b1..bccd440 100644 (file)
--- a/adaptors/public-api/adaptor-framework/render-surface.h
+++ b/adaptors/public-api/adaptor-framework/render-surface.h
@@ -59,16 +59,15 @@ public:
 
   /**
    * @brief Constructor
-   *
-   * Application or Adaptor needs to create the appropriate concrete RenderSurface type.
-   * @see CreateDefaultSurface
+   * Inlined as this is a pure abstract interface
    */
-  RenderSurface();
+  RenderSurface() {}
 
   /**
    * @brief Virtual Destructor.
-  */
-  virtual ~RenderSurface();
+   * Inlined as this is a pure abstract interface
+   */
+  virtual ~RenderSurface() {}
 
   /**
    * @brief returns the surface type.
@@ -108,18 +107,6 @@ private:
 
 };
 
-/**
- * @brief Default surface factory function.
- *
- * A surface is created with the given type.
- *
- * @param [in] type the type of surface to create
- * @param [in] positionSize the position and size of the surface to create
- * @param [in] name optional name of surface passed in
- * @return The render surface
- */
-DALI_IMPORT_API RenderSurface* CreateDefaultSurface( RenderSurface::SurfaceType type, PositionSize positionSize, const std::string& name = "" );
-
 } // namespace Dali
 
 #endif // __DALI_RENDER_SURFACE_H__

diff --git a/adaptors/public-api/file.list b/adaptors/public-api/file.list
index f0b1785..2d9d9fc 100644 (file)
--- a/adaptors/public-api/file.list
+++ b/adaptors/public-api/file.list
@@ -17,7 +17,6 @@ public_api_src_files = \
   $(adaptor_public_api_dir)/adaptor-framework/physical-keyboard.cpp \
   $(adaptor_public_api_dir)/adaptor-framework/performance-logger.cpp \
   $(adaptor_public_api_dir)/adaptor-framework/pixmap-image.cpp \
-  $(adaptor_public_api_dir)/adaptor-framework/render-surface.cpp \
   $(adaptor_public_api_dir)/adaptor-framework/singleton-service.cpp \
   $(adaptor_public_api_dir)/adaptor-framework/sound-player.cpp \
   $(adaptor_public_api_dir)/adaptor-framework/style-monitor.cpp \