X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftest-platform-abstraction.h;h=dfa4d6c035ad77c9a01721906ed9682510b8b391;hp=230ed0227bbbb7a74d7416a6bd6e8206e6ac591d;hb=908670e8d7b3447b5201a7f9118cca881cf0a41e;hpb=dfebb1e3da197e21bd7f4424ab65884b98f42fea 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 230ed02..dfa4d6c 100644 --- 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 @@ -2,7 +2,7 @@ #define __DALI_TEST_PLATFORM_ABSTRACTION_H__ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 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. @@ -26,6 +26,7 @@ // INTERNAL INCLUDES #include +#include #include "test-trace-call-stack.h" @@ -35,7 +36,7 @@ namespace Dali /** * Concrete implementation of the platform abstraction class. */ -class DALI_IMPORT_API TestPlatformAbstraction : public Dali::Integration::PlatformAbstraction +class DALI_CORE_API TestPlatformAbstraction : public Dali::Integration::PlatformAbstraction { public: @@ -71,12 +72,12 @@ public: /** * @copydoc PlatformAbstraction::LoadResourceSynchronously() */ - virtual Integration::ResourcePointer LoadResourceSynchronously( const Integration::ResourceType& resourceType, const std::string& resourcePath ); + virtual Integration::ResourcePointer LoadImageSynchronously( const Integration::BitmapResourceType& resourceType, const std::string& resourcePath ); /** * @copydoc PlatformAbstraction::DecodeBuffer() */ - virtual Integration::BitmapPtr DecodeBuffer( const Dali::Integration::ResourceType& resourceType, uint8_t * buffer, size_t size ); + virtual Integration::BitmapPtr DecodeBuffer( const Dali::Integration::BitmapResourceType& resourceType, uint8_t * buffer, size_t size ); /** * @copydoc PlatformAbstraction::LoadShaderBinaryFile() @@ -128,7 +129,7 @@ public: // TEST FUNCTIONS * @brief Sets the value returned by GetClosestImageSize. * @param[in] size The size that should be returned. */ - void SetClosestImageSize(const Vector2& size); + void SetClosestImageSize( const Vector2& size ); /** * @brief Sets the result return by LoadFile. @@ -176,8 +177,7 @@ private: mutable TraceCallStack mTrace; bool mIsLoadingResult; - Vector2 mSize; - Vector2 mClosestSize; + ImageDimensions mClosestSize; LoadFileResult mLoadFileResult; bool mSaveFileResult; @@ -188,4 +188,4 @@ private: } // Dali -#endif /* __DALI_TET_PLATFORM_ABSTRACTION_H__ */ +#endif /* __DALI_TEST_PLATFORM_ABSTRACTION_H__ */