X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit-internal%2Futc-Dali-TextureManager.cpp;h=d27948240e368a06924b50cf5ab8c8f42b3caf92;hb=0a6dd76f25ef1121d3801a99d9b32084c8a48744;hp=1553f97b03f2895e8f1c805fd6b76283fa43b23e;hpb=12fc433eba468fe62254c4ebfb04d57697632077;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-TextureManager.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-TextureManager.cpp index 1553f97..d279482 100644 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-TextureManager.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-TextureManager.cpp @@ -76,20 +76,19 @@ public: { } - virtual void UploadComplete( bool loadSuccess, int32_t textureId, TextureSet textureSet, - bool useAtlasing, const Vector4& atlasRect, bool preMultiplied ) override + virtual void LoadComplete( bool loadSuccess, TextureInformation textureInformation ) override { - mCompleteType = CompleteType::UPLOAD_COMPLETE; - mLoaded = loadSuccess; - mObserverCalled = true; - mTextureSet = textureSet; - } - - virtual void LoadComplete( bool loadSuccess, Devel::PixelBuffer pixelBuffer, const VisualUrl& url, bool preMultiplied ) override - { - mCompleteType = CompleteType::LOAD_COMPLETE; + if(textureInformation.returnType == TextureUploadObserver::ReturnType::TEXTURE) + { + mCompleteType = CompleteType::UPLOAD_COMPLETE; + } + else + { + mCompleteType = CompleteType::LOAD_COMPLETE; + } mLoaded = loadSuccess; mObserverCalled = true; + mTextureSet = textureInformation.textureSet; } CompleteType mCompleteType;