Rollback "dispose children" and "BaseHandler Equal override function" patches. 56/156856/2
authorFeng Jin <feng16.jin@samsung.com>
Fri, 20 Oct 2017 15:44:27 +0000 (23:44 +0800)
committerFeng Jin <feng16.jin@samsung.com>
Fri, 20 Oct 2017 15:50:42 +0000 (23:50 +0800)
Change-Id: I06475976ae6c5b9da274d5c3e05b956bc517ab85
Signed-off-by: Feng Jin <feng16.jin@samsung.com>
src/Tizen.NUI/src/public/BaseComponents/View.cs
src/Tizen.NUI/src/public/BaseHandle.cs
src/Tizen.NUI/src/public/Layer.cs

index f312226..36f88a7 100755 (executable)
@@ -158,12 +158,6 @@ namespace Tizen.NUI.BaseComponents
 
             base.Dispose(type);
 
-            // Dispose all Children of this View.
-            foreach (View childView in Children)
-            {
-                childView?.Dispose();
-            }
-            Children.Clear();
         }
 
         private void DisConnectFromSignals()
index 7aacc31..d7a1b7e 100755 (executable)
@@ -296,53 +296,6 @@ namespace Tizen.NUI
         }
 
         /// <summary>
-        /// Equals
-        /// </summary>
-        /// <param name="o">The object should be compared.</param>
-        /// <returns>True if equal.</returns>
-        /// <since_tizen> 4 </since_tizen>
-        public override bool Equals(object o)
-        {
-            if(o == null)
-            {
-                return false;
-            }
-            if(!(o is BaseHandle))
-            {
-                return false;
-            }
-            BaseHandle b = (BaseHandle)o;
-            if (!BaseHandle.ReferenceEquals(this, null) && !BaseHandle.ReferenceEquals(b, null))
-            {
-                // drop into native code to see if both handles point to the same body
-                return this.IsEqual(b);
-            }
-
-            if (BaseHandle.ReferenceEquals(this, null) && !BaseHandle.ReferenceEquals(b, null))
-            {
-                if (b.HasBody()) return false;
-                else return true;
-            }
-            if (!BaseHandle.ReferenceEquals(this, null) && BaseHandle.ReferenceEquals(b, null))
-            {
-                if (this.HasBody()) return false;
-                else return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Gets the the hash code of this baseHandle.
-        /// </summary>
-        /// <returns>The Hash Code.</returns>
-        /// <since_tizen> 4 </since_tizen>
-        public override int GetHashCode()
-        {
-            return base.GetHashCode();
-        }
-
-        /// <summary>
         /// Create an instance of BaseHandle.
         /// </summary>
         /// <since_tizen> 3 </since_tizen>
index e7f3391..659aac0 100755 (executable)
@@ -143,12 +143,6 @@ namespace Tizen.NUI
 
             base.Dispose(type);
 
-            // Dispose all Children of this Layer.
-            foreach (View childView in Children)
-            {
-                childView?.Dispose();
-            }
-            Children.Clear();
         }