From: Jiyun Yang Date: Mon, 17 Jun 2019 06:14:06 +0000 (+0900) Subject: [Tizen] SceneHolder sets background color through the Scene to send an information... X-Git-Tag: accepted/tizen/unified/20190618.045952~1 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git;a=commitdiff_plain;h=049b20d393f0ee225eb77129b94fd32dc6c539b9 [Tizen] SceneHolder sets background color through the Scene to send an information to the UpdateRender thread This reverts commit 6d4b1c87c21dabc3ce83bdc8fba4b750ce79e9a1. --- diff --git a/dali/integration-api/render-surface-interface.h b/dali/integration-api/render-surface-interface.h index ad672ca..501bf62 100644 --- a/dali/integration-api/render-surface-interface.h +++ b/dali/integration-api/render-surface-interface.h @@ -66,8 +66,7 @@ public: mGraphics( nullptr ), mDisplayConnection( nullptr ), mDepthBufferRequired( Integration::DepthBufferAvailable::FALSE ), - mStencilBufferRequired( Integration::StencilBufferAvailable::FALSE ), - mBackgroundColor() + mStencilBufferRequired( Integration::StencilBufferAvailable::FALSE ) {} /** @@ -176,24 +175,6 @@ public: */ virtual Integration::StencilBufferAvailable GetStencilBufferRequired() = 0; - /** - * @brief Sets the background color of the surface. - * @param[in] color The new background color - */ - virtual void SetBackgroundColor( Vector4 color ) override - { - mBackgroundColor = color; - } - - /** - * @brief Gets the background color of the surface. - * @return The background color - */ - virtual Vector4 GetBackgroundColor() override - { - return mBackgroundColor; - } - public: void SetAdaptor( Dali::Internal::Adaptor::AdaptorInternalServices& adaptor ) diff --git a/dali/integration-api/scene-holder-impl.cpp b/dali/integration-api/scene-holder-impl.cpp index efbbd60..dd69de9 100644 --- a/dali/integration-api/scene-holder-impl.cpp +++ b/dali/integration-api/scene-holder-impl.cpp @@ -200,15 +200,15 @@ Dali::RenderSurfaceInterface* SceneHolder::GetSurface() const void SceneHolder::SetBackgroundColor( const Vector4& color ) { - if ( mSurface ) + if( mScene ) { - mSurface->SetBackgroundColor( color ); + mScene.SetBackgroundColor( color ); } } Vector4 SceneHolder::GetBackgroundColor() const { - return mSurface ? mSurface->GetBackgroundColor() : Vector4(); + return mScene ? mScene.GetBackgroundColor() : Vector4(); } void SceneHolder::SetAdaptor(Dali::Adaptor& adaptor)