[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 35a6b8b133e69b6988f7271f03b466c3385b244e
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 2 18:19:41 2010 +0000

    2010-03-02  James Hawkins  <jhawkins at chromium.org>
    
            Reviewed by Darin Fisher.
    
            [Chromium] Implement WebNode::equals and add inline operators for ==
            and !=.
    
            https://bugs.webkit.org/show_bug.cgi?id=35543
    
            * public/WebNode.h:
            (WebKit::operator==):
            (WebKit::operator!=):
            * src/WebNode.cpp:
            (WebKit::WebNode::equals):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55413 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 1c96542..d26b86a 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,18 @@
+2010-03-02  James Hawkins  <jhawkins at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [Chromium] Implement WebNode::equals and add inline operators for ==
+        and !=.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35543
+
+        * public/WebNode.h:
+        (WebKit::operator==):
+        (WebKit::operator!=):
+        * src/WebNode.cpp:
+        (WebKit::WebNode::equals):
+
 2010-03-01  Jakob Petsovits  <jpetsovits at rim.com>
 
         Reviewed by Adam Barth.
diff --git a/WebKit/chromium/public/WebNode.h b/WebKit/chromium/public/WebNode.h
index 4d2a0e9..d2cf60c 100644
--- a/WebKit/chromium/public/WebNode.h
+++ b/WebKit/chromium/public/WebNode.h
@@ -62,6 +62,8 @@ public:
     WEBKIT_API void reset();
     WEBKIT_API void assign(const WebNode&);
 
+    WEBKIT_API bool equals(const WebNode&) const;
+
     bool isNull() const { return !m_private; }
 
 #if WEBKIT_IMPLEMENTATION
@@ -135,6 +137,16 @@ protected:
     }
 };
 
+inline bool operator==(const WebNode& a, const WebNode& b)
+{
+    return a.equals(b);
+}
+
+inline bool operator!=(const WebNode& a, const WebNode& b)
+{
+    return !(a == b);
+}
+
 } // namespace WebKit
 
 #endif
diff --git a/WebKit/chromium/src/WebNode.cpp b/WebKit/chromium/src/WebNode.cpp
index 9fbf573..644792f 100644
--- a/WebKit/chromium/src/WebNode.cpp
+++ b/WebKit/chromium/src/WebNode.cpp
@@ -70,6 +70,11 @@ void WebNode::assign(const WebNode& other)
     assign(p);
 }
 
+bool WebNode::equals(const WebNode& n) const
+{
+    return (m_private == n.m_private);
+}
+
 WebNode::NodeType WebNode::nodeType() const
 {
     return static_cast<NodeType>(m_private->nodeType());

-- 
WebKit Debian packaging