[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756
yurys at chromium.org
yurys at chromium.org
Fri Feb 26 22:20:54 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit a14f6aa39809a47fab050a71fa0287c3bccf9b32
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Feb 16 08:48:31 2010 +0000
2010-02-16 Yury Semikhatsky <yurys at chromium.org>
Not Reviewed, build fix.
* platform/graphics/FloatRect.h:
(WebCore::FloatRect::center): make conversion from float to int explicit so that compiler
doesn't complain about that.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54810 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 883ea72..a60f839 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-16 Yury Semikhatsky <yurys at chromium.org>
+
+ Not Reviewed, build fix.
+
+ * platform/graphics/FloatRect.h:
+ (WebCore::FloatRect::center): make conversion from float to int explicit so that compiler
+ doesn't complain about that.
+
2010-02-15 Dan Bernstein <mitz at apple.com>
Reviewed by Simon Fraser.
diff --git a/WebCore/platform/graphics/FloatRect.h b/WebCore/platform/graphics/FloatRect.h
index cb01d4f..7a4c1d5 100644
--- a/WebCore/platform/graphics/FloatRect.h
+++ b/WebCore/platform/graphics/FloatRect.h
@@ -99,7 +99,7 @@ public:
float right() const { return x() + width(); }
float bottom() const { return y() + height(); }
- FloatPoint center() const { return IntPoint(x() + width() / 2, y() + height() / 2); }
+ FloatPoint center() const { return IntPoint(static_cast<int>(x() + width() / 2), static_cast<int>(y() + height() / 2)); }
void move(const FloatSize& delta) { m_location += delta; }
void move(float dx, float dy) { m_location.move(dx, dy); }
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list