[3.0] Remove/move experimental features

[platform/core/uifw/dali-core.git] / dali / internal / event / images / resource-image-impl.h

diff --git a/dali/internal/event/images/resource-image-impl.h b/dali/internal/event/images/resource-image-impl.h
index 87f87f5..642d3c1 100644 (file)
--- a/dali/internal/event/images/resource-image-impl.h
+++ b/dali/internal/event/images/resource-image-impl.h
@@ -25,6 +25,7 @@
 #include <dali/public-api/images/resource-image.h>
 #include <dali/internal/event/images/image-impl.h>
 #include <dali/internal/event/images/image-factory-cache.h>
+#include <dali/integration-api/debug.h> // For DALI_LOG_OBJECT_STRING_DECLARATION
 
 namespace Dali
 {
@@ -32,10 +33,6 @@ namespace Dali
 namespace Internal
 {
 
-typedef Dali::ResourceImage::LoadPolicy LoadPolicy;
-
-const LoadPolicy IMAGE_LOAD_POLICY_DEFAULT = Dali::ResourceImage::IMMEDIATE;
-
 class ResourceImage;
 typedef IntrusivePtr<ResourceImage> ResourceImagePtr;
 
@@ -58,14 +55,10 @@ public:
    * @param [in] url The URL of the image file.
    * @param [in] attributes requested parameters for loading (size, scaling etc.)
    *                        if width or height is specified as 0, the natural size will be used.
-   * @param [in] loadPol controls time of loading a resource from the filesystem (default: load when Image is created).
-   * @param [in] releasePol optionally relase memory when image is not visible on screen (default: keep image data until Image object is alive).
    * @return a pointer to a newly created object.
    */
   static ResourceImagePtr New( const std::string& url,
-                          const Dali::ImageAttributes& attributes,
-                          LoadPolicy loadPol = IMAGE_LOAD_POLICY_DEFAULT,
-                          ReleasePolicy releasePol = IMAGE_RELEASE_POLICY_DEFAULT );
+                          const ImageAttributes& attributes );
 
   /**
    * @copydoc Dali::ResourceImage::GetLoadingState()
@@ -73,11 +66,6 @@ public:
   Dali::LoadingState GetLoadingState() const { return mTicket ? mTicket->GetLoadingState() : ResourceLoading; }
 
   /**
-   * @copydoc Dali::ResourceImage::GetLoadPolicy()
-   */
-  LoadPolicy GetLoadPolicy () const { return mLoadPolicy; }
-
-  /**
    * @copydoc Dali::ResourceImage::LoadingFinishedSignal()
    */
   Dali::ResourceImage::ResourceImageSignal& LoadingFinishedSignal() { return mLoadingFinished; }
@@ -101,7 +89,7 @@ public:
    * If requested width or height was 0, they are replaced by concrete dimensions.
    * @return a copy of the attributes
    */
-  const Dali::ImageAttributes& GetAttributes() const;
+  const ImageAttributes& GetAttributes() const;
 
   /**
    * @copydoc Dali::ResourceImage::GetUrl()
@@ -160,18 +148,11 @@ protected:
   /**
    * Constructor, with default parameters
    */
-  ResourceImage( LoadPolicy loadPol = IMAGE_LOAD_POLICY_DEFAULT, ReleasePolicy releasePol = IMAGE_RELEASE_POLICY_DEFAULT );
+  ResourceImage();
 
 private:
 
   /**
-   * Helper method to determine if the filename indicates that the image has a 9 patch border.
-   * @param [in] url The URL of the image file.
-   * @return true if it is a 9 patch image
-   */
-  static bool IsNinePatch( const std::string& url );
-
-  /**
    * Helper method to set new resource ticket. Stops observing current ticket if any, and starts observing
    * the new one or just resets the intrusive pointer.
    * @param[in] ticket pointer to new resource Ticket or NULL.
@@ -186,8 +167,6 @@ private:
 
   Dali::ResourceImage::ResourceImageSignal mLoadingFinished;
 
-  LoadPolicy mLoadPolicy : 2;    ///< 2 bits is enough space
-
   // Changes scope, should be at end of class
   DALI_LOG_OBJECT_STRING_DECLARATION;
 };