* Managed.Windows.Forms/System.Windows.Forms/HtmlDocument.cs,

  Managed.Windows.Forms/System.Windows.Forms/HtmlElement.cs,
  Managed.Windows.Forms/System.Windows.Forms/HtmlWindow.cs,
  Mono.WebBrowser/Mono.Mozilla/DOM/Document.cs,
  Mono.WebBrowser/Mono.Mozilla/DOM/Element.cs,
  Mono.WebBrowser/Mono.Mozilla/DOM/Node.cs,
  Mono.WebBrowser/Mono.Mozilla/DOM/Window.cs,
  Mono.WebBrowser/Mono.WebBrowser/DOM/IDocument.cs,
  Mono.WebBrowser/Mono.WebBrowser/DOM/IElement.cs,
  Mono.WebBrowser/Mono.WebBrowser/DOM/INode.cs,
  Mono.WebBrowser/Mono.WebBrowser/DOM/IWindow.cs: Fix equality operators (fixes #428173)

2008-10-22  Andreia Gaita  <shana@jitted.com>

svn path=/trunk/mcs/; revision=116757

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 87afb10e45dfdc82554b0493a43628642789d94f..4b32e11d6eb7235d4334cbf19533ff4f70795d31 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-22  Andreia Gaita  <shana@jitted.com>
+
+       * HtmlDocument.cs,
+         HtmlElement.cs,
+         HtmlWindow.cs: Fix equality operators (fixes #428173)
+
 2008-10-21  Jonathan Pobst  <monkey@jpobst.com>
 
        * XplatUIWin32.cs: Apply patch from John Mortlock that ensures

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlDocument.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlDocument.cs
index 46b5661d610991e7f9654179ab5aae9385e804e8..b670f69b2d7b56f1936b70bf56ca2694fbc25601 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlDocument.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlDocument.cs
@@ -147,7 +147,7 @@ namespace System.Windows.Forms
                                return false;
                        }
 
-                       return left.Equals (right); 
+                       return left.document.Equals (right.document); 
                }
 
                public static bool operator !=(HtmlDocument left, HtmlDocument right) {

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlElement.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlElement.cs
index 5e1411fd1fe9255732312966eb6620e39dfcd385..c2f1c74f47a7f0fb6bba41c89a6b0e4497d841cf 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlElement.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlElement.cs
@@ -299,7 +299,7 @@ namespace System.Windows.Forms
                                return true;\r
                        if ((object)left == null || (object)right == null)\r
                                return false;\r
-                       return left.Equals (right); \r
+                       return left.element.Equals (right.element); \r
                }\r
 \r
                public static bool operator != (HtmlElement left, HtmlElement right)\r

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlWindow.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlWindow.cs
index 95ebfb255c5042613b74056cfbd8e110d074ac68..eadaada69a059017e59ed39edfe69c31ba0a0009 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlWindow.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlWindow.cs
@@ -404,7 +404,7 @@ namespace System.Windows.Forms
                {
                        return window.GetHashCode ();
                }
-       
+
                public override bool Equals (object obj)
                {
                        return this == (HtmlWindow) obj;
@@ -418,7 +418,7 @@ namespace System.Windows.Forms
                        if ((object)left == null || (object)right == null)
                                return false;
 
-                       return left.Equals (right);
+                       return left.window.Equals (right.window);
                }
 
                public static bool operator != (HtmlWindow left, HtmlWindow right)

diff --git a/mcs/class/Mono.WebBrowser/ChangeLog b/mcs/class/Mono.WebBrowser/ChangeLog
index 13034793b2551be2614989e81f1f04c456c4c3ab..853f1cf5385f0cad58669f7d12f7dcc52ca028da 100644 (file)
--- a/mcs/class/Mono.WebBrowser/ChangeLog
+++ b/mcs/class/Mono.WebBrowser/ChangeLog
@@ -1,3 +1,14 @@
+2008-10-22  Andreia Gaita  <shana@jitted.com>
+
+       * Mono.Mozilla/DOM/Document.cs,
+         Mono.Mozilla/DOM/Element.cs,
+         Mono.Mozilla/DOM/Node.cs,
+         Mono.Mozilla/DOM/Window.cs,
+         Mono.WebBrowser/DOM/IDocument.cs,
+         Mono.WebBrowser/DOM/IElement.cs,
+         Mono.WebBrowser/DOM/INode.cs,
+         Mono.WebBrowser/DOM/IWindow.cs: Fix equality operators (fixes #428173)
+
 2008-10-14  Andreia Gaita  <avidigal@novell.com>
 
        * Mono.WebBrowser2K5.csproj:

diff --git a/mcs/class/Mono.WebBrowser/Mono.Mozilla/DOM/Document.cs b/mcs/class/Mono.WebBrowser/Mono.Mozilla/DOM/Document.cs
old mode 100755 (executable)
new mode 100644 (file)
index 2833b2d..1487249
--- a/mcs/class/Mono.WebBrowser/Mono.Mozilla/DOM/Document.cs
+++ b/mcs/class/Mono.WebBrowser/Mono.Mozilla/DOM/Document.cs
@@ -72,7 +72,7 @@ namespace Mono.Mozilla.DOM
                #endregion
 
                #region Internal
-               internal nsIDOMDocument XPComObject
+               internal new nsIDOMDocument XPComObject
                {
                        get { return this.node; }
                }
@@ -471,11 +471,6 @@ namespace Mono.Mozilla.DOM
                        }
                        return ret;
                }
-
-               public bool Equals (IDocument obj) {
-                       Document doc = (Document) obj;
-                       return doc.node == this.node;
-               }
                
                public void Write (string text) {
                        if (!(node is nsIDOMHTMLDocument))

diff --git a/mcs/class/Mono.WebBrowser/Mono.Mozilla/DOM/Element.cs b/mcs/class/Mono.WebBrowser/Mono.Mozilla/DOM/Element.cs
old mode 100755 (executable)
new mode 100644 (file)
index d087e07..75dcc69
--- a/mcs/class/Mono.WebBrowser/Mono.Mozilla/DOM/Element.cs
+++ b/mcs/class/Mono.WebBrowser/Mono.Mozilla/DOM/Element.cs
@@ -287,11 +287,6 @@ namespace Mono.Mozilla.DOM
                        }
                }
 
-               public bool Equals (IElement obj) {
-                       Element doc = (Element) obj;
-                       return doc.node == this.node;
-               }
-
                public void Focus () {
                        nsIDOMNSHTMLElement elm = node as nsIDOMNSHTMLElement;
                        if (elm != null) {

diff --git a/mcs/class/Mono.WebBrowser/Mono.Mozilla/DOM/Node.cs b/mcs/class/Mono.WebBrowser/Mono.Mozilla/DOM/Node.cs
old mode 100755 (executable)
new mode 100644 (file)
index 81bf0d9..7ed7065
--- a/mcs/class/Mono.WebBrowser/Mono.Mozilla/DOM/Node.cs
+++ b/mcs/class/Mono.WebBrowser/Mono.Mozilla/DOM/Node.cs
@@ -373,7 +373,9 @@ namespace Mono.Mozilla.DOM
                
                #endregion
 
-               
+               public bool Equals (object obj) {
+                       return obj.GetHashCode () == this.GetHashCode ();
+               }               
                
                public override int GetHashCode () 
                {

diff --git a/mcs/class/Mono.WebBrowser/Mono.Mozilla/DOM/Window.cs b/mcs/class/Mono.WebBrowser/Mono.Mozilla/DOM/Window.cs
index dcbb187fdb88a4cacbf400e3b74a6f711a758a89..73ce9b127c2b9650603e54446e7333a3dc719eaf 100644 (file)
--- a/mcs/class/Mono.WebBrowser/Mono.Mozilla/DOM/Window.cs
+++ b/mcs/class/Mono.WebBrowser/Mono.Mozilla/DOM/Window.cs
@@ -157,9 +157,8 @@ namespace Mono.Mozilla.DOM
                        EventListener.RemoveHandler (handler, eventName);
                }
                
-               public bool Equals (IWindow obj) {
-                       Window doc = (Window) obj;
-                       return doc.window == this.window;
+               public bool Equals (object obj) {
+                       return obj.GetHashCode () == this.GetHashCode ();
                }
 
                public void Focus () {

diff --git a/mcs/class/Mono.WebBrowser/Mono.WebBrowser/DOM/IDocument.cs b/mcs/class/Mono.WebBrowser/Mono.WebBrowser/DOM/IDocument.cs
old mode 100755 (executable)
new mode 100644 (file)
index 7f308cf..1f93eed
--- a/mcs/class/Mono.WebBrowser/Mono.WebBrowser/DOM/IDocument.cs
+++ b/mcs/class/Mono.WebBrowser/Mono.WebBrowser/DOM/IDocument.cs
@@ -61,8 +61,6 @@ namespace Mono.WebBrowser.DOM
                IElementCollection      GetElementsByTagName (string id);
                void                            Write (string text);
                
-               bool                            Equals (IDocument obj);
-
                string InvokeScript (string script);
 
                int GetHashCode ();

diff --git a/mcs/class/Mono.WebBrowser/Mono.WebBrowser/DOM/IElement.cs b/mcs/class/Mono.WebBrowser/Mono.WebBrowser/DOM/IElement.cs
old mode 100755 (executable)
new mode 100644 (file)
index 185863a..82a9370
--- a/mcs/class/Mono.WebBrowser/Mono.WebBrowser/DOM/IElement.cs
+++ b/mcs/class/Mono.WebBrowser/Mono.WebBrowser/DOM/IElement.cs
@@ -55,7 +55,6 @@ namespace Mono.WebBrowser.DOM
 
                IElement                        AppendChild (IElement child);
                void                            Blur ();
-               bool                            Equals (IElement obj);
                void                            Focus ();
                bool                            HasAttribute (string name);
                string                          GetAttribute (string name);

diff --git a/mcs/class/Mono.WebBrowser/Mono.WebBrowser/DOM/INode.cs b/mcs/class/Mono.WebBrowser/Mono.WebBrowser/DOM/INode.cs
old mode 100755 (executable)
new mode 100644 (file)
index 2484229..dcd09d9
--- a/mcs/class/Mono.WebBrowser/Mono.WebBrowser/DOM/INode.cs
+++ b/mcs/class/Mono.WebBrowser/Mono.WebBrowser/DOM/INode.cs
@@ -48,6 +48,7 @@ namespace Mono.WebBrowser.DOM
                
                void FireEvent  (string eventName);
                int             GetHashCode ();
+               bool                            Equals (object obj);
                
                void AttachEventHandler (string eventName, EventHandler handler);
                void DetachEventHandler (string eventName, EventHandler handler);

diff --git a/mcs/class/Mono.WebBrowser/Mono.WebBrowser/DOM/IWindow.cs b/mcs/class/Mono.WebBrowser/Mono.WebBrowser/DOM/IWindow.cs
index bf365525555fffc5534852404b0488c5cb781464..a8bc2672445e963d42ce13bd9d5049b1fe85f6f5 100644 (file)
--- a/mcs/class/Mono.WebBrowser/Mono.WebBrowser/DOM/IWindow.cs
+++ b/mcs/class/Mono.WebBrowser/Mono.WebBrowser/DOM/IWindow.cs
@@ -41,7 +41,7 @@ namespace Mono.WebBrowser.DOM
                void AttachEventHandler (string eventName, EventHandler handler);
                void DetachEventHandler (string eventName, EventHandler handler);
                void Focus ();
-               bool Equals (IWindow obj);              
+               bool Equals (object obj);               
                int GetHashCode ();
                void Open (string url);
                void ScrollTo (int x, int y);