From 10576a91d24845a158f4ab2887d6a0bb42813ab4 Mon Sep 17 00:00:00 2001 From: Xiangyin Ma Date: Wed, 14 Sep 2016 11:40:35 +0100 Subject: [PATCH] [3.0](SvgVisual)Stop displaying garbage pixels before rasterization getting finished Change-Id: Icb8dcc7266e663a47d2d57997a597b52f96ce23d --- .../src/dali-toolkit/utc-Dali-VisualFactory.cpp | 4 +++- dali-toolkit/devel-api/visual-factory/visual-base.h | 4 ++-- dali-toolkit/internal/visuals/border/border-visual.cpp | 2 ++ dali-toolkit/internal/visuals/border/border-visual.h | 8 ++++---- dali-toolkit/internal/visuals/color/color-visual.cpp | 2 ++ dali-toolkit/internal/visuals/color/color-visual.h | 12 ++++++------ .../internal/visuals/gradient/gradient-visual.cpp | 2 ++ dali-toolkit/internal/visuals/gradient/gradient-visual.h | 12 ++++++------ dali-toolkit/internal/visuals/image/image-visual.cpp | 2 ++ dali-toolkit/internal/visuals/image/image-visual.h | 16 ++++++++-------- dali-toolkit/internal/visuals/mesh/mesh-visual.cpp | 2 ++ dali-toolkit/internal/visuals/mesh/mesh-visual.h | 12 ++++++------ dali-toolkit/internal/visuals/npatch/npatch-visual.cpp | 2 ++ dali-toolkit/internal/visuals/npatch/npatch-visual.h | 14 +++++++------- .../internal/visuals/primitive/primitive-visual.cpp | 2 ++ .../internal/visuals/primitive/primitive-visual.h | 14 +++++++------- dali-toolkit/internal/visuals/svg/svg-visual.cpp | 13 +++++++++++++ dali-toolkit/internal/visuals/svg/svg-visual.h | 16 ++++++++++------ dali-toolkit/internal/visuals/visual-base-impl.cpp | 7 ++----- dali-toolkit/internal/visuals/visual-base-impl.h | 3 ++- .../internal/visuals/wireframe/wireframe-visual.cpp | 2 ++ .../internal/visuals/wireframe/wireframe-visual.h | 4 ++-- 22 files changed, 94 insertions(+), 61 deletions(-) diff --git a/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp b/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp index 7a6f4c2..15058d9 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp @@ -953,7 +953,8 @@ int UtcDaliVisualFactoryGetSvgVisual(void) application.SendNotification(); application.Render(); - DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); + // renderer is not added to actor until the rasterization is completed. + DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); EventThreadCallback* eventTrigger = EventThreadCallback::Get(); CallbackBase* callback = eventTrigger->GetCallback(); @@ -961,6 +962,7 @@ int UtcDaliVisualFactoryGetSvgVisual(void) eventTrigger->WaitingForTrigger( 1 );// waiting until the svg image is rasterized. CallbackBase::Execute( *callback ); + // renderer is added to actor DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); // waiting for the resource uploading diff --git a/dali-toolkit/devel-api/visual-factory/visual-base.h b/dali-toolkit/devel-api/visual-factory/visual-base.h index 40864e5..74ca640 100644 --- a/dali-toolkit/devel-api/visual-factory/visual-base.h +++ b/dali-toolkit/devel-api/visual-factory/visual-base.h @@ -116,7 +116,7 @@ public: float GetDepthIndex() const; /** - * @brief Visual needs to know when when the control is put on to the stage to add the renderer. + * @brief Visual needs to know when the control is put on to the stage to add the renderer. * * This function should be called when the control is put on to the stage. * @@ -126,7 +126,7 @@ public: void SetOnStage( Actor& actor ); /** - * @brief Visual needs to know when when the control is removed from the stage to remove the renderer. + * @brief Visual needs to know when the control is removed from the stage to remove the renderer. * * This function should be called when the control is removed from the stage * diff --git a/dali-toolkit/internal/visuals/border/border-visual.cpp b/dali-toolkit/internal/visuals/border/border-visual.cpp index a56402f..8718bce 100644 --- a/dali-toolkit/internal/visuals/border/border-visual.cpp +++ b/dali-toolkit/internal/visuals/border/border-visual.cpp @@ -154,6 +154,8 @@ void BorderVisual::DoSetOnStage( Actor& actor ) mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON ); } mBorderSizeIndex = (mImpl->mRenderer).RegisterProperty( SIZE_NAME, mBorderSize ); + + actor.AddRenderer( mImpl->mRenderer ); } void BorderVisual::DoCreatePropertyMap( Property::Map& map ) const diff --git a/dali-toolkit/internal/visuals/border/border-visual.h b/dali-toolkit/internal/visuals/border/border-visual.h index 6973a79..98392f2 100644 --- a/dali-toolkit/internal/visuals/border/border-visual.h +++ b/dali-toolkit/internal/visuals/border/border-visual.h @@ -64,24 +64,24 @@ public: public: // from Visual /** - * @copydoc Visual::SetClipRect + * @copydoc Visual::Base::SetClipRect */ virtual void SetClipRect( const Rect& clipRect ); protected: /** - * @copydoc Visual::DoInitialize + * @copydoc Visual::Base::DoInitialize */ virtual void DoInitialize( Actor& actor, const Property::Map& propertyMap ); /** - * @copydoc Visual::DoSetOnStage + * @copydoc Visual::Base::DoSetOnStage */ virtual void DoSetOnStage( Actor& actor ); /** - * @copydoc Visual::CreatePropertyMap + * @copydoc Visual::Base::CreatePropertyMap */ virtual void DoCreatePropertyMap( Property::Map& map ) const; diff --git a/dali-toolkit/internal/visuals/color/color-visual.cpp b/dali-toolkit/internal/visuals/color/color-visual.cpp index 17cf68a..32a7e93 100644 --- a/dali-toolkit/internal/visuals/color/color-visual.cpp +++ b/dali-toolkit/internal/visuals/color/color-visual.cpp @@ -106,6 +106,8 @@ void ColorVisual::SetOffset( const Vector2& offset ) void ColorVisual::DoSetOnStage( Actor& actor ) { InitializeRenderer(); + + actor.AddRenderer( mImpl->mRenderer ); } void ColorVisual::DoCreatePropertyMap( Property::Map& map ) const diff --git a/dali-toolkit/internal/visuals/color/color-visual.h b/dali-toolkit/internal/visuals/color/color-visual.h index f458152..0e952aa 100644 --- a/dali-toolkit/internal/visuals/color/color-visual.h +++ b/dali-toolkit/internal/visuals/color/color-visual.h @@ -58,34 +58,34 @@ public: public: // from Visual /** - * @copydoc Visual::SetSize + * @copydoc Visual::Base::SetSize */ virtual void SetSize( const Vector2& size ); /** - * @copydoc Visual::SetClipRect + * @copydoc Visual::Base::SetClipRect */ virtual void SetClipRect( const Rect& clipRect ); /** - * @copydoc Visual::SetOffset + * @copydoc Visual::Base::SetOffset */ virtual void SetOffset( const Vector2& offset ); /** - * @copydoc Visual::CreatePropertyMap + * @copydoc Visual::Base::CreatePropertyMap */ virtual void DoCreatePropertyMap( Property::Map& map ) const; protected: /** - * @copydoc Visual::DoInitialize + * @copydoc Visual::Base::DoInitialize */ virtual void DoInitialize( Actor& actor, const Property::Map& propertyMap ); /** - * @copydoc Visual::DoSetOnStage + * @copydoc Visual::Base::DoSetOnStage */ virtual void DoSetOnStage( Actor& actor ); diff --git a/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp b/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp index 22f9026..8afdb1e 100644 --- a/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp +++ b/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp @@ -244,6 +244,8 @@ void GradientVisual::SetOffset( const Vector2& offset ) void GradientVisual::DoSetOnStage( Actor& actor ) { InitializeRenderer(); + + actor.AddRenderer( mImpl->mRenderer ); } void GradientVisual::DoCreatePropertyMap( Property::Map& map ) const diff --git a/dali-toolkit/internal/visuals/gradient/gradient-visual.h b/dali-toolkit/internal/visuals/gradient/gradient-visual.h index be191be..714ba7b 100644 --- a/dali-toolkit/internal/visuals/gradient/gradient-visual.h +++ b/dali-toolkit/internal/visuals/gradient/gradient-visual.h @@ -94,33 +94,33 @@ public: public: // from Visual /** - * @copydoc Visual::SetSize + * @copydoc Visual::Base::SetSize */ virtual void SetSize( const Vector2& size ); /** - * @copydoc Visual::SetClipRect + * @copydoc Visual::Base::SetClipRect */ virtual void SetClipRect( const Rect& clipRect ); /** - * @copydoc Visual::SetOffset + * @copydoc Visual::Base::SetOffset */ virtual void SetOffset( const Vector2& offset ); /** - * @copydoc Visual::CreatePropertyMap + * @copydoc Visual::Base::CreatePropertyMap */ virtual void DoCreatePropertyMap( Property::Map& map ) const; protected: /** - * @copydoc Visual::DoInitialize + * @copydoc Visual::Base::DoInitialize */ virtual void DoInitialize( Actor& actor, const Property::Map& propertyMap ); /** - * @copydoc Visual::DoSetOnStage + * @copydoc Visual::Base::DoSetOnStage */ virtual void DoSetOnStage( Actor& actor ); diff --git a/dali-toolkit/internal/visuals/image/image-visual.cpp b/dali-toolkit/internal/visuals/image/image-visual.cpp index 64b0965..98f9734 100644 --- a/dali-toolkit/internal/visuals/image/image-visual.cpp +++ b/dali-toolkit/internal/visuals/image/image-visual.cpp @@ -501,6 +501,8 @@ void ImageVisual::DoSetOnStage( Actor& actor ) { InitializeRenderer( mImage ); } + + actor.AddRenderer( mImpl->mRenderer ); } void ImageVisual::DoSetOffStage( Actor& actor ) diff --git a/dali-toolkit/internal/visuals/image/image-visual.h b/dali-toolkit/internal/visuals/image/image-visual.h index baad92f..57c7016 100644 --- a/dali-toolkit/internal/visuals/image/image-visual.h +++ b/dali-toolkit/internal/visuals/image/image-visual.h @@ -93,43 +93,43 @@ public: public: // from Visual /** - * @copydoc Visual::SetSize + * @copydoc Visual::Base::SetSize */ virtual void SetSize( const Vector2& size ); /** - * @copydoc Visual::GetNaturalSize + * @copydoc Visual::Base::GetNaturalSize */ virtual void GetNaturalSize( Vector2& naturalSize ) const; /** - * @copydoc Visual::SetClipRect + * @copydoc Visual::Base::SetClipRect */ virtual void SetClipRect( const Rect& clipRect ); /** - * @copydoc Visual::SetOffset + * @copydoc Visual::Base::SetOffset */ virtual void SetOffset( const Vector2& offset ); /** - * @copydoc Visual::CreatePropertyMap + * @copydoc Visual::Base::CreatePropertyMap */ virtual void DoCreatePropertyMap( Property::Map& map ) const; protected: /** - * @copydoc Visual::DoInitialize + * @copydoc Visual::Base::DoInitialize */ virtual void DoInitialize( Actor& actor, const Property::Map& propertyMap ); /** - * @copydoc Visual::DoSetOnStage + * @copydoc Visual::Base::DoSetOnStage */ virtual void DoSetOnStage( Actor& actor ); /** - * @copydoc Visual::DoSetOffStage + * @copydoc Visual::Base::DoSetOffStage */ virtual void DoSetOffStage( Actor& actor ); diff --git a/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp b/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp index af8c30d..d16be55 100644 --- a/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp +++ b/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp @@ -384,6 +384,8 @@ void MeshVisual::SetOffset( const Vector2& offset ) void MeshVisual::DoSetOnStage( Actor& actor ) { InitializeRenderer(); + + actor.AddRenderer( mImpl->mRenderer ); } void MeshVisual::DoCreatePropertyMap( Property::Map& map ) const diff --git a/dali-toolkit/internal/visuals/mesh/mesh-visual.h b/dali-toolkit/internal/visuals/mesh/mesh-visual.h index b801ce8..d1852e9 100644 --- a/dali-toolkit/internal/visuals/mesh/mesh-visual.h +++ b/dali-toolkit/internal/visuals/mesh/mesh-visual.h @@ -70,34 +70,34 @@ public: public: // from Visual /** - * @copydoc Visual::SetSize + * @copydoc Visual::Base::SetSize */ virtual void SetSize( const Vector2& size ); /** - * @copydoc Visual::SetClipRect + * @copydoc Visual::Base::SetClipRect */ virtual void SetClipRect( const Rect& clipRect ); /** - * @copydoc Visual::SetOffset + * @copydoc Visual::Base::SetOffset */ virtual void SetOffset( const Vector2& offset ); /** - * @copydoc Visual::CreatePropertyMap + * @copydoc Visual::Base::CreatePropertyMap */ virtual void DoCreatePropertyMap( Property::Map& map ) const; protected: /** - * @copydoc Visual::DoInitialize + * @copydoc Visual::Base::DoInitialize */ virtual void DoInitialize( Actor& actor, const Property::Map& propertyMap ); /** - * @copydoc Visual::DoSetOnStage + * @copydoc Visual::Base::DoSetOnStage */ virtual void DoSetOnStage( Actor& actor ); diff --git a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp index fb13383..56a75e5 100644 --- a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp +++ b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp @@ -390,6 +390,8 @@ void NPatchVisual::DoSetOnStage( Actor& actor ) { ApplyImageToSampler(); } + + actor.AddRenderer( mImpl->mRenderer ); } void NPatchVisual::DoSetOffStage( Actor& actor ) diff --git a/dali-toolkit/internal/visuals/npatch/npatch-visual.h b/dali-toolkit/internal/visuals/npatch/npatch-visual.h index b51bf7f..c4dcbc3 100644 --- a/dali-toolkit/internal/visuals/npatch/npatch-visual.h +++ b/dali-toolkit/internal/visuals/npatch/npatch-visual.h @@ -68,39 +68,39 @@ public: public: // from Visual /** - * @copydoc Visual::GetNaturalSize + * @copydoc Visual::Base::GetNaturalSize */ virtual void GetNaturalSize( Vector2& naturalSize ) const; /** - * @copydoc Visual::SetClipRect + * @copydoc Visual::Base::SetClipRect */ virtual void SetClipRect( const Rect& clipRect ); /** - * @copydoc Visual::SetOffset + * @copydoc Visual::Base::SetOffset */ virtual void SetOffset( const Vector2& offset ); /** - * @copydoc Visual::CreatePropertyMap + * @copydoc Visual::Base::CreatePropertyMap */ virtual void DoCreatePropertyMap( Property::Map& map ) const; protected: /** - * @copydoc Visual::DoInitialize + * @copydoc Visual::Base::DoInitialize */ virtual void DoInitialize( Actor& actor, const Property::Map& propertyMap ); /** - * @copydoc Visual::DoSetOnStage + * @copydoc Visual::Base::DoSetOnStage */ virtual void DoSetOnStage( Actor& actor ); /** - * @copydoc Visual::DoSetOffStage + * @copydoc Visual::Base::DoSetOffStage */ virtual void DoSetOffStage( Actor& actor ); diff --git a/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp b/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp index 212b43b..841f507 100644 --- a/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp +++ b/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp @@ -395,6 +395,8 @@ void PrimitiveVisual::SetOffset( const Vector2& offset ) void PrimitiveVisual::DoSetOnStage( Actor& actor ) { InitializeRenderer(); + + actor.AddRenderer( mImpl->mRenderer ); } void PrimitiveVisual::DoCreatePropertyMap( Property::Map& map ) const diff --git a/dali-toolkit/internal/visuals/primitive/primitive-visual.h b/dali-toolkit/internal/visuals/primitive/primitive-visual.h index 01b5885..dd440fc 100644 --- a/dali-toolkit/internal/visuals/primitive/primitive-visual.h +++ b/dali-toolkit/internal/visuals/primitive/primitive-visual.h @@ -111,39 +111,39 @@ public: public: // from Visual /** - * @copydoc Visual::SetSize + * @copydoc Visual::Base::SetSize */ virtual void SetSize( const Vector2& size ); /** - * @copydoc Visual::GetNaturalSize + * @copydoc Visual::Base::GetNaturalSize */ virtual void GetNaturalSize( Vector2& naturalSize ) const; /** - * @copydoc Visual::SetClipRect + * @copydoc Visual::Base::SetClipRect */ virtual void SetClipRect( const Rect& clipRect ); /** - * @copydoc Visual::SetOffset + * @copydoc Visual::Base::SetOffset */ virtual void SetOffset( const Vector2& offset ); /** - * @copydoc Visual::CreatePropertyMap + * @copydoc Visual::Base::CreatePropertyMap */ virtual void DoCreatePropertyMap( Property::Map& map ) const; protected: /** - * @copydoc Visual::DoInitialize + * @copydoc Visual::Base::DoInitialize */ virtual void DoInitialize( Actor& actor, const Property::Map& propertyMap ); /** - * @copydoc Visual::DoSetOnStage + * @copydoc Visual::Base::DoSetOnStage */ virtual void DoSetOnStage( Actor& actor ); diff --git a/dali-toolkit/internal/visuals/svg/svg-visual.cpp b/dali-toolkit/internal/visuals/svg/svg-visual.cpp index f73df9f..2d6a263 100644 --- a/dali-toolkit/internal/visuals/svg/svg-visual.cpp +++ b/dali-toolkit/internal/visuals/svg/svg-visual.cpp @@ -109,6 +109,9 @@ void SvgVisual::DoSetOnStage( Actor& actor ) { AddRasterizationTask( mImpl->mSize ); } + + // Hold the weak handle of the placement actor and delay the adding of renderer until the svg rasterization is finished. + mPlacementActor = actor; } void SvgVisual::DoSetOffStage( Actor& actor ) @@ -117,6 +120,7 @@ void SvgVisual::DoSetOffStage( Actor& actor ) actor.RemoveRenderer( mImpl->mRenderer ); mImpl->mRenderer.Reset(); + mPlacementActor.Reset(); } void SvgVisual::GetNaturalSize( Vector2& naturalSize ) const @@ -235,6 +239,15 @@ void SvgVisual::ApplyRasterizedImage( PixelData rasterizedPixelData ) TextureSetImage( textureSet, 0u, texture ); } } + + // Rasterized pixels are uploaded to texture. If weak handle is holding a placement actor, it is the time to add the renderer to actor. + Actor actor = mPlacementActor.GetHandle(); + if( actor ) + { + actor.AddRenderer( mImpl->mRenderer ); + // reset the weak handle so that the renderer only get added to actor once + mPlacementActor.Reset(); + } } } diff --git a/dali-toolkit/internal/visuals/svg/svg-visual.h b/dali-toolkit/internal/visuals/svg/svg-visual.h index e4e97da..70d4bd4 100644 --- a/dali-toolkit/internal/visuals/svg/svg-visual.h +++ b/dali-toolkit/internal/visuals/svg/svg-visual.h @@ -18,6 +18,9 @@ * */ +//EXTERNAL INCLUDES +#include + // INTERNAL INCLUDES #include #include @@ -62,34 +65,34 @@ public: public: // from Visual /** - * @copydoc Visual::GetNaturalSize + * @copydoc Visual::Base::GetNaturalSize */ virtual void GetNaturalSize( Vector2& naturalSize ) const; /** - * @copydoc Visual::SetSize + * @copydoc Visual::Base::SetSize */ virtual void SetSize( const Vector2& size ); /** - * @copydoc Visual::CreatePropertyMap + * @copydoc Visual::Base::CreatePropertyMap */ virtual void DoCreatePropertyMap( Property::Map& map ) const; protected: /** - * @copydoc Visual::DoInitialize + * @copydoc Visual::Base::DoInitialize */ virtual void DoInitialize( Actor& actor, const Property::Map& propertyMap ); /** - * @copydoc Visual::DoSetOnStage + * @copydoc Visual::Base::DoSetOnStage */ virtual void DoSetOnStage( Actor& actor ); /** - * @copydoc Visual::DoSetOffStage + * @copydoc Visual::Base::DoSetOffStage */ virtual void DoSetOffStage( Actor& actor ); @@ -139,6 +142,7 @@ private: ImageAtlasManager& mAtlasManager; std::string mImageUrl; NSVGimage* mParsedImage; + WeakHandle mPlacementActor; }; diff --git a/dali-toolkit/internal/visuals/visual-base-impl.cpp b/dali-toolkit/internal/visuals/visual-base-impl.cpp index 10bce2b..5681016 100644 --- a/dali-toolkit/internal/visuals/visual-base-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-base-impl.cpp @@ -117,11 +117,12 @@ float Base::GetDepthIndex() const void Base::SetOnStage( Actor& actor ) { + // To display the actor correctly, renderer should not be added to actor until all required resources are ready. + // Thus the calling of actor.AddRenderer() should happen inside derived class as base class does not know the exact timing. DoSetOnStage( actor ); mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA, IsPreMultipliedAlphaEnabled()); mImpl->mRenderer.SetProperty( Renderer::Property::DEPTH_INDEX, mImpl->mDepthIndex ); - actor.AddRenderer( mImpl->mRenderer ); mImpl->mFlags |= Impl::IS_ON_STAGE; } @@ -157,10 +158,6 @@ bool Base::IsPreMultipliedAlphaEnabled() const return mImpl->mFlags & Impl::IS_PREMULTIPLIED_ALPHA; } -void Base::DoSetOnStage( Actor& actor ) -{ -} - void Base::DoSetOffStage( Actor& actor ) { actor.RemoveRenderer( mImpl->mRenderer ); diff --git a/dali-toolkit/internal/visuals/visual-base-impl.h b/dali-toolkit/internal/visuals/visual-base-impl.h index 2622a82..aa80c03 100644 --- a/dali-toolkit/internal/visuals/visual-base-impl.h +++ b/dali-toolkit/internal/visuals/visual-base-impl.h @@ -189,9 +189,10 @@ protected: /** * @brief Called by SetOnStage() allowing sub classes to respond to the SetOnStage event * + * @note The derived class is required to create the renderer, and add it to the actor when all the resources are in place. * @param[in] actor The actor applying this visual. */ - virtual void DoSetOnStage( Actor& actor ); + virtual void DoSetOnStage( Actor& actor ) = 0; /** * @brief Called by SetOffStage() allowing sub classes to respond to the SetOffStage event diff --git a/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp b/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp index 47474a6..4299eb6 100644 --- a/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp +++ b/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp @@ -76,6 +76,8 @@ WireframeVisual::~WireframeVisual() void WireframeVisual::DoSetOnStage( Actor& actor ) { InitializeRenderer(); + + actor.AddRenderer( mImpl->mRenderer ); } void WireframeVisual::DoCreatePropertyMap( Property::Map& map ) const diff --git a/dali-toolkit/internal/visuals/wireframe/wireframe-visual.h b/dali-toolkit/internal/visuals/wireframe/wireframe-visual.h index b14452a..c0d8682 100644 --- a/dali-toolkit/internal/visuals/wireframe/wireframe-visual.h +++ b/dali-toolkit/internal/visuals/wireframe/wireframe-visual.h @@ -53,12 +53,12 @@ public: protected: /** - * @copydoc Visual::DoSetOnStage + * @copydoc Visual::Base::DoSetOnStage */ virtual void DoSetOnStage( Actor& actor ); /** - * @copydoc Visual::CreatePropertyMap + * @copydoc Visual::Base::CreatePropertyMap */ virtual void DoCreatePropertyMap( Property::Map& map ) const; -- 2.7.4