[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[zimmermann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit c8ebe0b56d3e1f0aa54405a7ec978fc326572b0d
Author: zimmermann at webkit.org <zimmermann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 12 03:51:14 2010 +0000

    2010-02-11  Nikolas Zimmermann  <nzimmermann at rim.com>
    
            Reviewed by Eric Seidel.
    
            Add roundedIntSize() convenience method converting FloatSize to IntSize, just like roundedIntPoint() converting FloatPoint to IntPoint.
    
            * platform/graphics/FloatSize.h:
            (WebCore::roundedIntSize):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54699 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f87bbc1..b7090cc 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-11  Nikolas Zimmermann  <nzimmermann at rim.com>
+
+        Reviewed by Eric Seidel.
+
+        Add roundedIntSize() convenience method converting FloatSize to IntSize, just like roundedIntPoint() converting FloatPoint to IntPoint.
+
+        * platform/graphics/FloatSize.h:
+        (WebCore::roundedIntSize):
+
 2010-02-11  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/graphics/FloatSize.h b/WebCore/platform/graphics/FloatSize.h
index 1bc3423..a3233d1 100644
--- a/WebCore/platform/graphics/FloatSize.h
+++ b/WebCore/platform/graphics/FloatSize.h
@@ -28,6 +28,8 @@
 #ifndef FloatSize_h
 #define FloatSize_h
 
+#include "IntSize.h"
+#include <wtf/MathExtras.h>
 #include <wtf/Platform.h>
 
 #if PLATFORM(CG)
@@ -128,6 +130,11 @@ inline bool operator!=(const FloatSize& a, const FloatSize& b)
     return a.width() != b.width() || a.height() != b.height();
 }
 
+inline IntSize roundedIntSize(const FloatSize& p)
+{
+    return IntSize(static_cast<int>(roundf(p.width())), static_cast<int>(roundf(p.height())));
+}
+
 } // namespace WebCore
 
 #endif // FloatSize_h

-- 
WebKit Debian packaging