From 37e9d8db3f288d32f93cee6089edccdb10b34084 Mon Sep 17 00:00:00 2001 From: Paul Wisbey Date: Sun, 5 Feb 2017 20:06:26 +0000 Subject: [PATCH] Removed redundant resource loading code Change-Id: Ice00338bb47f044438809749f916425d393d6184 --- .../test-platform-abstraction.cpp | 179 --------------------- .../test-platform-abstraction.h | 139 +--------------- .../src/dali-toolkit/utc-Dali-SuperBlurView.cpp | 6 - .../src/dali-toolkit/utc-Dali-TextField.cpp | 6 - .../src/dali-toolkit/utc-Dali-VisualFactory.cpp | 20 +-- 5 files changed, 3 insertions(+), 347 deletions(-) diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp index 86b5430..b177e4a 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp @@ -25,10 +25,6 @@ namespace Dali TestPlatformAbstraction::TestPlatformAbstraction() : mTrace(), mIsLoadingResult( false ), - mGetDefaultFontSizeResult( 0 ), - mLoadedResourcesQueue(), - mFailedLoadQueue(), - mResourceRequests(), mSize(), mClosestSize(), mLoadFileResult(), @@ -40,17 +36,6 @@ TestPlatformAbstraction::TestPlatformAbstraction() TestPlatformAbstraction::~TestPlatformAbstraction() { - DiscardRequest(); -} - -void TestPlatformAbstraction::Suspend() -{ - mTrace.PushCall("Suspend", ""); -} - -void TestPlatformAbstraction::Resume() -{ - mTrace.PushCall("Resume", ""); } ImageDimensions TestPlatformAbstraction::GetClosestImageSize( const std::string& filename, @@ -75,16 +60,6 @@ ImageDimensions TestPlatformAbstraction::GetClosestImageSize( Integration::Resou return closestSize; } -void TestPlatformAbstraction::LoadResource(const Integration::ResourceRequest& request) -{ - std::ostringstream out; - out << "Type:" << request.GetType()->id << ", Path: " << request.GetPath() << std::endl ; - - mTrace.PushCall("LoadResource", out.str()); - - mResourceRequests.PushBack( new Integration::ResourceRequest(request) ); -} - Integration::ResourcePointer TestPlatformAbstraction::LoadResourceSynchronously( const Integration::ResourceType& resourceType, const std::string& resourcePath ) { mTrace.PushCall("LoadResourceSynchronously", ""); @@ -97,59 +72,6 @@ Integration::BitmapPtr TestPlatformAbstraction::DecodeBuffer( const Integration: return mDecodedBitmap; } -void TestPlatformAbstraction::CancelLoad(Integration::ResourceId id, Integration::ResourceTypeId typeId) -{ - mTrace.PushCall("CancelLoad", ""); -} - -void TestPlatformAbstraction::GetResources(Integration::ResourceCache& cache) -{ - mTrace.PushCall("GetResources", ""); - - while( !mLoadedResourcesQueue.empty() ) - { - LoadedResource loaded( *mLoadedResourcesQueue.begin() ); - mLoadedResourcesQueue.erase( mLoadedResourcesQueue.begin() ); - cache.LoadResponse( loaded.id, loaded.type, loaded.resource, Integration::RESOURCE_COMPLETELY_LOADED ); - } - - // iterate through the resources which failed to load - while( !mFailedLoadQueue.empty() ) - { - FailedLoad failed( *mFailedLoadQueue.begin() ); - mFailedLoadQueue.erase( mFailedLoadQueue.begin() ); - cache.LoadFailed( failed.id, failed.failure ); - } -} - -bool TestPlatformAbstraction::IsLoading() -{ - mTrace.PushCall("IsLoading", ""); - return mIsLoadingResult; -} - -int TestPlatformAbstraction::GetDefaultFontSize() const -{ - mTrace.PushCall("GetDefaultFontSize", ""); - return mGetDefaultFontSizeResult; -} - -void TestPlatformAbstraction::SetDpi (unsigned int dpiHorizontal, unsigned int dpiVertical) -{ - mTrace.PushCall("SetDpi", ""); -} - -bool TestPlatformAbstraction::LoadFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const -{ - mTrace.PushCall("LoadFile", ""); - if( mLoadFileResult.loadResult ) - { - buffer = mLoadFileResult.buffer; - } - - return mLoadFileResult.loadResult; -} - bool TestPlatformAbstraction::LoadShaderBinaryFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const { mTrace.PushCall("LoadShaderBinaryFile", ""); @@ -161,25 +83,12 @@ bool TestPlatformAbstraction::LoadShaderBinaryFile( const std::string& filename, return mLoadFileResult.loadResult; } -bool TestPlatformAbstraction::SaveFile(const std::string& filename, const unsigned char * buffer, unsigned int numBytes ) const -{ - mTrace.PushCall("SaveFile", ""); - return false; -} - -void TestPlatformAbstraction::JoinLoaderThreads() -{ - mTrace.PushCall("JoinLoaderThreads", ""); -} /** Call this every test */ void TestPlatformAbstraction::Initialize() { mTrace.Reset(); mTrace.Enable(true); - mLoadedResourcesQueue.clear(); - mFailedLoadQueue.clear(); - mResourceRequests.Clear(); mIsLoadingResult=false; mSynchronouslyLoadedResource.Reset(); mDecodedBitmap.Reset(); @@ -189,19 +98,9 @@ bool TestPlatformAbstraction::WasCalled(TestFuncEnum func) { switch(func) { - case SuspendFunc: return mTrace.FindMethod("Suspend"); - case ResumeFunc: return mTrace.FindMethod("Resume"); - case LoadResourceFunc: return mTrace.FindMethod("LoadResource"); case LoadResourceSynchronouslyFunc: return mTrace.FindMethod("LoadResourceSynchronously"); - case LoadFileFunc: return mTrace.FindMethod("LoadFile"); case LoadShaderBinaryFileFunc: return mTrace.FindMethod("LoadShaderBinaryFile"); case SaveShaderBinaryFileFunc: return mTrace.FindMethod("SaveShaderBinaryFile"); - case SaveFileFunc: return mTrace.FindMethod("SaveFile"); - case CancelLoadFunc: return mTrace.FindMethod("CancelLoad"); - case GetResourcesFunc: return mTrace.FindMethod("GetResources"); - case IsLoadingFunc: return mTrace.FindMethod("IsLoading"); - case SetDpiFunc: return mTrace.FindMethod("SetDpi"); - case JoinLoaderThreadsFunc: return mTrace.FindMethod("JoinLoaderThreads"); } return false; } @@ -213,88 +112,10 @@ void TestPlatformAbstraction::SetIsLoadingResult(bool result) void TestPlatformAbstraction::ClearReadyResources() { - mLoadedResourcesQueue.clear(); - mFailedLoadQueue.clear(); mSynchronouslyLoadedResource.Reset(); mDecodedBitmap.Reset(); } -void TestPlatformAbstraction::SetResourceLoaded(Integration::ResourceId loadedId, - Integration::ResourceTypeId loadedType, - Integration::ResourcePointer loadedResource) -{ - LoadedResource loadedInfo; - loadedInfo.id = loadedId; - loadedInfo.type = loadedType; - loadedInfo.resource = loadedResource; - mLoadedResourcesQueue.push_back( loadedInfo ); -} - -void TestPlatformAbstraction::SetResourceLoadFailed(Integration::ResourceId id, - Integration::ResourceFailure failure) -{ - FailedLoad failedInfo; - failedInfo.id = id; - failedInfo.failure = failure; - mFailedLoadQueue.push_back( failedInfo ); -} - -Integration::ResourceRequest* TestPlatformAbstraction::GetRequest() -{ - Integration::ResourceRequest* request = NULL; - - // Return last request - if( ! mResourceRequests.Empty() ) - { - request = *( mResourceRequests.End() - 1 ); - } - - return request; -} - -const TestPlatformAbstraction::ResourceRequestContainer& TestPlatformAbstraction::GetAllRequests() const -{ - return mResourceRequests; -} - -void TestPlatformAbstraction::SetAllResourceRequestsAsLoaded() -{ - for( ResourceRequestContainer::Iterator iter = mResourceRequests.Begin(), endIter = mResourceRequests.End(); - iter != endIter; ++iter ) - { - Integration::ResourceRequest* request = *iter; - Integration::Bitmap* bitmap = Integration::Bitmap::New( Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD ); - Integration::ResourcePointer resource(bitmap); - bitmap->GetPackedPixelsProfile()->ReserveBuffer(Pixel::RGBA8888, 80, 80, 80, 80); - SetResourceLoaded( request->GetId(), request->GetType()->id, resource ); - delete request; - } - mResourceRequests.Clear(); -} - -void TestPlatformAbstraction::SetAllResourceRequestsAsFailed( Integration::ResourceFailure failure ) -{ - for( ResourceRequestContainer::Iterator iter = mResourceRequests.Begin(), endIter = mResourceRequests.End(); - iter != endIter; ++iter ) - { - Integration::ResourceRequest* request = *iter; - SetResourceLoadFailed( (*iter)->GetId(), failure); - delete request; - } - mResourceRequests.Clear(); -} - -void TestPlatformAbstraction::DiscardRequest() -{ - for( ResourceRequestContainer::Iterator iter = mResourceRequests.Begin(), endIter = mResourceRequests.End(); - iter != endIter; ++iter ) - { - Integration::ResourceRequest* request = *iter; - delete request; - } - mResourceRequests.Clear(); -} - void TestPlatformAbstraction::SetClosestImageSize(const Vector2& size) { mClosestSize = size; 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 42e2d98..230ed02 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 @@ -40,8 +40,6 @@ class DALI_IMPORT_API TestPlatformAbstraction : public Dali::Integration::Platfo public: - typedef Vector< Integration::ResourceRequest* > ResourceRequestContainer; - /** * Constructor */ @@ -53,16 +51,6 @@ public: virtual ~TestPlatformAbstraction(); /** - * @copydoc PlatformAbstraction::Suspend() - */ - virtual void Suspend(); - - /** - * @copydoc PlatformAbstraction::Resume() - */ - virtual void Resume(); - - /** * @copydoc PlatformAbstraction::GetClosestImageSize() */ virtual ImageDimensions GetClosestImageSize( const std::string& filename, @@ -81,11 +69,6 @@ public: bool orientationCorrection ); /** - * @copydoc PlatformAbstraction::LoadResource() - */ - virtual void LoadResource(const Integration::ResourceRequest& request); - - /** * @copydoc PlatformAbstraction::LoadResourceSynchronously() */ virtual Integration::ResourcePointer LoadResourceSynchronously( const Integration::ResourceType& resourceType, const std::string& resourcePath ); @@ -96,70 +79,24 @@ public: virtual Integration::BitmapPtr DecodeBuffer( const Dali::Integration::ResourceType& resourceType, uint8_t * buffer, size_t size ); /** - * @copydoc PlatformAbstraction::CancelLoad() - */ - virtual void CancelLoad(Integration::ResourceId id, Integration::ResourceTypeId typeId); - - /** - * @copydoc PlatformAbstraction::GetResources() - */ - virtual void GetResources(Integration::ResourceCache& cache); - - /** - * @copydoc PlatformAbstraction::IsLoading() - */ - virtual bool IsLoading(); - - /** - * @copydoc PlatformAbstraction::GetDefaultFontSize() - */ - virtual int GetDefaultFontSize() const; - - /** - * @copydoc PlatformAbstraction::SetDpi() - */ - virtual void SetDpi (unsigned int dpiHorizontal, unsigned int dpiVertical); - - /** - * @copydoc PlatformAbstraction::LoadFile() - */ - virtual bool LoadFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const; - - /** * @copydoc PlatformAbstraction::LoadShaderBinaryFile() */ virtual bool LoadShaderBinaryFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const; /** - * @copydoc PlatformAbstraction::SaveFile() + * @copydoc PlatformAbstraction::SaveShaderBinaryFile() */ - virtual bool SaveFile(const std::string& filename, const unsigned char * buffer, unsigned int numBytes ) const; - - /** - * @copydoc PlatformAbstraction::SaveShaderBinaryFile() - */ virtual bool SaveShaderBinaryFile( const std::string& filename, const unsigned char * buffer, unsigned int numBytes ) const { return true; } - virtual void JoinLoaderThreads(); public: // TEST FUNCTIONS // Enumeration of Platform Abstraction methods typedef enum { - SuspendFunc, - ResumeFunc, - LoadResourceFunc, LoadResourceSynchronouslyFunc, - SaveFileFunc, - LoadFileFunc, LoadShaderBinaryFileFunc, - SaveShaderBinaryFileFunc, - CancelLoadFunc, - GetResourcesFunc, - IsLoadingFunc, - SetDpiFunc, - JoinLoaderThreadsFunc, + SaveShaderBinaryFileFunc } TestFuncEnum; /** Call this every test */ @@ -183,63 +120,11 @@ public: // TEST FUNCTIONS void SetIsLoadingResult(bool result); /** - * @brief Sets the value returned by GetDefaultFontSize - * @param[in] result The value to return - */ - void SetGetDefaultFontSizeResult(float result); - - /** * @brief Clears all resource queues */ void ClearReadyResources(); /** - * @brief Sets a particular resource request as loaded. - * @param[in] loadedId The ResourceID of the resource that has been loaded. - * @param[in] loadedType The type of resource that has been loaded. - * @param[in] loadedResource A pointer to the resource that has been loaded. - */ - void SetResourceLoaded(Integration::ResourceId loadedId, - Integration::ResourceTypeId loadedType, - Integration::ResourcePointer loadedResource); - - /** - * @brief Sets a particular resource request as load failure. - * @param[in] id The ID of the failed resource request. - * @param[in] failure The type of failure. - */ - void SetResourceLoadFailed(Integration::ResourceId id, - Integration::ResourceFailure failure); - - /** - * @brief Retrieves the latest resource request - * @return A pointer to the latest resource request. - */ - Integration::ResourceRequest* GetRequest(); - - /** - * @brief Retrieves a reference to a container of all the resource requests. - * @return A reference to a container of all the resource requests. - */ - const ResourceRequestContainer& GetAllRequests() const; - - /** - * @brief Sets all resource requests as loaded. - */ - void SetAllResourceRequestsAsLoaded(); - - /** - * @brief Sets all resource requests as loaded. - * @param[in] failure The failure type - */ - void SetAllResourceRequestsAsFailed( Integration::ResourceFailure failure ); - - /** - * @brief Discards all current resource requests. - */ - void DiscardRequest(); - - /** * @brief Sets the value returned by GetClosestImageSize. * @param[in] size The size that should be returned. */ @@ -277,19 +162,6 @@ private: private: - struct LoadedResource - { - Integration::ResourceId id; - Integration::ResourceTypeId type; - Integration::ResourcePointer resource; - }; - - struct FailedLoad - { - Integration::ResourceId id; - Integration::ResourceFailure failure; - }; - struct LoadFileResult { inline LoadFileResult() @@ -302,15 +174,8 @@ private: Dali::Vector< unsigned char> buffer; }; - typedef std::vector< LoadedResource > LoadedResourceContainer; - typedef std::vector< FailedLoad > FailedLoadContainer; - mutable TraceCallStack mTrace; bool mIsLoadingResult; - int mGetDefaultFontSizeResult; - LoadedResourceContainer mLoadedResourcesQueue; - FailedLoadContainer mFailedLoadQueue; - ResourceRequestContainer mResourceRequests; Vector2 mSize; Vector2 mClosestSize; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-SuperBlurView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-SuperBlurView.cpp index 20d5f44..2967639 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-SuperBlurView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-SuperBlurView.cpp @@ -102,15 +102,9 @@ Image CreateSolidColorImage( ToolkitTestApplication& application, const Vector4& void LoadBitmapResource(TestPlatformAbstraction& platform, int width, int height) { - Integration::ResourceRequest* request = platform.GetRequest(); Integration::Bitmap* bitmap = Integration::Bitmap::New( Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD ); Integration::ResourcePointer resource(bitmap); bitmap->GetPackedPixelsProfile()->ReserveBuffer(Pixel::RGBA8888, width, height, width, height); - - if(request) - { - platform.SetResourceLoaded(request->GetId(), request->GetType()->id, resource); - } } class SignalHandler : public Dali::ConnectionTracker diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp index ced9421..aee824b 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp @@ -118,15 +118,9 @@ static Dali::Toolkit::TextField::InputStyle::Mask gInputStyleMask; static void LoadBitmapResource(TestPlatformAbstraction& platform, int width, int height) { - Integration::ResourceRequest* request = platform.GetRequest(); Integration::Bitmap* bitmap = Integration::Bitmap::New( Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD ); Integration::ResourcePointer resource(bitmap); bitmap->GetPackedPixelsProfile()->ReserveBuffer(Pixel::RGBA8888, width, height, width, height); - - if(request) - { - platform.SetResourceLoaded(request->GetId(), request->GetType()->id, resource); - } } static void LoadMarkerImages(ToolkitTestApplication& app, TextField textField) diff --git a/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp b/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp index ab0f0cd..4ad689f 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp @@ -223,22 +223,12 @@ void TestVisualRender( ToolkitTestApplication& application, application.SendNotification(); application.Render(); - if( resourcePtr ) - { - Integration::ResourceRequest* request = application.GetPlatform().GetRequest(); - if(request) - { - application.GetPlatform().SetResourceLoaded(request->GetId(), request->GetType()->id, resourcePtr ); - } - } - application.Render(); application.SendNotification(); if( resourcePtr ) { - DALI_TEST_EQUALS( application.GetPlatform().WasCalled(TestPlatformAbstraction::LoadResourceFunc) || - application.GetPlatform().WasCalled(TestPlatformAbstraction::LoadResourceSynchronouslyFunc ), true, TEST_LOCATION); + DALI_TEST_EQUALS( application.GetPlatform().WasCalled(TestPlatformAbstraction::LoadResourceSynchronouslyFunc ), true, TEST_LOCATION); } DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION ); @@ -1234,10 +1224,6 @@ void MeshVisualLoadsCorrectlyTest( Property::Map& propertyMap, ToolkitTestApplic application.SendNotification(); application.Render( 0 ); - //Tell the platform abstraction that the required resources have been loaded. - TestPlatformAbstraction& platform = application.GetPlatform(); - platform.SetAllResourceRequestsAsLoaded(); - //Render again to upload the now-loaded textures. application.SendNotification(); application.Render( 0 ); @@ -1281,10 +1267,6 @@ void MeshVisualDoesNotLoadCorrectlyTest( Property::Map& propertyMap, ToolkitTest application.SendNotification(); application.Render( 0 ); - //Tell the platform abstraction that the required resources have been loaded. - TestPlatformAbstraction& platform = application.GetPlatform(); - platform.SetAllResourceRequestsAsLoaded(); - //Render again to upload the now-loaded textures. application.SendNotification(); application.Render( 0 ); -- 2.7.4