Revert "[Tizen] Change raw pointer to unique_ptr"

This reverts commit 3d44f4febf05c13f1fb567012bb7ec7d7a97858c.

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
index d00dc75..d89428a 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
@@ -3221,70 +3221,6 @@ int UtcDaliTextFieldSettingPlaceholder(void)
   END_TEST;
 }
 
-int UtcDaliTextFieldPlaceholderCoverage(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline("UtcDaliTextFieldPlaceholderCoverage");
-
-  // mPlaceholderFont is created only once, so create a new control for coverage.
-  TextField fieldForCoverage = TextField::New();
-  DALI_TEST_CHECK(fieldForCoverage);
-  application.GetScene().Add(fieldForCoverage);
-
-  // for SetPlaceholderFontFamily() coverage.
-  Property::Map fontFamilyMap;
-  fontFamilyMap[Text::PlaceHolder::Property::FONT_FAMILY] = "Arial";
-  fieldForCoverage.SetProperty(TextField::Property::PLACEHOLDER, fontFamilyMap);
-
-  // mPlaceholderFont is created only once, so create a new control for coverage.
-  fieldForCoverage = TextField::New();
-  DALI_TEST_CHECK(fieldForCoverage);
-  application.GetScene().Add(fieldForCoverage);
-
-  // for SetPlaceholderTextFontSize coverage.
-  Property::Map fontSizeMap;
-  fontSizeMap[Text::PlaceHolder::Property::PIXEL_SIZE] = 15.0f;
-  fieldForCoverage.SetProperty(TextField::Property::PLACEHOLDER, fontSizeMap);
-
-  // mPlaceholderFont is created only once, so create a new control for coverage.
-  fieldForCoverage = TextField::New();
-  DALI_TEST_CHECK(fieldForCoverage);
-  application.GetScene().Add(fieldForCoverage);
-
-  // for SetPlaceholderTextFontWeight coverage.
-  Property::Map fontStyleWeightMap;
-  Property::Map fontStyleWeightPropertyMap;
-  fontStyleWeightPropertyMap.Insert("weight", "bold");
-  fontStyleWeightMap[Text::PlaceHolder::Property::FONT_STYLE] = fontStyleWeightPropertyMap;
-  fieldForCoverage.SetProperty(TextField::Property::PLACEHOLDER, fontStyleWeightMap);
-
-  // mPlaceholderFont is created only once, so create a new control for coverage.
-  fieldForCoverage = TextField::New();
-  DALI_TEST_CHECK(fieldForCoverage);
-  application.GetScene().Add(fieldForCoverage);
-
-  // for SetPlaceholderTextFontWidth coverage.
-  Property::Map fontStyleWidthMap;
-  Property::Map fontStyleWidthPropertyMap;
-  fontStyleWidthPropertyMap.Insert("width", "expanded");
-  fontStyleWidthMap[Text::PlaceHolder::Property::FONT_STYLE] = fontStyleWidthPropertyMap;
-  fieldForCoverage.SetProperty(TextField::Property::PLACEHOLDER, fontStyleWidthMap);
-
-  // mPlaceholderFont is created only once, so create a new control for coverage.
-  fieldForCoverage = TextField::New();
-  DALI_TEST_CHECK(fieldForCoverage);
-  application.GetScene().Add(fieldForCoverage);
-
-  // for SetPlaceholderTextFontSlant coverage.
-  Property::Map fontStyleSlantMap;
-  Property::Map fontStyleSlantPropertyMap;
-  fontStyleSlantPropertyMap.Insert("slant", "italic");
-  fontStyleSlantMap[Text::PlaceHolder::Property::FONT_STYLE] = fontStyleSlantPropertyMap;
-  fieldForCoverage.SetProperty(TextField::Property::PLACEHOLDER, fontStyleSlantMap);
-
-  END_TEST;
-}
-
 int UtcDaliTextFieldSetPaddingProperty(void)
 {
   ToolkitTestApplication application;

diff --git a/dali-toolkit/internal/text/text-controller-impl.cpp b/dali-toolkit/internal/text/text-controller-impl.cpp
index 3fe3322..c31fc93 100644 (file)
--- a/dali-toolkit/internal/text/text-controller-impl.cpp
+++ b/dali-toolkit/internal/text/text-controller-impl.cpp
@@ -85,7 +85,7 @@ namespace Text
 EventData::EventData(DecoratorPtr decorator, InputMethodContext& inputMethodContext)
 : mDecorator(decorator),
   mInputMethodContext(inputMethodContext),
-  mPlaceholderFont(nullptr),
+  mPlaceholderFont(NULL),
   mPlaceholderTextActive(),
   mPlaceholderTextInactive(),
   mPlaceholderTextColor(0.8f, 0.8f, 0.8f, 0.8f), // This color has been published in the Public API (placeholder-properties.h).

diff --git a/dali-toolkit/internal/text/text-controller-impl.h b/dali-toolkit/internal/text/text-controller-impl.h
index 02fbff8..84d6193 100644 (file)
--- a/dali-toolkit/internal/text/text-controller-impl.h
+++ b/dali-toolkit/internal/text/text-controller-impl.h
@@ -116,12 +116,12 @@ struct EventData
     return (stateToCheck == EDITING || stateToCheck == EDITING_WITH_POPUP || stateToCheck == EDITING_WITH_GRAB_HANDLE || stateToCheck == EDITING_WITH_PASTE_POPUP);
   }
 
-  DecoratorPtr                  mDecorator;               ///< Pointer to the decorator.
-  InputMethodContext            mInputMethodContext;      ///< The Input Method Framework Manager.
-  std::unique_ptr<FontDefaults> mPlaceholderFont;         ///< The placeholder default font.
-  std::string                   mPlaceholderTextActive;   ///< The text to display when the TextField is empty with key-input focus.
-  std::string                   mPlaceholderTextInactive; ///< The text to display when the TextField is empty and inactive.
-  Vector4                       mPlaceholderTextColor;    ///< The in/active placeholder text color.
+  DecoratorPtr       mDecorator;               ///< Pointer to the decorator.
+  InputMethodContext mInputMethodContext;      ///< The Input Method Framework Manager.
+  FontDefaults*      mPlaceholderFont;         ///< The placeholder default font.
+  std::string        mPlaceholderTextActive;   ///< The text to display when the TextField is empty with key-input focus.
+  std::string        mPlaceholderTextInactive; ///< The text to display when the TextField is empty and inactive.
+  Vector4            mPlaceholderTextColor;    ///< The in/active placeholder text color.
 
   /**
    * This is used to delay handling events until after the model has been updated.

diff --git a/dali-toolkit/internal/text/text-controller-placeholder-handler.cpp b/dali-toolkit/internal/text/text-controller-placeholder-handler.cpp
index 301dbcb..81d491a 100644 (file)
--- a/dali-toolkit/internal/text/text-controller-placeholder-handler.cpp
+++ b/dali-toolkit/internal/text/text-controller-placeholder-handler.cpp
@@ -111,8 +111,10 @@ void Controller::PlaceholderHandler::SetPlaceholderFontFamily(Controller& contro
 {
   if(NULL != controller.mImpl->mEventData)
   {
-    // if mPlaceholderFont is null, create an instance.
-    CreatePlaceholderFont(controller);
+    if(NULL == controller.mImpl->mEventData->mPlaceholderFont)
+    {
+      controller.mImpl->mEventData->mPlaceholderFont = new FontDefaults();
+    }
 
     controller.mImpl->mEventData->mPlaceholderFont->mFontDescription.family = placeholderTextFontFamily;
     DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::SetPlaceholderFontFamily %s\n", placeholderTextFontFamily.c_str());
@@ -136,8 +138,10 @@ void Controller::PlaceholderHandler::SetPlaceholderTextFontWeight(Controller& co
 {
   if(NULL != controller.mImpl->mEventData)
   {
-    // if mPlaceholderFont is null, create an instance.
-    CreatePlaceholderFont(controller);
+    if(NULL == controller.mImpl->mEventData->mPlaceholderFont)
+    {
+      controller.mImpl->mEventData->mPlaceholderFont = new FontDefaults();
+    }
 
     controller.mImpl->mEventData->mPlaceholderFont->mFontDescription.weight = weight;
     controller.mImpl->mEventData->mPlaceholderFont->weightDefined           = true;
@@ -169,8 +173,10 @@ void Controller::PlaceholderHandler::SetPlaceholderTextFontWidth(Controller& con
 {
   if(NULL != controller.mImpl->mEventData)
   {
-    // if mPlaceholderFont is null, create an instance.
-    CreatePlaceholderFont(controller);
+    if(NULL == controller.mImpl->mEventData->mPlaceholderFont)
+    {
+      controller.mImpl->mEventData->mPlaceholderFont = new FontDefaults();
+    }
 
     controller.mImpl->mEventData->mPlaceholderFont->mFontDescription.width = width;
     controller.mImpl->mEventData->mPlaceholderFont->widthDefined           = true;
@@ -202,8 +208,10 @@ void Controller::PlaceholderHandler::SetPlaceholderTextFontSlant(Controller& con
 {
   if(NULL != controller.mImpl->mEventData)
   {
-    // if mPlaceholderFont is null, create an instance.
-    CreatePlaceholderFont(controller);
+    if(NULL == controller.mImpl->mEventData->mPlaceholderFont)
+    {
+      controller.mImpl->mEventData->mPlaceholderFont = new FontDefaults();
+    }
 
     controller.mImpl->mEventData->mPlaceholderFont->mFontDescription.slant = slant;
     controller.mImpl->mEventData->mPlaceholderFont->slantDefined           = true;
@@ -235,8 +243,10 @@ void Controller::PlaceholderHandler::SetPlaceholderTextFontSize(Controller& cont
 {
   if(NULL != controller.mImpl->mEventData)
   {
-    // if mPlaceholderFont is null, create an instance.
-    CreatePlaceholderFont(controller);
+    if(NULL == controller.mImpl->mEventData->mPlaceholderFont)
+    {
+      controller.mImpl->mEventData->mPlaceholderFont = new FontDefaults();
+    }
 
     switch(type)
     {
@@ -523,14 +533,6 @@ void Controller::PlaceholderHandler::ShowPlaceholderText(Controller& controller)
   }
 }
 
-void Controller::PlaceholderHandler::CreatePlaceholderFont(Controller& controller)
-{
-  if(nullptr == controller.mImpl->mEventData->mPlaceholderFont)
-  {
-    controller.mImpl->mEventData->mPlaceholderFont = std::unique_ptr<FontDefaults>(new FontDefaults());
-  }
-}
-
 } // namespace Text
 
 } // namespace Toolkit

diff --git a/dali-toolkit/internal/text/text-controller-placeholder-handler.h b/dali-toolkit/internal/text/text-controller-placeholder-handler.h
index ac2ba1b..c69e003 100644 (file)
--- a/dali-toolkit/internal/text/text-controller-placeholder-handler.h
+++ b/dali-toolkit/internal/text/text-controller-placeholder-handler.h
@@ -56,7 +56,6 @@ struct Controller::PlaceholderHandler
   static void               SetPlaceholderProperty(Controller& controller, const Property::Map& map);
   static void               GetPlaceholderProperty(Controller& controller, Property::Map& map);
   static void               ShowPlaceholderText(Controller& controller);
-  static void               CreatePlaceholderFont(Controller& controller);
 };
 
 } // namespace Text