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

[sullivan at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 6c1a2a933ca77f28cadeb039dbac43c8891dd7bb
Author: sullivan at apple.com <sullivan at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 13 20:20:11 2010 +0000

    Written by Simon Fraser, reviewed by me.
    
    Cleaner fix for previous check-in.
    
    * UIProcess/WebBackForwardList.cpp:
    (WebKit::WebBackForwardList::backListAsImmutableArrayWithLimit):
    Use std::max<int> for int-casting brevity.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63240 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index f6e9876..1c3b800 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,15 @@
 2010-07-13  John Sullivan  <sullivan at apple.com>
 
+        Written by Simon Fraser, reviewed by me.
+
+        Cleaner fix for previous check-in.
+
+        * UIProcess/WebBackForwardList.cpp:
+        (WebKit::WebBackForwardList::backListAsImmutableArrayWithLimit):
+        Use std::max<int> for int-casting brevity.
+
+2010-07-13  John Sullivan  <sullivan at apple.com>
+
         Reviewed by Sam Weinig.
 
         Fixed signed/unsigned problem that led to bogus contents in the array
diff --git a/WebKit2/UIProcess/WebBackForwardList.cpp b/WebKit2/UIProcess/WebBackForwardList.cpp
index ee4a86d..c740dab 100644
--- a/WebKit2/UIProcess/WebBackForwardList.cpp
+++ b/WebKit2/UIProcess/WebBackForwardList.cpp
@@ -174,7 +174,7 @@ PassRefPtr<ImmutableArray> WebBackForwardList::backListAsImmutableArrayWithLimit
         return ImmutableArray::create();
 
     void** array = new void*[size];
-    for (unsigned i = std::max(static_cast<int>(m_current) - static_cast<int>(limit), 0), j = 0; i < m_current; ++i, ++j) {
+    for (unsigned i = std::max<int>(m_current - limit, 0), j = 0; i < m_current; ++i, ++j) {
         WebBackForwardListItem* item = m_entries[i].get();
         item->ref();
         array[j] = item;

-- 
WebKit Debian packaging