From: taeyoon Date: Wed, 30 Dec 2015 02:36:54 +0000 (+0900) Subject: Revert "[3.0] Fix svace issues" X-Git-Tag: accepted/tizen/mobile/20160122.080625~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=113b9cb9dc09ba9230ca1700e1ad56eee2f3e525;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git Revert "[3.0] Fix svace issues" This reverts commit 2eea2efda506ac048e2fe8ddf684088e413d187c. Change-Id: I958350b8662ee1dd0cb2cc3f9b0f7d7181be02de --- diff --git a/dali-toolkit/internal/controls/renderers/npatch/npatch-renderer.cpp b/dali-toolkit/internal/controls/renderers/npatch/npatch-renderer.cpp index c37c94b..8e509a9 100644 --- a/dali-toolkit/internal/controls/renderers/npatch/npatch-renderer.cpp +++ b/dali-toolkit/internal/controls/renderers/npatch/npatch-renderer.cpp @@ -329,8 +329,6 @@ void NPatchRenderer::InitializeRenderer( Renderer& renderer ) } else { - DALI_ASSERT_ALWAYS( geometry && "Geometry handle is empty" ); - mImpl->mRenderer.SetGeometry( geometry ); Material material = mImpl->mRenderer.GetMaterial(); if( material ) diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index 39562a1..e990d42 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -1349,12 +1349,6 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ bool maxLengthReached( false ); DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected InsertText" ) - - if( mImpl->mEventData == NULL ) - { - return; - } - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::InsertText %p %s (%s) mPrimaryCursorPosition %d mPreEditFlag %d mPreEditStartPosition %d mPreEditLength %d\n", this, text.c_str(), (COMMIT == type ? "COMMIT" : "PRE_EDIT"), mImpl->mEventData->mPrimaryCursorPosition, mImpl->mEventData->mPreEditFlag, mImpl->mEventData->mPreEditStartPosition, mImpl->mEventData->mPreEditLength );