Merge "Size negotiation patch 4: Remove SetRelayoutEnabled" into tizen

diff --cc automated-tests/src/dali/utc-Dali-Actor.cpp
Simple merge

diff --cc automated-tests/src/dali/utc-Dali-ImageActor.cpp
index 57543c1645d50ee63068e06a4b4fe20d23a3b60b,93530b0a8f67f720cfed9a7526f46976bb891815..95b5d9a084a370bf3bd44bfde6ac8df583d10fed
--- 1/automated-tests/src/dali/utc-Dali-ImageActor.cpp
--- 2/automated-tests/src/dali/utc-Dali-ImageActor.cpp
+++ b/automated-tests/src/dali/utc-Dali-ImageActor.cpp
@@@ -307,10 -294,11 +295,9 @@@ int UtcDaliImageActorGetCurrentSize03(v
    const Vector2 closestImageSize( 80, 45);
    application.GetPlatform().SetClosestImageSize(closestImageSize);
  
 -  ImageAttributes attrs;
 -  const Vector2 requestedSize( 40, 30 );
 -  attrs.SetSize( requestedSize.width, requestedSize.height );
 -  Image image = ResourceImage::New("image.jpg", attrs);
 +  Vector2 requestedSize( 40, 30 );
 +  Image image = ResourceImage::New("image.jpg", ImageDimensions( requestedSize.x, requestedSize.y ), FittingMode::DEFAULT, SamplingMode::DEFAULT );
    ImageActor actor = ImageActor::New( image );
-   actor.SetRelayoutEnabled( false );
    Stage::GetCurrent().Add(actor);
  
    application.SendNotification(); // Flush update messages
@@@ -359,10 -334,11 +333,9 @@@ int UtcDaliImageActorGetCurrentSize04(v
    const Vector2 closestImageSize( 80, 45);
    application.GetPlatform().SetClosestImageSize(closestImageSize);
  
 -  const Vector2 requestedSize( 40, 30 );
 -  ImageAttributes attrs;
 -  attrs.SetSize( requestedSize.width, requestedSize.height );
 -  Image image = ResourceImage::New("image.jpg", attrs);
 +  Vector2 requestedSize( 40, 30 );
 +  Image image = ResourceImage::New("image.jpg", ImageDimensions( requestedSize.x, requestedSize.y ), FittingMode::DEFAULT, SamplingMode::DEFAULT );
    ImageActor actor = ImageActor::New( image );
-   actor.SetRelayoutEnabled( false );
    Stage::GetCurrent().Add(actor);
  
    application.SendNotification(); // Flush update messages
@@@ -441,10 -413,11 +409,9 @@@ int UtcDaliImageActorGetCurrentSize05(v
    Vector2 closestImageSize( 80, 45);
    application.GetPlatform().SetClosestImageSize(closestImageSize);
  
 -  ImageAttributes attrs;
 -  const Vector2 requestedSize( 40, 30 );
 -  attrs.SetSize( requestedSize.width, requestedSize.height );
 -  Image image = ResourceImage::New("image.jpg", attrs);
 +  Vector2 requestedSize( 40, 30 );
 +  Image image = ResourceImage::New("image.jpg", ImageDimensions( requestedSize.x, requestedSize.y ), FittingMode::DEFAULT, SamplingMode::DEFAULT );
    ImageActor actor = ImageActor::New( image );
-   actor.SetRelayoutEnabled( false );
    Stage::GetCurrent().Add(actor);
  
    application.SendNotification(); // Flush update messages
@@@ -518,10 -492,11 +485,9 @@@ int UtcDaliImageActorNaturalPixelAreaSi
    Vector2 closestImageSize( 80, 45);
    application.GetPlatform().SetClosestImageSize(closestImageSize);
  
 -  ImageAttributes attrs;
 -  const Vector2 requestedSize( 40, 30 );
 -  attrs.SetSize( requestedSize.width, requestedSize.height );
 -  Image image = ResourceImage::New("image.jpg", attrs);
 +  Vector2 requestedSize( 40, 30 );
 +  Image image = ResourceImage::New("image.jpg", ImageDimensions( requestedSize.x, requestedSize.y ), FittingMode::DEFAULT, SamplingMode::DEFAULT );
    ImageActor actor = ImageActor::New( image );
-   actor.SetRelayoutEnabled( false );
    Stage::GetCurrent().Add(actor);
  
    application.SendNotification(); // Flush update messages
@@@ -580,10 -555,11 +546,9 @@@ int UtcDaliImageActorNaturalPixelAreaSi
    Vector2 closestImageSize( 80, 45);
    application.GetPlatform().SetClosestImageSize(closestImageSize);
  
 -  ImageAttributes attrs;
 -  const Vector2 requestedSize( 40, 30 );
 -  attrs.SetSize( requestedSize.width, requestedSize.height );
 -  Image image = ResourceImage::New("image.jpg", attrs);
 +  Vector2 requestedSize( 40, 30 );
 +  Image image = ResourceImage::New("image.jpg", ImageDimensions( requestedSize.x, requestedSize.y ), FittingMode::DEFAULT, SamplingMode::DEFAULT );
    ImageActor actor = ImageActor::New( image );
-   actor.SetRelayoutEnabled( false );
    Stage::GetCurrent().Add(actor);
  
    application.SendNotification(); // Flush update messages