[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

abarth at webkit.org abarth at webkit.org
Wed Dec 22 12:27:54 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 79138881b7e7bdab3698b780ba77935cbd407e6f
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 24 07:58:07 2010 +0000

    2010-08-24  Adam Barth  <abarth at webkit.org>
    
            Build fix.  leakPtr doesn't exist, contrary to my dreams.
    
            * storage/IDBKeyTree.h:
            (WebCore::::put):
            * storage/IDBPendingTransactionMonitor.cpp:
            (WebCore::IDBPendingTransactionMonitor::addPendingTransaction):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65873 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 82ff1c0..3aa24cd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,14 @@
 2010-08-24  Adam Barth  <abarth at webkit.org>
 
+        Build fix.  leakPtr doesn't exist, contrary to my dreams.
+
+        * storage/IDBKeyTree.h:
+        (WebCore::::put):
+        * storage/IDBPendingTransactionMonitor.cpp:
+        (WebCore::IDBPendingTransactionMonitor::addPendingTransaction):
+
+2010-08-24  Adam Barth  <abarth at webkit.org>
+
         Reviewed by Eric Seidel.
 
         Deploy adoptPtr in WebCore/storage
diff --git a/WebCore/storage/IDBKeyTree.h b/WebCore/storage/IDBKeyTree.h
index 67fe649..70d6f83 100644
--- a/WebCore/storage/IDBKeyTree.h
+++ b/WebCore/storage/IDBKeyTree.h
@@ -131,7 +131,7 @@ void IDBKeyTree<ValueType>::put(IDBKey* key, ValueType* value)
 {
     TreeNode* node = m_tree.search(key);
     if (!node) {
-        node = leakPtr(new TreeNode());
+        node = new TreeNode();
         node->key = key;
         m_tree.insert(node);
     }
diff --git a/WebCore/storage/IDBPendingTransactionMonitor.cpp b/WebCore/storage/IDBPendingTransactionMonitor.cpp
index 59f4300..d026099 100644
--- a/WebCore/storage/IDBPendingTransactionMonitor.cpp
+++ b/WebCore/storage/IDBPendingTransactionMonitor.cpp
@@ -40,7 +40,7 @@ bool IDBPendingTransactionMonitor::hasPendingTransactions()
 void IDBPendingTransactionMonitor::addPendingTransaction(int id)
 {
     if (!m_ids)
-        m_ids = leakPtr(new Vector<int>());
+        m_ids = new Vector<int>();
     m_ids->append(id);
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list