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

[ggaren at apple.com]

The following commit has been merged in the debian/experimental branch:
commit e36e53d5d3114197f7c7128eea578e806ff498d8
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 22 00:31:49 2010 +0000

    Try to fix the Windows build.
    
    * loader/Cache.cpp:
    (WebCore::Cache::makeResourcePurgeable):
    (WebCore::Cache::evict): Cast to int before using unary '-', to avoid an
    MSVC warning.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67998 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9f76436..4f6069c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-21  Geoffrey Garen  <ggaren at apple.com>
+
+        Try to fix the Windows build.
+
+        * loader/Cache.cpp:
+        (WebCore::Cache::makeResourcePurgeable):
+        (WebCore::Cache::evict): Cast to int before using unary '-', to avoid an
+        MSVC warning.
+
 2010-09-21  Pratik Solanki  <psolanki at apple.com>
 
         Reviewed by Geoffrey Garen and Darin Adler.
diff --git a/WebCore/loader/Cache.cpp b/WebCore/loader/Cache.cpp
index 647dfac..28c9f93 100644
--- a/WebCore/loader/Cache.cpp
+++ b/WebCore/loader/Cache.cpp
@@ -417,7 +417,7 @@ bool Cache::makeResourcePurgeable(CachedResource* resource)
     if (!resource->makePurgeable(true))
         return false;
 
-    adjustSize(resource->hasClients(), -resource->size());
+    adjustSize(resource->hasClients(), -static_cast<int>(resource->size()));
 
     return true;
 }
@@ -438,7 +438,7 @@ void Cache::evict(CachedResource* resource)
         // If the resource was purged, it means we had already decremented the size when we made the
         // resource purgeable in makeResourcePurgeable().
         if (!Cache::shouldMakeResourcePurgeableOnEviction() || !resource->wasPurged())
-            adjustSize(resource->hasClients(), -resource->size());
+            adjustSize(resource->hasClients(), -static_cast<int>(resource->size()));
     } else
         ASSERT(m_resources.get(resource->url()) != resource);
 

-- 
WebKit Debian packaging