From 39b3a00e718d2d50f4391d3b6dbc781966ce1a8a Mon Sep 17 00:00:00 2001
From: Wonsik Jung <sidein@samsung.com>
Date: Mon, 2 Dec 2019 15:56:13 +0900
Subject: [PATCH] Revert "[Tizen] Add AlphaMask to synchronousLoading"

This reverts commit 9f91b28b3807b652f1e7066ec126d74c0185d4ed.
---
 dali-toolkit/internal/visuals/image/image-visual.cpp   |  2 ++
 dali-toolkit/internal/visuals/texture-manager-impl.cpp | 12 +-----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/dali-toolkit/internal/visuals/image/image-visual.cpp b/dali-toolkit/internal/visuals/image/image-visual.cpp
index e339995..8607fa8 100644
--- a/dali-toolkit/internal/visuals/image/image-visual.cpp
+++ b/dali-toolkit/internal/visuals/image/image-visual.cpp
@@ -427,6 +427,8 @@ void ImageVisual::DoSetProperty( Property::Index index, const Property::Value& v
         AllocateMaskData();
         // Immediately trigger the alpha mask loading (it may just get a cached value)
         mMaskingData->mAlphaMaskUrl = alphaUrl;
+        TextureManager& textureManager = mFactoryCache.GetTextureManager();
+        mMaskingData->mAlphaMaskId = textureManager.RequestMaskLoad( alphaUrl );
       }
       break;
     }
diff --git a/dali-toolkit/internal/visuals/texture-manager-impl.cpp b/dali-toolkit/internal/visuals/texture-manager-impl.cpp
index 57384b3..6dcc2fc 100644
--- a/dali-toolkit/internal/visuals/texture-manager-impl.cpp
+++ b/dali-toolkit/internal/visuals/texture-manager-impl.cpp
@@ -182,15 +182,6 @@ TextureSet TextureManager::LoadTexture(
     {
       Devel::PixelBuffer pixelBuffer = LoadImageFromFile( url.GetUrl(), desiredSize, fittingMode, samplingMode,
                                        orientationCorrection  );
-      if( maskInfo )
-      {
-        Devel::PixelBuffer maskPixelBuffer = LoadImageFromFile( maskInfo->mAlphaMaskUrl.GetUrl(), ImageDimensions(),
-                                             FittingMode::SCALE_TO_FILL, SamplingMode::NO_FILTER, true  );
-        if( maskPixelBuffer )
-        {
-          pixelBuffer.ApplyMask( maskPixelBuffer, maskInfo->mContentScaleFactor, maskInfo->mCropToMask );
-        }
-      }
       if( pixelBuffer )
       {
         PreMultiply( pixelBuffer, preMultiplyOnLoad );
@@ -252,9 +243,8 @@ TextureSet TextureManager::LoadTexture(
       }
       else
       {
-        TextureId alphaMaskId = RequestMaskLoad( maskInfo->mAlphaMaskUrl );
         textureId = RequestLoad( url,
-                                 alphaMaskId,
+                                 maskInfo->mAlphaMaskId,
                                  maskInfo->mContentScaleFactor,
                                  desiredSize,
                                  fittingMode, samplingMode,
-- 
2.7.4