VisualElement source code cleanup

Change-Id: I778bd8d7bd365675cff4da7770cfd93fbacbfff9
Signed-off-by: Bongjoo Seo <bongjoo.seo@samsung.com>

diff --git a/src/ui/animations/FUiAnim_DisplayManager.cpp b/src/ui/animations/FUiAnim_DisplayManager.cpp
index c5c20ec..b0fde87 100644 (file)
--- a/src/ui/animations/FUiAnim_DisplayManager.cpp
+++ b/src/ui/animations/FUiAnim_DisplayManager.cpp
@@ -274,11 +274,7 @@ _DisplayManager::PostRender(_RootVisualElement& root)
        {
                _VisualElementImpl* pRootPresentationImpl = _VisualElementImpl::GetInstance(*pPresentationRoot);
 
-#ifdef OLD
-               if (likely((pRootPresentationImpl->__childrenNeedsUpdateProps & ~_VisualElementImpl::HIERARCHY_PROPERTY_CONTENT) != 0) ||
-#else
                if (likely(pRootPresentationImpl->__childrenNeedsUpdateProps) ||
-#endif
                        likely(pRootPresentationImpl->__pSharedData->NeedNativeReconfigure()) ||
                        unlikely(root.GetNeedsContentUpdate()) ||
                        unlikely(pPresentationRoot->GetNeedsContentUpdate()))

diff --git a/src/ui/animations/FUiAnim_VisualElementImpl.cpp b/src/ui/animations/FUiAnim_VisualElementImpl.cpp
index df5320c..68b14ff 100644 (file)
--- a/src/ui/animations/FUiAnim_VisualElementImpl.cpp
+++ b/src/ui/animations/FUiAnim_VisualElementImpl.cpp
@@ -195,13 +195,8 @@ _VisualElementImpl::_VisualElementImpl(VisualElement& element)
        , __decomposedTransform()
        , __childrenTransform()
        , __decomposedChildrenTransform()
-#ifdef OLD
-       , __childrenNeedsUpdateProps(HIERARCHY_PROPERTY_MASK & ~HIERARCHY_PROPERTY_CONTENT)
-       , __invalidatedProps(HIERARCHY_PROPERTY_MASK& ~HIERARCHY_PROPERTY_CONTENT)
-#else
        , __childrenNeedsUpdateProps(HIERARCHY_PROPERTY_MASK)
        , __invalidatedProps(HIERARCHY_PROPERTY_MASK)
-#endif
        , __matrixFromTopValid(false)
        , __matrixFromTopInvertible(true)
        , __matrixToSuperValid(false)
@@ -258,13 +253,8 @@ _VisualElementImpl::_VisualElementImpl(VisualElement& presentation, _VisualEleme
        , __decomposedTransform(modelImpl.__decomposedTransform)
        , __childrenTransform(modelImpl.__childrenTransform)
        , __decomposedChildrenTransform(modelImpl.__decomposedChildrenTransform)
-#ifdef OLD
-       , __childrenNeedsUpdateProps(HIERARCHY_PROPERTY_MASK & ~HIERARCHY_PROPERTY_CONTENT)
-       , __invalidatedProps(HIERARCHY_PROPERTY_MASK & ~HIERARCHY_PROPERTY_CONTENT)
-#else
        , __childrenNeedsUpdateProps(HIERARCHY_PROPERTY_MASK)
        , __invalidatedProps(HIERARCHY_PROPERTY_MASK)
-#endif
        , __matrixFromTopValid(false)
        , __matrixFromTopInvertible(true)
        , __matrixToSuperValid(false)
@@ -294,14 +284,7 @@ _VisualElementImpl::_VisualElementImpl(VisualElement& presentation, _VisualEleme
 {
        ClearLastResult();
 
-       //GetSharedData().AddRef();
-
        __children.Construct();
-
-       //GetSharedData().invalidatedNativeProps = HIERARCHY_PROPERTY_MASK;
-
-       // for MODEL object
-       //modelImpl.__pPresentation = this;
 }
 
 _VisualElementImpl::~_VisualElementImpl(void)
@@ -321,13 +304,6 @@ _VisualElementImpl::~_VisualElementImpl(void)
        {
                __pDestroyedCallback(__pDestroyedCallbackData);
        }
-
-
-       // Remove property observer finally
-//     if (IsPropertyChangeEventListenerAdded())
-//     {
-//             RemovePropertyChangeEventListener(_VisualElementModelObserver::GetInstance());
-//     }
 }
 
 void
@@ -1021,9 +997,6 @@ _VisualElementImpl::SetSurfaceChanged(void)
                                pElement->GetSharedData().childrenSurfaceChanged = true;
                                pElement = pElement->__pParent;
                        }
-#ifdef OLD
-                       __pPresentation->InvalidateHierarchyProps(HIERARCHY_PROPERTY_SURFACE, false, false);
-#endif
                }
        }
        else
@@ -1034,9 +1007,6 @@ _VisualElementImpl::SetSurfaceChanged(void)
                        pElement->GetSharedData().childrenSurfaceChanged = true;
                        pElement = pElement->__pParent;
                }
-#ifdef OLD
-               InvalidateHierarchyProps(HIERARCHY_PROPERTY_SURFACE, false, false);
-#endif
        }
 }
 
@@ -1079,14 +1049,10 @@ result
 _VisualElementImpl::SetContentBounds(const FloatRectangle& contentBounds)
 {
        SysTryReturnResult(NID_UI_ANIM, IS_MODEL(this), E_INVALID_OPERATION, "VisualElement is not Model object.");
-#if 0
-       return SetContentBoundsI(contentBounds);
-#else
        result r = InvokeOnSetPropertyRequested(*pVePropContentBounds, Variant(contentBounds));
        SysTryLog(NID_UI_ANIM, r == E_SUCCESS, "[%s] Propagating.", GetErrorMessage(r));
 
        return r;
-#endif
 }
 
 FloatRectangle
@@ -1119,16 +1085,7 @@ _VisualElementImpl::GetImplicitAnimationEnabled(void) const
 {
        ClearLastResult();
 
-       // TBD: forward using property or direct return ?
-#if 0
-       bool isImplicitAnimationEnabled = InvokeOnGetPropertyRequested(*pVePropImplicitAnimationEnabled).ToBool();
-       if (GetLastResult() != E_SUCCESS)
-               return false;
-
-       return isImplicitAnimationEnabled;
-#else
        return __isImplicitAnimationEnabled;
-#endif
 }
 
 result
@@ -1180,18 +1137,7 @@ _VisualElementImpl::GetBounds(void) const
 {
        ClearLastResult();
 
-       // TBD: forward using property or direct return ?
-#if 0
-       FloatRectangle bounds = InvokeOnGetPropertyRequested(*pVePropBounds).ToFloatRectangle();
-       if (GetLastResult() != E_SUCCESS)
-       {
-               return FloatRectangle();
-       }
-
-       return bounds;
-#else
        return __bounds;
-#endif
 }
 
 result
@@ -1275,9 +1221,6 @@ _VisualElementImpl::SetBoundsI(const FloatRectangle& bounds)
                if (unlikely(!NEED_SURFACE(this)))
                        InvalidateVisibleRectToRenderTarget(null);
 
-       //      if (sizeChanged)
-       //              SysLog(NID_UI_ANIM, "size changing to " VELOGRECTTAG, VELOGRECT(boundsAdjusted));
-
                __bounds.x = boundsAdjusted.Left();
                __bounds.y = boundsAdjusted.Top();
                __bounds.width = newWidth;
@@ -1404,18 +1347,7 @@ _VisualElementImpl::GetZPosition(void) const
 {
        ClearLastResult();
 
-       // TBD: forward using property or direct return ?
-#if 0
-       float zPosition = (const_cast< _VisualElementImpl* >(this))->InvokeOnGetPropertyRequested(*pVePropZPosition).ToFloat();
-       if (GetLastResult() != E_SUCCESS)
-       {
-               return 0.0f;
-       }
-
-       return zPosition;
-#else
        return __zPosition;
-#endif
 }
 
 result
@@ -1552,63 +1484,12 @@ _VisualElementImpl::IsVisible(void) const
        return IsVisibleI();
 }
 
-#if 0
-bool
-_VisualElementImpl::IsVisibleI(void) const
-{
-#if 0
-       const _VisualElementImpl* pElement = this;
-       const _VisualElementImpl* pRoot = GetRoot();
-
-       if (unlikely(!pRoot))
-               return false;
-
-       while (pElement)
-       {
-               if (!VE_VISIBLE(pElement))
-               {
-                       return false;
-               }
-
-#if 0
-               if (!pElement->__pParent)
-               {
-                       if (dynamic_cast< const _RootVisualElement* >(pElement) == null)
-                       {
-                               return false;
-                       }
-               }
-#else
-               if (!pElement->__pParent && pElement != pRoot)
-                       return false;
-#endif
-
-               pElement = pElement->__pParent;
-       }
-
-       return true;
-#else
-       if (unlikely(IsPropsInvalidated(HIERARCHY_PROPERTY_COORDINATES)))
-       {
-               const_cast< _VisualElementImpl* >(this)->RebuildCoordinates();
-       }
-
-       return __isVisible;
-#endif
-}
-#endif
-
 bool
 _VisualElementImpl::GetShowState(void) const
 {
        ClearLastResult();
 
-       // TBD: forward using property or direct return ?
-#if 0
-       return InvokeOnGetPropertyRequested(*pVePropShowState).ToBool();
-#else
        return VE_VISIBLE(this);
-#endif
 }
 
 result
@@ -1810,12 +1691,7 @@ _VisualElementImpl::GetContentOpacity(void) const
 {
        ClearLastResult();
 
-       // TBD: forward using property or direct return ?
-#if 0
-       return InvokeOnGetPropertyRequested(*pVePropContentOpacity).ToFloat();
-#else
        return __contentOpacity;
-#endif
 }
 
 result
@@ -1895,12 +1771,7 @@ _VisualElementImpl::GetOpacity(void) const
 {
        ClearLastResult();
 
-       // TBD: forward using property or direct return ?
-#if 0
-       return InvokeOnGetPropertyRequested(*pVePropOpacity).ToFloat();
-#else
        return __opacity;
-#endif
 }
 
 result
@@ -1976,12 +1847,7 @@ _VisualElementImpl::GetAnchor(void) const
 {
        ClearLastResult();
 
-       // TBD: forward using property or direct return ?
-#if 0
-       return InvokeOnGetPropertyRequested(*pVePropAnchor).ToFloatPoint();
-#else
        return __anchor;
-#endif
 }
 
 result
@@ -2057,12 +1923,7 @@ _VisualElementImpl::GetAnchorZ(void) const
 {
        ClearLastResult();
 
-       // TBD: forward using property or direct return ?
-#if 0
-       return InvokeOnGetPropertyRequested(*pVePropAnchorZ).ToFloat();
-#else
        return __anchorZ;
-#endif
 }
 
 result
@@ -2138,12 +1999,7 @@ _VisualElementImpl::GetTransformMatrix(void) const
 {
        ClearLastResult();
 
-       // TBD: forward using property or direct return ?
-#if 0
-       return InvokeOnGetPropertyRequested(*pVePropTransform).ToFloatMatrix4();
-#else
        return __transform;
-#endif
 }
 
 result
@@ -2820,12 +2676,7 @@ _VisualElementImpl::GetChildrenTransformMatrix(void) const
 {
        ClearLastResult();
 
-       // TBD: forward using property or direct return ?
-#if 0
-       return InvokeOnGetPropertyRequested(*pVePropChildrenTransform).ToFloatMatrix4();
-#else
        return __childrenTransform;
-#endif
 }
 
 
@@ -3501,12 +3352,7 @@ _VisualElementImpl::IsClipToParent(void) const
 {
        ClearLastResult();
 
-       // TBD: forward using property or direct return ?
-#if 0
-       return InvokeOnGetPropertyRequested(*pVePropClipToParent).ToBool();
-#else
        return false;
-#endif
 }
 
 // TBD: clipToParent is not animatable, right??
@@ -3601,12 +3447,7 @@ _VisualElementImpl::IsSurfaceOpaque(void) const
 {
        ClearLastResult();
 
-       // TBD: forward using property or direct return ?
-#if 0
-       return InvokeOnGetPropertyRequested(*pVePropSurfaceOpaque).ToBool();
-#else
        return GetSharedData().isSurfaceOpaque;
-#endif
 }
 
 result
@@ -4530,11 +4371,7 @@ _VisualElementImpl::GetName(void) const
 {
        ClearLastResult();
 
-#if 0
-       return InvokeOnGetPropertyRequested(*pVePropName).ToString();
-#else
        return GetSharedData().name;
-#endif
 }
 
 result
@@ -4669,13 +4506,6 @@ _VisualElementImpl::GetDrawableRect(void) const
        // WARNING:
        //      Even when surface exists, the size might be invalidated by changing bounds.
        //
-#if 0
-       RebuildHierarchyProps(HIERARCHY_PROPERTY_MASK & (~HIERARCHY_PROPERTY_CONTENT), true);
-       if (!HAVE_SURFACE(this))
-       {
-               return __visibleRect;
-       }
-#endif
        if (HAVE_SURFACE(this) && GetSharedData().fixedSurfaceSize)
        {
                return FloatRectangle(0.0f, 0.0f, GetSharedData().pSurface->GetSizeF().width, GetSharedData().pSurface->GetSizeF().height);
@@ -4715,51 +4545,9 @@ _VisualElementImpl::GetBoundingBoxI(void) const
 
        if (unlikely(!__boundingBoxValid))
        {
-#if 0
-               float x[4] = { 0.0f, __bounds.width, 0.0f, __bounds.width };
-               float y[4] = { 0.0f, 0.0f, __bounds.height, __bounds.height };
-               float z[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
-
-               for (int i = 0; i < 4; i++)
-               {
-                       _MatrixUtilTransform(GetMatrixToTop(), &x[i], &y[i], &z[i]);
-               }
-
-               pThis->__boundingBox.SetBounds(x[0], y[0], x[0], y[0]);
-
-               float l = x[0];
-               float r = x[0];
-               float t = y[0];
-               float b = y[0];
-               for (int i = 1; i < 4; i++)
-               {
-                       if (x[i] < l)
-                       {
-                               l = x[i];
-                       }
-
-                       if (y[i] < t)
-                       {
-                               t = y[i];
-                       }
-
-                       if (x[i] > r)
-                       {
-                               r = x[i];
-                       }
-
-                       if (y[i] > b)
-                       {
-                               b = y[i];
-                       }
-               }
-
-               pThis->__boundingBox.SetBounds(l, t, r - l, b - t);
-#else
                float x[4] = { 0.0f, __bounds.width, 0.0f, __bounds.width };
                float y[4] = { 0.0f, 0.0f, __bounds.height, __bounds.height };
                CalculateBoundingBox(x, y, pThis->__boundingBox);
-#endif
 
                pThis->__boundingBoxValid = true;
        }
@@ -5221,13 +5009,6 @@ _VisualElementImpl::RebuildHierarchyProps(int props, bool checkSurface, bool rec
                return;
        }
 
-#ifdef OLD
-       if (unlikely(props & HIERARCHY_PROPERTY_SURFACE) && unlikely(IsPropsInvalidated(HIERARCHY_PROPERTY_SURFACE)))
-       {
-               SetPropsValidaty(HIERARCHY_PROPERTY_SURFACE, 0);
-       }
-#endif
-
        if (likely(props & HIERARCHY_PROPERTY_CONTENTBOUNDS) && likely(IsPropsInvalidated(HIERARCHY_PROPERTY_CONTENTBOUNDS)))
        {
                SetPropsValidaty(HIERARCHY_PROPERTY_CONTENTBOUNDS, 0);
@@ -5281,11 +5062,7 @@ _VisualElementImpl::UpdateHierarchyProps(void)
 {
        // WARNING:
        //      HIERARCHY_PROPERTY_CONTENT is not handled here, but in drawing logic.
-#ifdef OLD
-       const int mask = HIERARCHY_PROPERTY_MASK & (~HIERARCHY_PROPERTY_CONTENT);
-#else
        const int mask = HIERARCHY_PROPERTY_MASK;
-#endif
 
        if (unlikely((__childrenNeedsUpdateProps & mask) == 0 && GetSharedData().childrenSurfaceChanged == false))
                return;
@@ -5318,12 +5095,6 @@ _VisualElementImpl::ExposeRectangle(const FloatRectangle* pDirtyRectangle, bool
        {
                InvalidateRectangleI(pDirtyRectangle);
        }
-#if 0   // exposing object without content changes is not needed for EFL
-       else
-       {
-               SetFlushNeeded();
-       }
-#endif
 }
 
 result
@@ -5371,9 +5142,6 @@ _VisualElementImpl::Flush(void)
 result
 _VisualElementImpl::InvalidateRectangle(const FloatRectangle* pRectangle)
 {
-//!!! don't have to check attached state
-//     SysTryReturnResult(NID_UI_ANIM, IS_ATTACHED(this), E_INVALID_STATE, "Invalidating VisualElement should be attached to the root tree.");
-
        return InvalidateRectangleI(pRectangle);
 }
 
@@ -5432,16 +5200,12 @@ _VisualElementImpl::InvalidateRectangleI(const FloatRectangle* pRectangle)
 
        GetSharedData().invalidatedRegion = invRect;
 
-#ifdef OLD
-       InvalidateHierarchyProps(HIERARCHY_PROPERTY_CONTENT, false, false);
-#else
        _VisualElementImpl* pElement = this;
        while (pElement)
        {
                pElement->GetSharedData().childrenInvalidated = true;
                pElement = pElement->GetParent();
        }
-#endif
        SetRootNeedsContentUpdate();
 
        return E_SUCCESS;
@@ -5502,11 +5266,7 @@ _VisualElementImpl::Draw(void)
 //     if (IS_PRESENTATION(this))
 //             __UpdateHierarchyProps();
 
-#ifdef OLD
-       if (unlikely((__childrenNeedsUpdateProps & HIERARCHY_PROPERTY_CONTENT) != 0))
-#else
        if (unlikely(GetSharedData().childrenInvalidated))
-#endif
        {
 //             if (unlikely(!IS_PRESENTATION(this)))
 //                     __UpdateHierarchyProps();
@@ -5551,20 +5311,12 @@ _VisualElementImpl::DrawForAnimation(void)
                return E_SUCCESS;
        }
 
-#ifdef OLD
-       if (unlikely((__childrenNeedsUpdateProps & HIERARCHY_PROPERTY_CONTENT) != 0))
-#else
        if (unlikely(GetSharedData().childrenInvalidated))
-#endif
        {
                _VisualElementImpl* pRenderTarget = GetRenderTarget();
                pRenderTarget->DrawRectangle(GetSharedData().invalidatedRegion);
 
-#ifdef OLD
-               if (likely((__childrenNeedsUpdateProps & HIERARCHY_PROPERTY_CONTENT) == 0))
-#else
                if (likely(GetSharedData().childrenInvalidated == false))
-#endif
                {
                        return E_SUCCESS;
                }
@@ -5575,22 +5327,14 @@ _VisualElementImpl::DrawForAnimation(void)
                for (int i = 0; i < count; i++)
                {
                        pChild = __children.GetChildAt(i);
-#ifdef OLD
-                       if (!pChild || (pChild->__childrenNeedsUpdateProps & HIERARCHY_PROPERTY_CONTENT) == 0)
-#else
                        if (!pChild || (pChild->GetSharedData().childrenInvalidated == false))
-#endif
                        {
                                continue;
                        }
 
                        pChild->DrawForAnimation();
 
-#ifdef OLD
-                       if ((pChild->__childrenNeedsUpdateProps & HIERARCHY_PROPERTY_CONTENT) != 0)
-#else
                        if ((pChild->GetSharedData().childrenInvalidated))
-#endif
                        {
                                childrenNeedUpdate = true;
                        }
@@ -5599,22 +5343,10 @@ _VisualElementImpl::DrawForAnimation(void)
                // update 'needUpdate' flag regarding children only if no invalidated-region
                if (GetSharedData().invalidatedRegion.IsEmpty())
                {
-#ifdef OLD
-                       SetPropsValidaty(HIERARCHY_PROPERTY_CONTENT, 0);
-                       if (childrenNeedUpdate)
-                       {
-                               __childrenNeedsUpdateProps |= HIERARCHY_PROPERTY_CONTENT;
-                       }
-                       else
-                       {
-                               __childrenNeedsUpdateProps &= ~HIERARCHY_PROPERTY_CONTENT;
-                       }
-#else
                        if (childrenNeedUpdate)
                        {
                                GetSharedData().childrenInvalidated = true;
                        }
-#endif
                }
        }
 
@@ -5624,11 +5356,7 @@ _VisualElementImpl::DrawForAnimation(void)
 void
 _VisualElementImpl::DrawRectangleIfNeeded(const FloatRectangle& drawRect)
 {
-#ifdef OLD
-       if (unlikely(!IsVisibleI()) || (__childrenNeedsUpdateProps & HIERARCHY_PROPERTY_CONTENT) == 0)
-#else
        if (unlikely(!IsVisibleI()) || GetSharedData().childrenInvalidated == false)
-#endif
        {
                return;
        }
@@ -5657,11 +5385,7 @@ _VisualElementImpl::DrawRectangleIfNeeded(const FloatRectangle& drawRect)
        // needUpdate flag may be 'true' after drawring invalidated region.
        // This means that some children still need to be updated !
        //
-#ifdef OLD
-       if (likely((__childrenNeedsUpdateProps & HIERARCHY_PROPERTY_CONTENT) == 0))
-#else
        if (likely(GetSharedData().childrenInvalidated == false))
-#endif
        {
                return;
        }
@@ -5682,11 +5406,7 @@ _VisualElementImpl::DrawRectangleIfNeeded(const FloatRectangle& drawRect)
        for (int i = 0; i < count; i++)
        {
                pChild = __children.GetChildAt(i);
-#ifdef OLD
-               if (!pChild || (pChild->__childrenNeedsUpdateProps & HIERARCHY_PROPERTY_CONTENT) == 0)
-#else
                if (!pChild || pChild->GetSharedData().childrenInvalidated == false)
-#endif
                {
                        continue;
                }
@@ -5712,11 +5432,7 @@ _VisualElementImpl::DrawRectangleIfNeeded(const FloatRectangle& drawRect)
                                pChild->DrawRectangleIfNeeded(updateRect);
                }
 
-#ifdef OLD
-               if ((pChild->__childrenNeedsUpdateProps & HIERARCHY_PROPERTY_CONTENT) != 0)
-#else
                if (pChild->GetSharedData().childrenInvalidated)
-#endif
                {
                        childrenNeedUpdate = true;
                }
@@ -5725,22 +5441,10 @@ _VisualElementImpl::DrawRectangleIfNeeded(const FloatRectangle& drawRect)
        // update 'needUpdate' flag regarding children only if no invalidated-region
        if (GetSharedData().invalidatedRegion.IsEmpty())
        {
-#ifdef OLD
-                       SetPropsValidaty(HIERARCHY_PROPERTY_CONTENT, 0);
-                       if (childrenNeedUpdate)
-                       {
-                               __childrenNeedsUpdateProps |= HIERARCHY_PROPERTY_CONTENT;
-                       }
-                       else
-                       {
-                               __childrenNeedsUpdateProps &= ~HIERARCHY_PROPERTY_CONTENT;
-                       }
-#else
-                       if (childrenNeedUpdate)
-                       {
-                               GetSharedData().childrenInvalidated = true;
-                       }
-#endif
+               if (childrenNeedUpdate)
+               {
+                       GetSharedData().childrenInvalidated = true;
+               }
        }
 }
 
@@ -5811,13 +5515,7 @@ _VisualElementImpl::DrawRectangle(const FloatRectangle& drawRect)
                //      Clear *BEFORE* drawing because 'OnDraw' may add invalidated regions...
                //
                GetSharedData().invalidatedRegion.SetBounds(0.0f, 0.0f, 0.0f, 0.0f); // SetEmpty()
-
-#ifdef OLD
-               SetPropsValidaty(HIERARCHY_PROPERTY_CONTENT, 0);
-               __childrenNeedsUpdateProps &= ~HIERARCHY_PROPERTY_CONTENT;
-#else
                GetSharedData().childrenInvalidated = false;
-#endif
        }
 
 
@@ -5883,11 +5581,7 @@ _VisualElementImpl::DrawRectangle(const FloatRectangle& drawRect)
                                pChild->DrawRectangle(drawRectVisible);
                }
 
-#ifdef OLD
-               if ((pChild->__childrenNeedsUpdateProps & HIERARCHY_PROPERTY_CONTENT) != 0)
-#else
                if (pChild->GetSharedData().childrenInvalidated)
-#endif
                {
                        childrenNeedUpdate = true;
                }
@@ -5899,11 +5593,7 @@ _VisualElementImpl::DrawRectangle(const FloatRectangle& drawRect)
        //
        if (childrenNeedUpdate)
        {
-#ifdef OLD
-               __childrenNeedsUpdateProps |= HIERARCHY_PROPERTY_CONTENT;
-#else
                GetSharedData().childrenInvalidated = true;
-#endif
        }
 }
 

diff --git a/src/ui/inc/FUiAnim_VisualElementImpl.h b/src/ui/inc/FUiAnim_VisualElementImpl.h
index 264668f..e63dea6 100644 (file)
--- a/src/ui/inc/FUiAnim_VisualElementImpl.h
+++ b/src/ui/inc/FUiAnim_VisualElementImpl.h
@@ -45,7 +45,6 @@
 #include "FUiAnim_TransformMatrix3Df.h"
 #include "FUiAnim_VisualElementCoordinateSystem.h"
 
-//#define OLD
 #define SUPPORT_CUSTOMIZING_ATTACH_DETACH_ANIMATION
 
 namespace Tizen { namespace Ui
@@ -1043,11 +1042,7 @@ private:
 
        void SetRootNeedsContentUpdate(void)
        {
-#ifdef OLD
-               if (unlikely(__childrenNeedsUpdateProps & HIERARCHY_PROPERTY_CONTENT))
-#else
                if (unlikely(GetSharedData().childrenInvalidated))
-#endif
                {
                        _RootVisualElement* pRoot = GetRootPublic();
                        if (likely(pRoot))
@@ -1271,16 +1266,8 @@ protected:
                HIERARCHY_PROPERTY_SHOWSTATE                    = 0x04,
                HIERARCHY_PROPERTY_CONTENTOPACITY               = 0x08,
                HIERARCHY_PROPERTY_NATIVENODE                   = HIERARCHY_PROPERTY_CONTENTOPACITY,
-#ifdef OLD
-               HIERARCHY_PROPERTY_SURFACE                              = 0x10, // only for presentation element
-               HIERARCHY_PROPERTY_CONTENT                              = 0x20,
-#endif
                HIERARCHY_PROPERTY_CONTENTBOUNDS                = 0x40,
-#ifdef OLD
-               HIERARCHY_PROPERTY_MASK                                 = 0x7F
-#else
                HIERARCHY_PROPERTY_MASK                                 = 0x4F
-#endif
        };
 
        int _zOrderGroup;