projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed Resource Saving
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
test-platform-abstraction.h
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h
index
c3beebe
..
cd6bf85
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h
@@
-24,7
+24,7
@@
#include <dali/public-api/images/image-operations.h>
// INTERNAL INCLUDES
#include <dali/public-api/images/image-operations.h>
// INTERNAL INCLUDES
-#include <dali/
public
-api/common/set-wrapper.h>
+#include <dali/
devel
-api/common/set-wrapper.h>
#include <dali/integration-api/platform-abstraction.h>
#include "test-trace-call-stack.h"
#include <dali/integration-api/platform-abstraction.h>
#include "test-trace-call-stack.h"
@@
-51,14
+51,6
@@
public:
bool loadFailed;
Integration::ResourceId loadFailedId;
Integration::ResourceFailure loadFailure;
bool loadFailed;
Integration::ResourceId loadFailedId;
Integration::ResourceFailure loadFailure;
-
- bool saved;
- Integration::ResourceId savedId;
- Integration::ResourceTypeId savedType;
-
- bool saveFailed;
- Integration::ResourceId saveFailedId;
- Integration::ResourceFailure saveFailure;
};
struct LoadFileResult
};
struct LoadFileResult
@@
-70,7
+62,7
@@
public:
}
bool loadResult;
}
bool loadResult;
-
std::v
ector< unsigned char> buffer;
+
Dali::V
ector< unsigned char> buffer;
};
/**
};
/**
@@
-103,7
+95,7
@@
public:
*/
virtual ImageDimensions GetClosestImageSize( const std::string& filename,
ImageDimensions size,
*/
virtual ImageDimensions GetClosestImageSize( const std::string& filename,
ImageDimensions size,
- FittingMode::Type
scal
ingMode,
+ FittingMode::Type
fitt
ingMode,
SamplingMode::Type samplingMode,
bool orientationCorrection );
SamplingMode::Type samplingMode,
bool orientationCorrection );
@@
-112,7
+104,7
@@
public:
*/
virtual ImageDimensions GetClosestImageSize( Integration::ResourcePointer resourceBuffer,
ImageDimensions size,
*/
virtual ImageDimensions GetClosestImageSize( Integration::ResourcePointer resourceBuffer,
ImageDimensions size,
- FittingMode::Type
scal
ingMode,
+ FittingMode::Type
fitt
ingMode,
SamplingMode::Type samplingMode,
bool orientationCorrection );
SamplingMode::Type samplingMode,
bool orientationCorrection );
@@
-127,11
+119,6
@@
public:
virtual Integration::ResourcePointer LoadResourceSynchronously( const Integration::ResourceType& resourceType, const std::string& resourcePath );
/**
virtual Integration::ResourcePointer LoadResourceSynchronously( const Integration::ResourceType& resourceType, const std::string& resourcePath );
/**
- * @copydoc PlatformAbstraction::SaveResource()
- */
- virtual void SaveResource(const Integration::ResourceRequest& request);
-
- /**
* @copydoc PlatformAbstraction::CancelLoad()
*/
virtual void CancelLoad(Integration::ResourceId id, Integration::ResourceTypeId typeId);
* @copydoc PlatformAbstraction::CancelLoad()
*/
virtual void CancelLoad(Integration::ResourceId id, Integration::ResourceTypeId typeId);
@@
-160,25
+147,27
@@
public:
* @copydoc PlatformAbstraction::SetDpi()
*/
virtual void SetDpi (unsigned int dpiHorizontal, unsigned int dpiVertical);
* @copydoc PlatformAbstraction::SetDpi()
*/
virtual void SetDpi (unsigned int dpiHorizontal, unsigned int dpiVertical);
+
/**
* @copydoc PlatformAbstraction::LoadFile()
*/
/**
* @copydoc PlatformAbstraction::LoadFile()
*/
- virtual bool LoadFile( const std::string& filename,
std::v
ector< unsigned char >& buffer ) const;
+ virtual bool LoadFile( const std::string& filename,
Dali::V
ector< unsigned char >& buffer ) const;
/**
/**
- * @copydoc PlatformAbstraction::LoadShaderBinFile()
+ * @copydoc PlatformAbstraction::LoadShaderBin
ary
File()
*/
*/
- virtual bool LoadShaderBinFile( const std::string& filename, std::vector< unsigned char >& buffer ) const;
+ virtual bool LoadShaderBinaryFile( const std::string& filename, Dali::Vector< unsigned char >& buffer
+) const;
+
+ virtual bool SaveShaderBinaryFile( const std::string& filename, const unsigned char * buffer, unsigned int numBytes ) const { return true; }
/**
* @copydoc PlatformAbstraction::SaveFile()
*/
/**
* @copydoc PlatformAbstraction::SaveFile()
*/
- virtual bool SaveFile(const std::string& filename,
std::vector< unsigned char >& buffer
) const;
+ virtual bool SaveFile(const std::string& filename,
const unsigned char * buffer, unsigned int numBytes
) const;
virtual void JoinLoaderThreads();
virtual void JoinLoaderThreads();
- virtual Integration::DynamicsFactory* GetDynamicsFactory();
-
public: // TEST FUNCTIONS
// Enumeration of Platform Abstraction methods
public: // TEST FUNCTIONS
// Enumeration of Platform Abstraction methods
@@
-188,16
+177,15
@@
public: // TEST FUNCTIONS
SuspendFunc,
ResumeFunc,
LoadResourceFunc,
SuspendFunc,
ResumeFunc,
LoadResourceFunc,
- SaveResourceFunc,
SaveFileFunc,
LoadFileFunc,
SaveFileFunc,
LoadFileFunc,
- LoadShaderBinFileFunc,
+ LoadShaderBinaryFileFunc,
+ SaveShaderBinaryFileFunc,
CancelLoadFunc,
GetResourcesFunc,
IsLoadingFunc,
SetDpiFunc,
CancelLoadFunc,
GetResourcesFunc,
IsLoadingFunc,
SetDpiFunc,
- JoinLoaderThreadsFunc,
- GetDynamicsFactoryFunc,
+ JoinLoaderThreadsFunc
} TestFuncEnum;
/** Call this every test */
} TestFuncEnum;
/** Call this every test */
@@
-230,19
+218,13
@@
public: // TEST FUNCTIONS
void SetResourceLoadFailed(Integration::ResourceId id,
Integration::ResourceFailure failure);
void SetResourceLoadFailed(Integration::ResourceId id,
Integration::ResourceFailure failure);
- void SetResourceSaved(Integration::ResourceId savedId,
- Integration::ResourceTypeId savedType);
-
- void SetResourceSaveFailed(Integration::ResourceId id,
- Integration::ResourceFailure failure);
-
Integration::ResourceRequest* GetRequest();
void DiscardRequest();
void SetClosestImageSize(const Vector2& size);
Integration::ResourceRequest* GetRequest();
void DiscardRequest();
void SetClosestImageSize(const Vector2& size);
- void SetLoadFileResult( bool result,
std::v
ector< unsigned char >& buffer );
+ void SetLoadFileResult( bool result,
Dali::V
ector< unsigned char >& buffer );
void SetSaveFileResult( bool result );
void SetSaveFileResult( bool result );