From acd393bcdd2c2a4823c366dfe007404dfc639a94 Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Tue, 23 Feb 2016 21:55:31 +0900 Subject: [PATCH] Revert "[3.0] (FrameBufferImage) Store ReleasePolicy to satisfy Tizen API policy" This reverts commit 32066f22374dff6d3fbcfe1f499e1eac58dacedd. Change-Id: Ie2f91c22b43d086167f44e1a8188623e3ed90551 --- automated-tests/src/dali/utc-Dali-FrameBufferImage.cpp | 6 +++--- dali/internal/event/images/frame-buffer-image-impl.cpp | 6 ------ dali/internal/event/images/frame-buffer-image-impl.h | 6 ------ dali/public-api/images/frame-buffer-image.cpp | 6 ++---- 4 files changed, 5 insertions(+), 19 deletions(-) diff --git a/automated-tests/src/dali/utc-Dali-FrameBufferImage.cpp b/automated-tests/src/dali/utc-Dali-FrameBufferImage.cpp index 1f2b880..b79619a 100644 --- a/automated-tests/src/dali/utc-Dali-FrameBufferImage.cpp +++ b/automated-tests/src/dali/utc-Dali-FrameBufferImage.cpp @@ -111,8 +111,8 @@ int UtcDaliFrameBufferImageNew03(void) DALI_TEST_CHECK( image ); - // ReleasePolicy is deprecated. Only set, but not used internally. - DALI_TEST_EQUALS( image.GetReleasePolicy(), Image::UNUSED, TEST_LOCATION ); + //ReleasePolicy is always never for framebuffer images + DALI_TEST_EQUALS( image.GetReleasePolicy(), Image::NEVER, TEST_LOCATION ); // initialise handle with NEVER release policy image.Reset(); @@ -122,7 +122,7 @@ int UtcDaliFrameBufferImageNew03(void) DALI_TEST_CHECK( image ); - // ReleasePolicy is deprecated. Only set, but not used internally. + //ReleasePolicy is always never for framebuffer images DALI_TEST_EQUALS( image.GetReleasePolicy(), Image::NEVER, TEST_LOCATION ); END_TEST; diff --git a/dali/internal/event/images/frame-buffer-image-impl.cpp b/dali/internal/event/images/frame-buffer-image-impl.cpp index 734aee0..b7fda19 100644 --- a/dali/internal/event/images/frame-buffer-image-impl.cpp +++ b/dali/internal/event/images/frame-buffer-image-impl.cpp @@ -122,12 +122,6 @@ bool FrameBufferImage::IsNativeFbo() const { return mIsNativeFbo; } - -void FrameBufferImage::SetReleasePolicy( Dali::Image::ReleasePolicy releasePolicy ) -{ - mReleasePolicy = releasePolicy; -} - FrameBufferImage::~FrameBufferImage() { } diff --git a/dali/internal/event/images/frame-buffer-image-impl.h b/dali/internal/event/images/frame-buffer-image-impl.h index ffb778d..42d5872 100644 --- a/dali/internal/event/images/frame-buffer-image-impl.h +++ b/dali/internal/event/images/frame-buffer-image-impl.h @@ -63,12 +63,6 @@ public: */ bool IsNativeFbo() const; - /** - * @brief Required for backwards compatibility. Value is just stored but not used internally. - * @param[in] releasePolicy The release policy (ignored as not supported). - */ - void SetReleasePolicy( Dali::Image::ReleasePolicy releasePolicy ); - public: // From Image /** * @copydoc Dali::Internal::Image::Connect() diff --git a/dali/public-api/images/frame-buffer-image.cpp b/dali/public-api/images/frame-buffer-image.cpp index 028217d..e63aeda 100644 --- a/dali/public-api/images/frame-buffer-image.cpp +++ b/dali/public-api/images/frame-buffer-image.cpp @@ -63,7 +63,7 @@ FrameBufferImage FrameBufferImage::New( unsigned int width, unsigned int height, return FrameBufferImage(internal.Get()); } -FrameBufferImage FrameBufferImage::New( unsigned int width, unsigned int height, Pixel::Format pixelformat, ReleasePolicy releasePolicy, RenderBuffer::Format bufferformat ) +FrameBufferImage FrameBufferImage::New( unsigned int width, unsigned int height, Pixel::Format pixelformat, ReleasePolicy /*releasePolicy*/, RenderBuffer::Format bufferformat ) { Dali::Vector2 stageSize = Stage::GetCurrent().GetSize(); Internal::FrameBufferImagePtr internal = Internal::FrameBufferImage::New( @@ -72,14 +72,12 @@ FrameBufferImage FrameBufferImage::New( unsigned int width, unsigned int height, pixelformat, bufferformat); - internal->SetReleasePolicy( releasePolicy ); return FrameBufferImage(internal.Get()); } -FrameBufferImage FrameBufferImage::New( NativeImageInterface& image, ReleasePolicy releasePolicy ) +FrameBufferImage FrameBufferImage::New( NativeImageInterface& image, ReleasePolicy /*releasePolicy*/ ) { Internal::FrameBufferImagePtr internal = Internal::FrameBufferImage::New( image ); - internal->SetReleasePolicy( releasePolicy ); return FrameBufferImage(internal.Get()); } -- 2.7.4