[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

darin at apple.com darin at apple.com
Fri Jan 21 14:54:12 UTC 2011


The following commit has been merged in the debian/experimental branch:
commit a48d8731a3c375a783ba37f1250f3d0a35d303ee
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 4 05:31:52 2011 +0000

    Try to fix Leopard build.
    
    * history/HistoryItem.cpp: Use a consistent type, uint64_t, for the
    size variable.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74955 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index df93da4..5c63523 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,4 +1,11 @@
-2011-01-01  Abhishek Arya  <inferno at chromium.org>
+2011-01-03  Darin Adler  <darin at apple.com>
+
+        Try to fix Leopard build.
+
+        * history/HistoryItem.cpp: Use a consistent type, uint64_t, for the
+        size variable.
+
+2011-01-03  Abhishek Arya  <inferno at chromium.org>
 
         Reviewed by Darin Adler.
 
diff --git a/WebCore/history/HistoryItem.cpp b/WebCore/history/HistoryItem.cpp
index b261858..5899aff 100644
--- a/WebCore/history/HistoryItem.cpp
+++ b/WebCore/history/HistoryItem.cpp
@@ -678,9 +678,9 @@ void HistoryItem::encodeBackForwardTreeNode(Encoder* encoder) const
 struct DecodeRecursionStackElement {
     RefPtr<HistoryItem> node;
     size_t i;
-    size_t size;
+    uint64_t size;
 
-    DecodeRecursionStackElement(PassRefPtr<HistoryItem> node, size_t i, size_t size)
+    DecodeRecursionStackElement(PassRefPtr<HistoryItem> node, size_t i, uint64_t size)
         : node(node)
         , i(i)
         , size(size)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list