From: Victor Cebollada <v.cebollada@samsung.com>
Date: Fri, 20 Jun 2014 07:47:24 +0000 (+0100)
Subject: Optimization to reduce Handle size by 50%
X-Git-Tag: dali_1.0.0~32
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=refs%2Fchanges%2F79%2F24179%2F1

Optimization to reduce Handle size by 50%

[problem]      Memory usage is too high, event-thread operations are too heavy.
[cause]        Too much Dali::Handle data copied around.
[solution]     Remove all virtual methods from handles, to avoid needing a C++ vptr

Change-Id: I87c8c526be53413e895a88ac8a355083a4797d8e
Signed-off-by: Adeel Kazmi <adeel.kazmi@samsung.com>
---

diff --git a/base/dali-toolkit/internal/controls/relayout-controller.h b/base/dali-toolkit/internal/controls/relayout-controller.h
index c9463e0..7ec67b8 100644
--- a/base/dali-toolkit/internal/controls/relayout-controller.h
+++ b/base/dali-toolkit/internal/controls/relayout-controller.h
@@ -46,9 +46,11 @@ public:
   RelayoutController();
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~RelayoutController();
+  ~RelayoutController();
 
   /**
    * Request to relayout.
diff --git a/base/dali-toolkit/internal/controls/relayout-helper.h b/base/dali-toolkit/internal/controls/relayout-helper.h
index b356262..15fbfe4 100644
--- a/base/dali-toolkit/internal/controls/relayout-helper.h
+++ b/base/dali-toolkit/internal/controls/relayout-helper.h
@@ -35,12 +35,30 @@ namespace RelayoutHelper
 {
 
 /**
+ * Gets the natural size of the given actor.
  *
+ * If the actor is a Control, it returns the natural size of the Control. @see Control::GetNaturalSize()
+ * If the actor is an ImageActor, it returns the size of the image.
+ * If the actor is a TextActor, it returns the size of the text. @see Font::MeasureText()
+ * Otherwise it returns the actor's current size. @see Actor::GetCurrentSize()
+ *
+ * @param[in] actor The actor.
+ *
+ * @return The natural size.
  */
 Vector3 GetNaturalSize( Actor actor );
 
 /**
+ * Gets the actor's height for the given width.
+ *
+ * If the actor is a Control it returns the height for width. @see Control::GetHeightForWidth()
+ * If the actor is an ImageActor or a TextActor it scales the natural size to fit the given width. @see GetNaturalSize()
+ * Otherwise it returns the actor's current size. @see Actor::GetCurrentSize()
+ *
+ * @param[in] actor The actor.
+ * @param[in] width The width.
  *
+ * @return The actor's height for given width.
  */
 float GetHeightForWidth( Actor actor, float width );
 
diff --git a/base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.h b/base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.h
index f269685..f1e84af 100755
--- a/base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.h
+++ b/base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/scrollable//scroll-component.h>
+#include <dali-toolkit/public-api/controls/scrollable/scroll-component.h>
 #include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
 
 namespace Dali DALI_IMPORT_API
diff --git a/base/dali-toolkit/public-api/builder/builder.h b/base/dali-toolkit/public-api/builder/builder.h
index ee9dc18..cee1458 100644
--- a/base/dali-toolkit/public-api/builder/builder.h
+++ b/base/dali-toolkit/public-api/builder/builder.h
@@ -101,9 +101,11 @@ typedef std::map<std::string, Property::Value> PropertyValueMap;
   static Builder New();
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~Builder();
+  ~Builder();
 
   /**
    * UI string data format
diff --git a/base/dali-toolkit/public-api/builder/json-parser.h b/base/dali-toolkit/public-api/builder/json-parser.h
index 67a2ba6..5ea57e2 100644
--- a/base/dali-toolkit/public-api/builder/json-parser.h
+++ b/base/dali-toolkit/public-api/builder/json-parser.h
@@ -63,10 +63,12 @@ public:
    */
   JsonParser();
 
-  /*
-   * virtual Destructor
+  /**
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~JsonParser();
+  ~JsonParser();
 
   /**
    * Downcast an Object handle to JsonParser if it is a JsonParser.
diff --git a/base/dali-toolkit/public-api/controls/buttons/check-box-button.h b/base/dali-toolkit/public-api/controls/buttons/check-box-button.h
index 545d224..de65310 100644
--- a/base/dali-toolkit/public-api/controls/buttons/check-box-button.h
+++ b/base/dali-toolkit/public-api/controls/buttons/check-box-button.h
@@ -79,10 +79,11 @@ public:
   CheckBoxButton& operator=( const CheckBoxButton& checkBox );
 
   /**
-   * Virtual destructor.
-   * Dali::Object derived classes typically do not contain member data.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~CheckBoxButton();
+  ~CheckBoxButton();
 
   /**
    * Create an initialized CheckBoxButton.
diff --git a/base/dali-toolkit/public-api/controls/control.cpp b/base/dali-toolkit/public-api/controls/control.cpp
index bfa3175..917a5b9 100644
--- a/base/dali-toolkit/public-api/controls/control.cpp
+++ b/base/dali-toolkit/public-api/controls/control.cpp
@@ -179,31 +179,6 @@ Control::KeyEventSignalV2& Control::KeyEventSignal()
   return GetImplementation().KeyEventSignal();
 }
 
-/**
- * @copydoc ConnectionTrackerInterface::SignalConnected
- */
-void Control::SignalConnected( SlotObserver* slotObserver, CallbackBase* callback )
-{
-  GetImplementation().SignalConnected(slotObserver, callback );
-}
-
-/**
- * @copydoc ConnectionTrackerInterface::SignalDisconnected
- */
-void Control::SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback )
-{
-  GetImplementation().SignalDisconnected(slotObserver, callback );
-}
-
-/**
- * @copydoc ConnectionTrackerInterface::GetConnectionCount
- */
-std::size_t Control::GetConnectionCount() const
-{
-  return GetImplementation().GetConnectionCount( );
-}
-
-
 Control::Control(Internal::Control& implementation)
 : CustomActor(implementation)
 {
diff --git a/base/dali-toolkit/public-api/controls/table-view/table-view.h b/base/dali-toolkit/public-api/controls/table-view/table-view.h
index c33c8dd..73cb39a 100644
--- a/base/dali-toolkit/public-api/controls/table-view/table-view.h
+++ b/base/dali-toolkit/public-api/controls/table-view/table-view.h
@@ -81,10 +81,11 @@ public:
   TableView& operator=( const TableView& handle );
 
   /**
-   * Virtual destructor.
-   * Dali::Object derived classes typically do not contain member data.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~TableView();
+  ~TableView();
 
   /**
    * Create the TableView control.
diff --git a/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h b/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h
index 422fe58..5c05b3f 100644
--- a/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h
+++ b/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h
@@ -64,9 +64,11 @@ class KeyInputFocusManager;
   KeyInputFocusManager();
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~KeyInputFocusManager();
+  ~KeyInputFocusManager();
 
   /**
    * Get the singleton of KeyInputFocusManager object.
diff --git a/base/dali-toolkit/public-api/shader-effects/bouncing-effect.h b/base/dali-toolkit/public-api/shader-effects/bouncing-effect.h
index 35398d5..a9e6280 100644
--- a/base/dali-toolkit/public-api/shader-effects/bouncing-effect.h
+++ b/base/dali-toolkit/public-api/shader-effects/bouncing-effect.h
@@ -56,9 +56,11 @@ public:
   BouncingEffect();
 
   /**
-   * @brief Virtual destructor
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~BouncingEffect();
+  ~BouncingEffect();
 
   /**
    * @brief Create a BouncingEffect object
diff --git a/base/dali-toolkit/public-api/styling/style-manager.h b/base/dali-toolkit/public-api/styling/style-manager.h
index b60ed61..6ac2662 100644
--- a/base/dali-toolkit/public-api/styling/style-manager.h
+++ b/base/dali-toolkit/public-api/styling/style-manager.h
@@ -72,9 +72,11 @@ public:
   StyleManager();
 
   /**
-   * @brief Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~StyleManager();
+  ~StyleManager();
 
   /**
    * @brief Get the singleton of StyleManager object.
diff --git a/capi/dali-toolkit/public-api/controls/alignment/alignment.h b/capi/dali-toolkit/public-api/controls/alignment/alignment.h
index f7e70df..737126c 100644
--- a/capi/dali-toolkit/public-api/controls/alignment/alignment.h
+++ b/capi/dali-toolkit/public-api/controls/alignment/alignment.h
@@ -137,11 +137,11 @@ public:
   Alignment(const Alignment& alignment);
 
   /**
-   * @brief Virtual destructor.
+   * @brief Destructor
    *
-   * Dali::Object derived classes typically do not contain member data.
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~Alignment();
+  ~Alignment();
 
   /**
    * @brief Downcast an Object handle to Alignment.
diff --git a/capi/dali-toolkit/public-api/controls/buttons/button.h b/capi/dali-toolkit/public-api/controls/buttons/button.h
index 62ad4e1..767536a 100644
--- a/capi/dali-toolkit/public-api/controls/buttons/button.h
+++ b/capi/dali-toolkit/public-api/controls/buttons/button.h
@@ -94,11 +94,11 @@ public:
   static Button DownCast( BaseHandle handle );
 
   /**
-   * @brief Virtual destructor.
+   * @brief Destructor
    *
-   * Dali::Object derived classes typically do not contain member data.
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~Button();
+  ~Button();
 
   /**
    * @brief Sets the button as \e dimmed.
diff --git a/capi/dali-toolkit/public-api/controls/buttons/push-button.h b/capi/dali-toolkit/public-api/controls/buttons/push-button.h
index 59b05f2..30bad26 100644
--- a/capi/dali-toolkit/public-api/controls/buttons/push-button.h
+++ b/capi/dali-toolkit/public-api/controls/buttons/push-button.h
@@ -123,11 +123,11 @@ public:
   PushButton& operator=( const PushButton& pushButton );
 
   /**
-   * @brief Virtual destructor.
+   * @brief Destructor
    *
-   * Dali::Object derived classes typically do not contain member data.
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~PushButton();
+  ~PushButton();
 
   /**
    * @brief Create an initialized PushButton.
diff --git a/capi/dali-toolkit/public-api/controls/cluster/cluster-style.h b/capi/dali-toolkit/public-api/controls/cluster/cluster-style.h
index 05ea5d2..77cfacc 100644
--- a/capi/dali-toolkit/public-api/controls/cluster/cluster-style.h
+++ b/capi/dali-toolkit/public-api/controls/cluster/cluster-style.h
@@ -58,9 +58,11 @@ public:
 public:
 
   /**
-   * @brief Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~ClusterStyle();
+  ~ClusterStyle();
 
   /**
    * @brief Query the maximum number of children this Style can handle.
diff --git a/capi/dali-toolkit/public-api/controls/control.h b/capi/dali-toolkit/public-api/controls/control.h
index 6fcc7a1..36e4635 100644
--- a/capi/dali-toolkit/public-api/controls/control.h
+++ b/capi/dali-toolkit/public-api/controls/control.h
@@ -45,7 +45,7 @@ class Control;
  * The implementation of the control must be supplied; see Internal::Control for more details.
  * @see Internal::Control
  */
-class Control : public CustomActor, public ConnectionTrackerInterface
+class Control : public CustomActor
 {
 public:
 
@@ -134,11 +134,11 @@ public: // Creation & Destruction
   Control(const Control& uiControl);
 
   /**
-   * @brief Virtual destructor.
+   * @brief Dali::Control is intended as a base class
    *
-   * Dali::Object derived classes do not contain member data.
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~Control();
+  ~Control();
 
 public: // operators
 
@@ -372,23 +372,6 @@ public:
    */
   KeyEventSignalV2& KeyEventSignal();
 
-protected:
-
-  /**
-   * @copydoc ConnectionTrackerInterface::SignalConnected
-   */
-  virtual void SignalConnected( SlotObserver* slotObserver, CallbackBase* callback );
-
-  /**
-   * @copydoc ConnectionTrackerInterface::SignalDisconnected
-   */
-  virtual void SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback );
-
-  /**
-   * @copydoc ConnectionTrackerInterface::GetConnectionCount
-   */
-  virtual std::size_t GetConnectionCount() const;
-
 public: // Not intended for application developers
 
   /**
diff --git a/capi/dali-toolkit/public-api/controls/image-view/masked-image-view.h b/capi/dali-toolkit/public-api/controls/image-view/masked-image-view.h
index 6502949..3fc5f33 100644
--- a/capi/dali-toolkit/public-api/controls/image-view/masked-image-view.h
+++ b/capi/dali-toolkit/public-api/controls/image-view/masked-image-view.h
@@ -123,11 +123,11 @@ public:
   MaskedImageView& operator=( const MaskedImageView& handle );
 
   /**
-   * @brief Virtual destructor.
+   * @brief Destructor
    *
-   * Dali::Object derived classes typically do not contain member data.
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~MaskedImageView();
+  ~MaskedImageView();
 
   /**
    * @brief Create the MaskedImageView control.
diff --git a/capi/dali-toolkit/public-api/controls/popup/popup.h b/capi/dali-toolkit/public-api/controls/popup/popup.h
index 5758a9d..d147c4d 100644
--- a/capi/dali-toolkit/public-api/controls/popup/popup.h
+++ b/capi/dali-toolkit/public-api/controls/popup/popup.h
@@ -125,11 +125,11 @@ public:
   Popup& operator=( const Popup& handle );
 
   /**
-   * @brief Virtual destructor.
+   * @brief Destructor
    *
-   * Dali::Object derived classes typically do not contain member data.
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~Popup();
+  ~Popup();
 
   /**
    * @brief Create the Poup control.
diff --git a/capi/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h b/capi/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h
index a433997..d67b9c0 100755
--- a/capi/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h
+++ b/capi/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h
@@ -83,10 +83,11 @@ public:
   ScrollBar& operator=( const ScrollBar& scrollBar );
 
   /**
-   * @brief Virtual destructor.
-   * Dali::Object derived classes typically do not contain member data.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~ScrollBar();
+  ~ScrollBar();
 
   /**
    * @brief Create an initialized ScrollBar
diff --git a/capi/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h b/capi/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h
index 61c7265..3b31c91 100644
--- a/capi/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h
+++ b/capi/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h
@@ -76,11 +76,11 @@ public:
   ItemView& operator=( const ItemView& itemView );
 
   /**
-   * @brief Virtual destructor.
+   * @brief Destructor
    *
-   * Dali::Object derived classes typically do not contain member data.
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~ItemView();
+  ~ItemView();
 
   /**
    * @brief Create an initialized ItemView.
diff --git a/capi/dali-toolkit/public-api/controls/scrollable/scroll-component.h b/capi/dali-toolkit/public-api/controls/scrollable/scroll-component.h
index a3ee3f0..2745572 100644
--- a/capi/dali-toolkit/public-api/controls/scrollable/scroll-component.h
+++ b/capi/dali-toolkit/public-api/controls/scrollable/scroll-component.h
@@ -56,10 +56,11 @@ public:
   ScrollComponent& operator=( const ScrollComponent& scrollComponent );
 
   /**
-   * Virtual destructor.
-   * Dali::Object derived classes typically do not contain member data.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~ScrollComponent();
+  ~ScrollComponent();
 
   /**
    * Downcast an Object handle to ScrollComponent. If handle points to a ScrollComponent the
diff --git a/capi/dali-toolkit/public-api/controls/scrollable/scroll-connector.h b/capi/dali-toolkit/public-api/controls/scrollable/scroll-connector.h
index c8ac206..6960b4b 100644
--- a/capi/dali-toolkit/public-api/controls/scrollable/scroll-connector.h
+++ b/capi/dali-toolkit/public-api/controls/scrollable/scroll-connector.h
@@ -93,9 +93,11 @@ public:
   using Dali::BaseHandle::operator=;
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~ScrollConnector();
+  ~ScrollConnector();
 
   /**
    * Downcast a BaseHandle to ScrollConnector handle.
diff --git a/capi/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h b/capi/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h
index 6592fd6..58fbbfc 100644
--- a/capi/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h
+++ b/capi/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h
@@ -137,11 +137,6 @@ public:
   Ruler();
 
   /**
-   * @brief Destructor - A reference counted object may only be deleted by calling Unreference().
-   */
-  virtual ~Ruler();
-
-  /**
    * @brief Snaps (x) in accordance to the ruler settings.
    *
    * @param[in] x The input value on the ruler to be snapped.
@@ -296,6 +291,13 @@ public:
 
 protected:
 
+  /**
+   * @brief Destructor - A reference counted object may only be deleted by calling Unreference().
+   */
+  virtual ~Ruler();
+
+protected:
+
   RulerType mType;               ///< Type of Ruler (Fixed or Free).
   bool mEnabled;                 ///< If the ruler is enabled.
   RulerDomain mDomain;           ///< The domain of the ruler.
@@ -490,11 +492,11 @@ public:
   ScrollView& operator=( const ScrollView& handle );
 
   /**
-   * @brief Virtual destructor.
+   * @brief Destructor
    *
-   * Dali::Object derived classes typically do not contain member data.
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~ScrollView();
+  ~ScrollView();
 
   /**
    * @brief Create an initialized ScrollView.
diff --git a/capi/dali-toolkit/public-api/controls/scrollable/scrollable.h b/capi/dali-toolkit/public-api/controls/scrollable/scrollable.h
index 2aee4f1..5ecec0d 100644
--- a/capi/dali-toolkit/public-api/controls/scrollable/scrollable.h
+++ b/capi/dali-toolkit/public-api/controls/scrollable/scrollable.h
@@ -165,11 +165,11 @@ public:
   Scrollable& operator=( const Scrollable& handle );
 
   /**
-   * @brief Virtual destructor.
+   * @brief Destructor
    *
-   * Dali::Object derived classes typically do not contain member data.
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~Scrollable();
+  ~Scrollable();
 
   /**
    * @brief Downcast an Object handle to Scrollable.
diff --git a/capi/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h b/capi/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h
index c0670bd..26ae109 100644
--- a/capi/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h
+++ b/capi/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h
@@ -100,9 +100,11 @@ public:
   SuperBlurView& operator=( const SuperBlurView& rhs );
 
   /**
-   * @brief Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~SuperBlurView();
+  ~SuperBlurView();
 
   /**
    * @brief Downcast an Object handle to SuperBlurView.
diff --git a/capi/dali-toolkit/public-api/controls/text-input/text-input.h b/capi/dali-toolkit/public-api/controls/text-input/text-input.h
index 57c51ba..6cce464 100644
--- a/capi/dali-toolkit/public-api/controls/text-input/text-input.h
+++ b/capi/dali-toolkit/public-api/controls/text-input/text-input.h
@@ -122,11 +122,11 @@ public:
   static TextInput DownCast( BaseHandle handle );
 
   /**
-   * @brief Virtual destructor.
+   * @brief Destructor
    *
-   * Dali::Object derived classes typically do not contain member data.
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~TextInput();
+  ~TextInput();
 
   /**
    * @brief Get the inputed text currently being displayed.
diff --git a/capi/dali-toolkit/public-api/controls/text-view/text-view.h b/capi/dali-toolkit/public-api/controls/text-view/text-view.h
index bbad023..b8b8e2a 100644
--- a/capi/dali-toolkit/public-api/controls/text-view/text-view.h
+++ b/capi/dali-toolkit/public-api/controls/text-view/text-view.h
@@ -307,11 +307,11 @@ public:
   static TextView DownCast( BaseHandle handle );
 
   /**
-   * @brief Virtual destructor.
+   * @brief Destructor
    *
-   * Dali::Object derived classes typically do not contain member data.
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~TextView();
+  ~TextView();
 
   /**
    * @brief Replace the current text with a new text string.
diff --git a/capi/dali-toolkit/public-api/factory/localized-control-factory.h b/capi/dali-toolkit/public-api/factory/localized-control-factory.h
index 4fcd81d..1c900a9 100644
--- a/capi/dali-toolkit/public-api/factory/localized-control-factory.h
+++ b/capi/dali-toolkit/public-api/factory/localized-control-factory.h
@@ -76,9 +76,11 @@ private:
   LocalizedControlFactory();
 
   /**
-   * @brief Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~LocalizedControlFactory();
+  ~LocalizedControlFactory();
 
   /**
    * @brief Get the singleton of LocalizedControlFactory object.
diff --git a/capi/dali-toolkit/public-api/focus-manager/focus-manager.h b/capi/dali-toolkit/public-api/focus-manager/focus-manager.h
index 0c465bb..aee3045 100644
--- a/capi/dali-toolkit/public-api/focus-manager/focus-manager.h
+++ b/capi/dali-toolkit/public-api/focus-manager/focus-manager.h
@@ -99,9 +99,11 @@ public:
   FocusManager();
 
   /**
-   * @brief Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~FocusManager();
+  ~FocusManager();
 
   /**
    * @brief Get the singleton of FocusManager object.
diff --git a/capi/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h b/capi/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h
index 6cad036..f891e11 100644
--- a/capi/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h
+++ b/capi/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h
@@ -78,9 +78,11 @@ public:
   KeyboardFocusManager();
 
   /**
-   * @brief Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~KeyboardFocusManager();
+  ~KeyboardFocusManager();
 
   /**
    * @brief Get the singleton of KeyboardFocusManager object.
diff --git a/capi/dali-toolkit/public-api/shader-effects/dissolve-effect.h b/capi/dali-toolkit/public-api/shader-effects/dissolve-effect.h
index 7b51caf..4ec8f9e 100644
--- a/capi/dali-toolkit/public-api/shader-effects/dissolve-effect.h
+++ b/capi/dali-toolkit/public-api/shader-effects/dissolve-effect.h
@@ -47,9 +47,11 @@ public:
   DissolveEffect();
 
   /**
-   * @brief Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~DissolveEffect();
+  ~DissolveEffect();
 
   /**
    * @brief Create an initialized DissolveEffect.
diff --git a/capi/dali-toolkit/public-api/shader-effects/image-region-effect.h b/capi/dali-toolkit/public-api/shader-effects/image-region-effect.h
index ad6ce54..7dd2b8c 100644
--- a/capi/dali-toolkit/public-api/shader-effects/image-region-effect.h
+++ b/capi/dali-toolkit/public-api/shader-effects/image-region-effect.h
@@ -47,9 +47,11 @@ public:
   ImageRegionEffect();
 
   /**
-   * @brief Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~ImageRegionEffect();
+  ~ImageRegionEffect();
 
   /**
    * @brief Create an initialized ImageRegionEffect.
diff --git a/capi/dali-toolkit/public-api/shader-effects/iris-effect.h b/capi/dali-toolkit/public-api/shader-effects/iris-effect.h
index bb1050e..dd0e68b 100644
--- a/capi/dali-toolkit/public-api/shader-effects/iris-effect.h
+++ b/capi/dali-toolkit/public-api/shader-effects/iris-effect.h
@@ -48,9 +48,11 @@ public:
   IrisEffect();
 
   /**
-   * @brief Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~IrisEffect();
+  ~IrisEffect();
 
   /**
    * @brief Create an initialized IrisEffect.
diff --git a/capi/dali-toolkit/public-api/shader-effects/mask-effect.h b/capi/dali-toolkit/public-api/shader-effects/mask-effect.h
index 077d005..3c3d2d4 100644
--- a/capi/dali-toolkit/public-api/shader-effects/mask-effect.h
+++ b/capi/dali-toolkit/public-api/shader-effects/mask-effect.h
@@ -53,9 +53,11 @@ public:
   MaskEffect();
 
   /**
-   * @brief Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~MaskEffect();
+  ~MaskEffect();
 
   /**
    * @brief Create a MaskEffect.
diff --git a/capi/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h b/capi/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h
index a55d2c3..bc86733 100644
--- a/capi/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h
+++ b/capi/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h
@@ -51,9 +51,11 @@ public:
   PageTurnBookSpineEffect();
 
   /**
-   * @brief Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~PageTurnBookSpineEffect();
+  ~PageTurnBookSpineEffect();
 
   /**
    * @brief Create an initialized PageTurnBookSpineEffect.
diff --git a/capi/dali-toolkit/public-api/shader-effects/page-turn-effect.h b/capi/dali-toolkit/public-api/shader-effects/page-turn-effect.h
index adfdab9..970e091 100644
--- a/capi/dali-toolkit/public-api/shader-effects/page-turn-effect.h
+++ b/capi/dali-toolkit/public-api/shader-effects/page-turn-effect.h
@@ -84,9 +84,11 @@ public:
   PageTurnEffect();
 
   /**
-   * @brief Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~PageTurnEffect();
+  ~PageTurnEffect();
 
   /**
    * @brief Create an initialized PageTurnEffect.
diff --git a/capi/dali-toolkit/public-api/shader-effects/ripple-effect.h b/capi/dali-toolkit/public-api/shader-effects/ripple-effect.h
index 17638f2..1f7e597 100644
--- a/capi/dali-toolkit/public-api/shader-effects/ripple-effect.h
+++ b/capi/dali-toolkit/public-api/shader-effects/ripple-effect.h
@@ -47,9 +47,11 @@ public:
   RippleEffect();
 
   /**
-   * @brief Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~RippleEffect();
+  ~RippleEffect();
 
   /**
    * @brief Create an initialized RippleEffect.
diff --git a/capi/dali-toolkit/public-api/shader-effects/ripple2d-effect.h b/capi/dali-toolkit/public-api/shader-effects/ripple2d-effect.h
index a03aa8c..67eda39 100644
--- a/capi/dali-toolkit/public-api/shader-effects/ripple2d-effect.h
+++ b/capi/dali-toolkit/public-api/shader-effects/ripple2d-effect.h
@@ -47,9 +47,11 @@ public:
   Ripple2DEffect();
 
   /**
-   * @brief Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~Ripple2DEffect();
+  ~Ripple2DEffect();
 
   /**
    * @brief Create an initialized Ripple2DEffect.
diff --git a/capi/dali-toolkit/public-api/shader-effects/swirl-effect.h b/capi/dali-toolkit/public-api/shader-effects/swirl-effect.h
index 81ace19..11713c1 100644
--- a/capi/dali-toolkit/public-api/shader-effects/swirl-effect.h
+++ b/capi/dali-toolkit/public-api/shader-effects/swirl-effect.h
@@ -47,9 +47,11 @@ public:
   SwirlEffect();
 
   /**
-   * @brief Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~SwirlEffect();
+  ~SwirlEffect();
 
   /**
    * @brief Create an initialized SwirlEffect.
diff --git a/optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h b/optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h
index d5868ee..b1d3a41 100644
--- a/optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h
+++ b/optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h
@@ -51,9 +51,11 @@ public:
   FullAreaImageCreator(){}
 
   /**
-   * virtual destructor
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~FullAreaImageCreator(){}
+  ~FullAreaImageCreator(){}
 
   /**
    * Create an initialized FullAreaImageCreator.
diff --git a/optional/dali-toolkit/public-api/controls/bloom-view/bloom-view.h b/optional/dali-toolkit/public-api/controls/bloom-view/bloom-view.h
index eed3761..7edfc14 100644
--- a/optional/dali-toolkit/public-api/controls/bloom-view/bloom-view.h
+++ b/optional/dali-toolkit/public-api/controls/bloom-view/bloom-view.h
@@ -109,9 +109,11 @@ public:
   BloomView& operator=(const BloomView& ZoomView);
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~BloomView();
+  ~BloomView();
 
   /**
    * Downcast an Object handle to BloomView. If handle points to a BloomView the
diff --git a/optional/dali-toolkit/public-api/controls/cluster/cluster.h b/optional/dali-toolkit/public-api/controls/cluster/cluster.h
index 459cf57..8ab3ddb 100644
--- a/optional/dali-toolkit/public-api/controls/cluster/cluster.h
+++ b/optional/dali-toolkit/public-api/controls/cluster/cluster.h
@@ -69,10 +69,11 @@ public:
   Cluster& operator=( const Cluster& cluster );
 
   /**
-   * Virtual destructor.
-   * Dali::Object derived classes typically do not contain member data.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~Cluster();
+  ~Cluster();
 
   /**
    * Create the Cluster control with the given style.
diff --git a/optional/dali-toolkit/public-api/controls/effects-view/effects-view.h b/optional/dali-toolkit/public-api/controls/effects-view/effects-view.h
index c16f2e9..a742252 100644
--- a/optional/dali-toolkit/public-api/controls/effects-view/effects-view.h
+++ b/optional/dali-toolkit/public-api/controls/effects-view/effects-view.h
@@ -109,10 +109,11 @@ public:
   static EffectsView DownCast( BaseHandle handle );
 
   /**
-   * Virtual destructor.
-   * Dali::Object derived classes typically do not contain member data.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~EffectsView();
+  ~EffectsView();
 
 public:
 
diff --git a/optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h b/optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h
index df616ee..ea80385 100644
--- a/optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h
+++ b/optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h
@@ -113,9 +113,11 @@ public:
   GaussianBlurView& operator=(const GaussianBlurView& ZoomView);
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~GaussianBlurView();
+  ~GaussianBlurView();
 
   /**
    * Downcast an Object handle to GaussianBlurView. If handle points to a GaussianBlurView the
diff --git a/optional/dali-toolkit/public-api/controls/image-view/image-view.h b/optional/dali-toolkit/public-api/controls/image-view/image-view.h
index 8927bfa..dee9e41 100644
--- a/optional/dali-toolkit/public-api/controls/image-view/image-view.h
+++ b/optional/dali-toolkit/public-api/controls/image-view/image-view.h
@@ -88,10 +88,11 @@ public:
   ImageView& operator=( const ImageView& handle );
 
   /**
-   * Virtual destructor.
-   * Dali::Object derived classes typically do not contain member data.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~ImageView();
+  ~ImageView();
 
   /**
    * Create the Poup control
diff --git a/optional/dali-toolkit/public-api/controls/magnifier/magnifier.h b/optional/dali-toolkit/public-api/controls/magnifier/magnifier.h
index 7aad636..0f62504 100644
--- a/optional/dali-toolkit/public-api/controls/magnifier/magnifier.h
+++ b/optional/dali-toolkit/public-api/controls/magnifier/magnifier.h
@@ -68,10 +68,11 @@ public:
   Magnifier& operator=( const Magnifier& handle );
 
   /**
-   * Virtual destructor.
-   * Dali::Object derived classes typically do not contain member data.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~Magnifier();
+  ~Magnifier();
 
   /**
    * Create the Poup control
diff --git a/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h b/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h
index b42e64f..be49931 100644
--- a/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h
+++ b/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h
@@ -102,9 +102,11 @@ public:
   NavigationControl& operator=( const NavigationControl& handle );
 
   /**
-   * virtual Destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~NavigationControl();
+  ~NavigationControl();
 
   /**
    * Create an initialized NavigationControl.
diff --git a/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h b/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h
index df697dc..00f99d9 100644
--- a/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h
+++ b/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h
@@ -56,10 +56,11 @@ public:
   PageTurnLandscapeView& operator=( const PageTurnLandscapeView& pageTurnLandscapeView );
 
   /**
-   * Virtual destructor.
-   * Dali::Object derived classes typically do not contain member data.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~PageTurnLandscapeView();
+  ~PageTurnLandscapeView();
 
   /**
    * Create an initialized PageTurnLandscapeView control
diff --git a/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h b/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h
index 93cda07..1af8bf5 100644
--- a/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h
+++ b/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h
@@ -56,10 +56,11 @@ public:
   PageTurnPortraitView& operator=( const PageTurnPortraitView& pageTurnPortraitView );
 
   /**
-   * Virtual destructor.
-   * Dali::Object derived classes typically do not contain member data.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~PageTurnPortraitView();
+  ~PageTurnPortraitView();
 
   /**
    * Create an initialized  PageTurnPortraitView control
diff --git a/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h b/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h
index 39b91da..b91aeec 100644
--- a/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h
+++ b/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h
@@ -74,9 +74,11 @@ public:
   PageTurnView& operator=( const PageTurnView& handle );
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~PageTurnView();
+  ~PageTurnView();
 
   /**
    * Downcast an Object handle to PageTurnView.
diff --git a/optional/dali-toolkit/public-api/controls/selectors/rotating-selector.h b/optional/dali-toolkit/public-api/controls/selectors/rotating-selector.h
index 5ce4726..747c700 100644
--- a/optional/dali-toolkit/public-api/controls/selectors/rotating-selector.h
+++ b/optional/dali-toolkit/public-api/controls/selectors/rotating-selector.h
@@ -62,8 +62,9 @@ public:
   RotatingSelector& operator=( const RotatingSelector& rotatingSelector );
 
   /**
-   * Virtual destructor.
-   * Dali::Object derived classes typically do not contain member data.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
   ~RotatingSelector();
 
diff --git a/optional/dali-toolkit/public-api/controls/shadow-view/shadow-view.h b/optional/dali-toolkit/public-api/controls/shadow-view/shadow-view.h
index 7bd2cf9..0013ab5 100644
--- a/optional/dali-toolkit/public-api/controls/shadow-view/shadow-view.h
+++ b/optional/dali-toolkit/public-api/controls/shadow-view/shadow-view.h
@@ -122,9 +122,11 @@ public:
   ShadowView& operator=(const ShadowView& view);
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~ShadowView();
+  ~ShadowView();
 
   /**
    * Downcast an Object handle to ShadowView. If handle points to a ShadowView the
diff --git a/optional/dali-toolkit/public-api/controls/slider/slider.h b/optional/dali-toolkit/public-api/controls/slider/slider.h
index efdaf5a..4f111dc 100644
--- a/optional/dali-toolkit/public-api/controls/slider/slider.h
+++ b/optional/dali-toolkit/public-api/controls/slider/slider.h
@@ -96,10 +96,11 @@ public:
   Slider& operator=( const Slider& handle );
 
   /**
-   * Virtual destructor.
-   * Dali::Object derived classes typically do not contain member data.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~Slider();
+  ~Slider();
 
   /**
    * Downcast an Object handle to Slider. If handle points to a Slider the
diff --git a/optional/dali-toolkit/public-api/controls/tool-bar/tool-bar.h b/optional/dali-toolkit/public-api/controls/tool-bar/tool-bar.h
index 6fc2e61..76653be 100644
--- a/optional/dali-toolkit/public-api/controls/tool-bar/tool-bar.h
+++ b/optional/dali-toolkit/public-api/controls/tool-bar/tool-bar.h
@@ -68,9 +68,11 @@ public:
   ToolBar& operator=( const ToolBar& handle );
 
   /**
-   * virtual Destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~ToolBar();
+  ~ToolBar();
 
   /**
    * Create an initialized ToolBar.
diff --git a/optional/dali-toolkit/public-api/controls/view/view.h b/optional/dali-toolkit/public-api/controls/view/view.h
index 50d072b..0371b92 100644
--- a/optional/dali-toolkit/public-api/controls/view/view.h
+++ b/optional/dali-toolkit/public-api/controls/view/view.h
@@ -101,9 +101,11 @@ public:
   View& operator=( const View& handle );
 
   /**
-   * virtual Destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~View();
+  ~View();
 
   /**
    * Create an initialized View.
diff --git a/optional/dali-toolkit/public-api/shader-effects/alpha-discard-effect.h b/optional/dali-toolkit/public-api/shader-effects/alpha-discard-effect.h
index 9eca0fc..abc1f59 100644
--- a/optional/dali-toolkit/public-api/shader-effects/alpha-discard-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/alpha-discard-effect.h
@@ -47,9 +47,11 @@ public:
   AlphaDiscardEffect();
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~AlphaDiscardEffect();
+  ~AlphaDiscardEffect();
 
   /**
    * Create a AlphaDiscardEffect.
diff --git a/optional/dali-toolkit/public-api/shader-effects/bendy-effect.h b/optional/dali-toolkit/public-api/shader-effects/bendy-effect.h
index 2b24814..f073fed 100644
--- a/optional/dali-toolkit/public-api/shader-effects/bendy-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/bendy-effect.h
@@ -41,9 +41,11 @@ public:
   BendyEffect();
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~BendyEffect();
+  ~BendyEffect();
 
   /**
    * Create an initialized BendyEffect.
diff --git a/optional/dali-toolkit/public-api/shader-effects/blind-effect.h b/optional/dali-toolkit/public-api/shader-effects/blind-effect.h
index 38ed14f..6968611 100644
--- a/optional/dali-toolkit/public-api/shader-effects/blind-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/blind-effect.h
@@ -41,9 +41,11 @@ public:
   BlindEffect();
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~BlindEffect();
+  ~BlindEffect();
 
   /**
    * Create an initialized ~BlindEffect.
diff --git a/optional/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h b/optional/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h
index 3d0b5a3..69a1c3a 100644
--- a/optional/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h
@@ -41,9 +41,11 @@ public:
   BubbleEffect();
 
   /**
-   * Virtual destructor
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~BubbleEffect();
+  ~BubbleEffect();
 
   /**
    * Create an initialized BubbleEffect
diff --git a/optional/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h b/optional/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h
index ab393f7..0dac3e5 100644
--- a/optional/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h
+++ b/optional/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h
@@ -40,9 +40,11 @@ public:
   ColorAdjuster();
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~ColorAdjuster();
+  ~ColorAdjuster();
 
   /**
    * Create an initialized ColorAdjuster.
diff --git a/optional/dali-toolkit/public-api/shader-effects/carousel-effect.h b/optional/dali-toolkit/public-api/shader-effects/carousel-effect.h
index edd57e7..9e899ef 100644
--- a/optional/dali-toolkit/public-api/shader-effects/carousel-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/carousel-effect.h
@@ -51,9 +51,11 @@ public:
   CarouselEffect();
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~CarouselEffect();
+  ~CarouselEffect();
 
   /**
    * Create an initialized CarouselEffect.
diff --git a/optional/dali-toolkit/public-api/shader-effects/displacement-effect.h b/optional/dali-toolkit/public-api/shader-effects/displacement-effect.h
index d787ac8..7f7e2ec 100644
--- a/optional/dali-toolkit/public-api/shader-effects/displacement-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/displacement-effect.h
@@ -88,9 +88,11 @@ public:
   DisplacementEffect();
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~DisplacementEffect();
+  ~DisplacementEffect();
 
   /**
    * Create an initialized DisplacementEffect
diff --git a/optional/dali-toolkit/public-api/shader-effects/dissolve-local-effect.h b/optional/dali-toolkit/public-api/shader-effects/dissolve-local-effect.h
index 0ab784f..7b01b59 100644
--- a/optional/dali-toolkit/public-api/shader-effects/dissolve-local-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/dissolve-local-effect.h
@@ -41,9 +41,11 @@ public:
   DissolveLocalEffect();
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~DissolveLocalEffect();
+  ~DissolveLocalEffect();
 
   /**
    * Create an initialized DissolveLocalEffect.
diff --git a/optional/dali-toolkit/public-api/shader-effects/distance-field-effect.h b/optional/dali-toolkit/public-api/shader-effects/distance-field-effect.h
index ea034af..17904a2 100644
--- a/optional/dali-toolkit/public-api/shader-effects/distance-field-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/distance-field-effect.h
@@ -41,9 +41,11 @@ public:
   DistanceFieldEffect();
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~DistanceFieldEffect();
+  ~DistanceFieldEffect();
 
   /**
    * Create an initialized DistanceFieldEffect.
diff --git a/optional/dali-toolkit/public-api/shader-effects/mirror-effect.h b/optional/dali-toolkit/public-api/shader-effects/mirror-effect.h
index 9b1bdf7..3e9ebab 100644
--- a/optional/dali-toolkit/public-api/shader-effects/mirror-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/mirror-effect.h
@@ -41,9 +41,11 @@ public:
   MirrorEffect();
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~MirrorEffect();
+  ~MirrorEffect();
 
   /**
    * Create an initialized MirrorEffect.
diff --git a/optional/dali-toolkit/public-api/shader-effects/motion-blur-effect.h b/optional/dali-toolkit/public-api/shader-effects/motion-blur-effect.h
index 19b9ea6..053531b 100644
--- a/optional/dali-toolkit/public-api/shader-effects/motion-blur-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/motion-blur-effect.h
@@ -57,9 +57,11 @@ public:
   MotionBlurEffect();
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~MotionBlurEffect();
+  ~MotionBlurEffect();
 
   /**
    * Create an initialized MotionBlurEffect
diff --git a/optional/dali-toolkit/public-api/shader-effects/motion-stretch-effect.h b/optional/dali-toolkit/public-api/shader-effects/motion-stretch-effect.h
index 3747786..e097748 100644
--- a/optional/dali-toolkit/public-api/shader-effects/motion-stretch-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/motion-stretch-effect.h
@@ -56,9 +56,11 @@ public:
   MotionStretchEffect();
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~MotionStretchEffect();
+  ~MotionStretchEffect();
 
   /**
    * Create an initialized MotionStretchEffect
diff --git a/optional/dali-toolkit/public-api/shader-effects/overlay-effect.h b/optional/dali-toolkit/public-api/shader-effects/overlay-effect.h
index 8fd9694..1f9e41e 100644
--- a/optional/dali-toolkit/public-api/shader-effects/overlay-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/overlay-effect.h
@@ -47,9 +47,11 @@ public:
   OverlayEffect();
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~OverlayEffect();
+  ~OverlayEffect();
 
   /**
    * Create a OverlayEffect.
diff --git a/optional/dali-toolkit/public-api/shader-effects/shear-effect.h b/optional/dali-toolkit/public-api/shader-effects/shear-effect.h
index 48c3b5d..780d2ce 100644
--- a/optional/dali-toolkit/public-api/shader-effects/shear-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/shear-effect.h
@@ -41,9 +41,11 @@ public:
   ShearEffect();
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~ShearEffect();
+  ~ShearEffect();
 
   /**
    * Create an initialized ShearEffect.
diff --git a/optional/dali-toolkit/public-api/shader-effects/soft-button-effect.h b/optional/dali-toolkit/public-api/shader-effects/soft-button-effect.h
index 0517f61..ae54df0 100644
--- a/optional/dali-toolkit/public-api/shader-effects/soft-button-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/soft-button-effect.h
@@ -61,9 +61,11 @@ public:
   SoftButtonEffect();
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~SoftButtonEffect();
+  ~SoftButtonEffect();
 
   typedef enum
   {
diff --git a/optional/dali-toolkit/public-api/shader-effects/spot-effect.h b/optional/dali-toolkit/public-api/shader-effects/spot-effect.h
index 24fac72..c435dd9 100644
--- a/optional/dali-toolkit/public-api/shader-effects/spot-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/spot-effect.h
@@ -41,9 +41,11 @@ public:
   SpotEffect();
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~SpotEffect();
+  ~SpotEffect();
 
   /**
    * Create an initialized SpotEffect.
diff --git a/optional/dali-toolkit/public-api/shader-effects/square-dissolve-effect.h b/optional/dali-toolkit/public-api/shader-effects/square-dissolve-effect.h
index d5ba25c..d8db126 100644
--- a/optional/dali-toolkit/public-api/shader-effects/square-dissolve-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/square-dissolve-effect.h
@@ -41,9 +41,11 @@ public:
   SquareDissolveEffect();
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~SquareDissolveEffect();
+  ~SquareDissolveEffect();
 
   /**
    * Create an initialized SquareDissolveEffect.
diff --git a/optional/dali-toolkit/public-api/shader-effects/water-effect.h b/optional/dali-toolkit/public-api/shader-effects/water-effect.h
index 3713721..e40ea54 100644
--- a/optional/dali-toolkit/public-api/shader-effects/water-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/water-effect.h
@@ -65,9 +65,11 @@ public:
   WaterEffect();
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~WaterEffect();
+  ~WaterEffect();
 
   /**
    * Create an initialized WaterEffect.