Merge "Replace some Dali::Actor public APIs with new properties" into devel/master

diff --combined automated-tests/src/dali-toolkit/utc-Dali-ImageVisual.cpp
index 4ce6929,1549c42..78792d9
--- 1/automated-tests/src/dali-toolkit/utc-Dali-ImageVisual.cpp
--- 2/automated-tests/src/dali-toolkit/utc-Dali-ImageVisual.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ImageVisual.cpp
@@@ -59,7 -59,7 +59,7 @@@ std::vector<int> gReadyIds = {}
  void ResourceReadySignal( Control control )
  {
    gResourceReadySignalFired = true;
-   gReadyIds.push_back(control.GetId());
+   gReadyIds.push_back(control.GetProperty< int >( Actor::Property::ID ));
  }
  void ClearReadyIds()
  {
@@@ -570,6 -570,39 +570,6 @@@ int UtcDaliImageVisualTextureReuse2(voi
  }
  
  
 -int UtcDaliImageVisualImageHandle(void)
 -{
 -  ToolkitTestApplication application;
 -  tet_infoline( "Request image visual with an image handle" );
 -
 -  VisualFactory factory = VisualFactory::Get();
 -  DALI_TEST_CHECK( factory );
 -
 -  Image image = ResourceImage::New(TEST_IMAGE_FILE_NAME);
 -  Visual::Base visual = factory.CreateVisual( image );
 -
 -  // For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied.
 -  // Image with a size smaller than 512*512 will be uploaded as a part of the atlas.
 -
 -  const int width=512;
 -  const int height=513;
 -
 -  Integration::Bitmap* bitmap = Integration::Bitmap::New( Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD );
 -  bitmap->GetPackedPixelsProfile()->ReserveBuffer( Pixel::RGBA8888, width, height,width, height );
 -
 -  TestGlAbstraction& gl = application.GetGlAbstraction();
 -  TraceCallStack& textureTrace = gl.GetTextureTrace();
 -  textureTrace.Enable(true);
 -
 -  DummyControl actor = DummyControl::New();
 -  TestVisualRender( application, actor, visual, 1u,
 -                    ImageDimensions(width, height),
 -                    Integration::ResourcePointer(bitmap) );
 -
 -  DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
 -  END_TEST;
 -}
 -
  int UtcDaliImageVisualCustomWrapModePixelArea(void)
  {
    ToolkitTestApplication application;
@@@ -2262,7 -2295,7 +2262,7 @@@ void ResourceReadyLoadNext( Control con
    static int callNumber = 0;
  
    gResourceReadySignalFired = true;
-   gReadyIds.push_back(control.GetId());
+   gReadyIds.push_back(control.GetProperty< int >( Actor::Property::ID ));
  
    if( callNumber == 0 )
    {
@@@ -2295,7 -2328,7 +2295,7 @@@ int UtcDaliImageVisualLoadReady01(void
  
    tet_infoline( "Create a control and connect to resource ready signal" );
    DummyControl actor = DummyControl::New(true);
-   int actor1Id = actor.GetId();
+   int actor1Id = actor.GetProperty< int >( Actor::Property::ID );
    actor.ResourceReadySignal().Connect( &ResourceReadySignal);
    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(actor.GetImplementation());
    actor.SetProperty( Actor::Property::SIZE, Vector2(200.f, 200.f) );
@@@ -2326,7 -2359,7 +2326,7 @@@
    Visual::Base imageVisual2 = CreateVisualWithPolicy( TEST_BROKEN_IMAGE_FILE_NAME, ImageVisual::Property::LOAD_POLICY, ImageVisual::LoadPolicy::IMMEDIATE );
  
    DummyControl actor2 = DummyControl::New(true);
-   int actor2Id = actor2.GetId();
+   int actor2Id = actor2.GetProperty< int >( Actor::Property::ID );
    Impl::DummyControl& dummyImpl2 = static_cast<Impl::DummyControl&>(actor2.GetImplementation());
    actor2.ResourceReadySignal().Connect( &ResourceReadyLoadNext);
  

diff --combined dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
index 611ed78,f1d3ae5..48c8ff1
--- 1/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
--- 2/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
@@@ -370,7 -370,7 +370,7 @@@ void TextEditor::SetProperty( BaseObjec
        case Toolkit::TextEditor::Property::GRAB_HANDLE_IMAGE:
        {
          const std::string imageFileName = value.Get< std::string >();
 -        DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor %p GRAB_HANDLE_IMAGE %s\n", impl.mController.Get(), imageFileName );
 +        DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor %p GRAB_HANDLE_IMAGE %s\n", impl.mController.Get(), imageFileName.c_str() );
  
          if( impl.mDecorator && imageFileName.size() )
          {
@@@ -382,7 -382,7 +382,7 @@@
        case Toolkit::TextEditor::Property::GRAB_HANDLE_PRESSED_IMAGE:
        {
          const std::string imageFileName = value.Get< std::string >();
 -        DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor %p GRAB_HANDLE_PRESSED_IMAGE %s\n", impl.mController.Get(), imageFileName );
 +        DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor %p GRAB_HANDLE_PRESSED_IMAGE %s\n", impl.mController.Get(), imageFileName.c_str() );
  
          if( impl.mDecorator && imageFileName.size() )
          {
@@@ -1743,7 -1743,7 +1743,7 @@@ void TextEditor::UpdateScrollBar(
    {
      mAnimation = Animation::New( mAnimationPeriod.durationSeconds );
    }
-   indicator.SetProperty( DevelActor::Property::OPACITY,1.0f);
+   indicator.SetProperty( Actor::Property::OPACITY,1.0f);
    mAnimation.AnimateTo( Property( indicator, Actor::Property::COLOR_ALPHA ), 0.0f, AlphaFunction::EASE_IN, mAnimationPeriod );
    mAnimation.Play();
    mAnimation.FinishedSignal().Connect( this, &TextEditor::OnScrollIndicatorAnimationFinished );

diff --combined dali-toolkit/internal/controls/web-view/web-view-impl.cpp
index 90f5659,7bdb61d..a46fb1f
--- 1/dali-toolkit/internal/controls/web-view/web-view-impl.cpp
--- 2/dali-toolkit/internal/controls/web-view/web-view-impl.cpp
+++ b/dali-toolkit/internal/controls/web-view/web-view-impl.cpp
@@@ -1,5 -1,5 +1,5 @@@
  /*
 - * Copyright (c) 2018 Samsung Electronics Co., Ltd.
 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@@ -23,13 -23,13 +23,13 @@@
  #include <dali/devel-api/scripting/enum-helper.h>
  #include <dali/devel-api/scripting/scripting.h>
  #include <dali/public-api/common/stage.h>
 -#include <dali/public-api/images/native-image.h>
  #include <dali/public-api/adaptor-framework/native-image-source.h>
  #include <dali/public-api/object/type-registry.h>
  #include <dali/public-api/object/type-registry-helper.h>
  
  // INTERNAL INCLUDES
  #include <dali-toolkit/devel-api/controls/control-devel.h>
 +#include <dali-toolkit/devel-api/image-loader/texture-manager.h>
  #include <dali-toolkit/internal/visuals/visual-factory-impl.h>
  
  namespace Dali
@@@ -136,7 -136,7 +136,7 @@@ Toolkit::WebView WebView::New( const st
  
  void WebView::OnInitialize()
  {
-   Self().SetKeyboardFocusable( true );
+   Self().SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true );
    Self().TouchSignal().Connect( this, &WebView::OnTouchEvent );
  
    if( mWebEngine )
@@@ -152,11 -152,8 +152,11 @@@ void WebView::LoadUrl( const std::strin
    mUrl = url;
    if( mWebEngine )
    {
 -    Dali::Image image = Dali::NativeImage::New( *mWebEngine.GetNativeImageSource() );
 -    mVisual = Toolkit::VisualFactory::Get().CreateVisual( image );
 +    Texture texture = Dali::Texture::New( *mWebEngine.GetNativeImageSource() );
 +    const std::string nativeImageUrl = Dali::Toolkit::TextureManager::AddTexture( texture );
 +    mVisual = Toolkit::VisualFactory::Get().CreateVisual(
 +      { { Toolkit::Visual::Property::TYPE,  Toolkit::Visual::IMAGE } ,
 +        { Toolkit::ImageVisual::Property::URL, nativeImageUrl } } );
  
      if( mVisual )
      {
@@@ -171,11 -168,8 +171,11 @@@ void WebView::LoadHTMLString( const std
  {
    if( mWebEngine )
    {
 -    Dali::Image image = Dali::NativeImage::New( *mWebEngine.GetNativeImageSource() );
 -    mVisual = Toolkit::VisualFactory::Get().CreateVisual( image );
 +    Texture texture = Dali::Texture::New( *mWebEngine.GetNativeImageSource() );
 +    const std::string nativeImageUrl = Dali::Toolkit::TextureManager::AddTexture( texture );
 +    mVisual = Toolkit::VisualFactory::Get().CreateVisual(
 +      { { Toolkit::Visual::Property::TYPE,  Toolkit::Visual::IMAGE } ,
 +        { Toolkit::ImageVisual::Property::URL, nativeImageUrl } } );
  
      if( mVisual )
      {

diff --combined dali-toolkit/internal/visuals/visual-factory-impl.h
index 10df880,0e60e69..4a4ab4c
--- 1/dali-toolkit/internal/visuals/visual-factory-impl.h
--- 2/dali-toolkit/internal/visuals/visual-factory-impl.h
+++ b/dali-toolkit/internal/visuals/visual-factory-impl.h
@@@ -2,7 -2,7 +2,7 @@@
  #define DALI_TOOLKIT_VISUAL_FACTORY_IMPL_H
  
  /*
 - * Copyright (c) 2017 Samsung Electronics Co., Ltd.
 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@@ -67,6 -67,11 +67,6 @@@ public
    Toolkit::Visual::Base CreateVisual( const Property::Map& propertyMap );
  
    /**
 -   * @copydoc Toolkit::VisualFactory::CreateVisual( const Image& )
 -   */
 -  Toolkit::Visual::Base CreateVisual( const Image& image );
 -
 -  /**
     * @copydoc Toolkit::VisualFactory::CreateVisual( const std::string&, ImageDimensions )
     */
    Toolkit::Visual::Base CreateVisual( const std::string& image, ImageDimensions size );
@@@ -135,7 -140,7 +135,7 @@@ void InitializeVisual( Actor& actor, To
      Toolkit::GetImplementation(visual).SetOffStage( actor );
    }
    visual = Toolkit::VisualFactory::Get().CreateVisual( param0, param1 );
-   if( visual && actor && actor.OnStage() )
+   if( visual && actor && actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) )
    {
      Toolkit::GetImplementation(visual).SetOnStage(actor);
    }
@@@ -158,7 -163,7 +158,7 @@@ void InitializeVisual( Actor& actor, To
      Toolkit::GetImplementation(visual).SetOffStage( actor );
    }
    visual =  Toolkit::VisualFactory::Get().CreateVisual( param );
-   if( visual && actor && actor.OnStage() )
+   if( visual && actor && actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) )
    {
      Toolkit::GetImplementation(visual).SetOnStage(actor);
    }