[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 1d266677aabb5ca1d0ae3f6528b42555138dd24e
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 22 06:21:55 2010 +0000

    2010-01-21  James Robinson  <jamesr at chromium.org>
    
            Reviewed by Darin Fisher.
    
            Bumps the refcount when WebNode::toElement/toConstElement are called.
            https://bugs.webkit.org/show_bug.cgi?id=33977
    
            Ensures that when a wrapper around a WebNode is create via the
            toElement() or toConstElement() calls that the refcount on the WebNode
            is increased, by forcing a call to WebNode::assign().  This is needed
            so that the following code:
            {
              WebNode n = someNode();
              WebElement e = n.toElement<WebElement>();
            }
            does not decrease the overall refcount on the Node that someNode()
            returns.
    
            This caused crashes in the 'Save page as..' feature.
    
            * public/WebNode.h:
            (WebKit::WebNode::toElement):
            (WebKit::WebNode::toConstElement):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53678 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index d2a2ac6..ec51897 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,27 @@
+2010-01-21  James Robinson  <jamesr at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Bumps the refcount when WebNode::toElement/toConstElement are called.
+        https://bugs.webkit.org/show_bug.cgi?id=33977
+        
+        Ensures that when a wrapper around a WebNode is create via the
+        toElement() or toConstElement() calls that the refcount on the WebNode
+        is increased, by forcing a call to WebNode::assign().  This is needed
+        so that the following code:
+        {
+          WebNode n = someNode();
+          WebElement e = n.toElement<WebElement>();
+        }
+        does not decrease the overall refcount on the Node that someNode()
+        returns.
+
+        This caused crashes in the 'Save page as..' feature.
+
+        * public/WebNode.h:
+        (WebKit::WebNode::toElement):
+        (WebKit::WebNode::toConstElement):
+
 2010-01-21  Michael Nordman  <michaeln at google.com>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/public/WebNode.h b/WebKit/chromium/public/WebNode.h
index b2555f1..ab9c767 100644
--- a/WebKit/chromium/public/WebNode.h
+++ b/WebKit/chromium/public/WebNode.h
@@ -104,14 +104,14 @@ public:
     template<typename T> T toElement()
     {
         T res;
-        res.m_private = m_private;
+        res.WebNode::assign(*this);
         return res;
     }
 
     template<typename T> const T toConstElement() const
     {
         T res;
-        res.m_private = m_private;
+        res.WebNode::assign(*this);
         return res;
     }
 

-- 
WebKit Debian packaging