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

[mrowe at apple.com]

The following commit has been merged in the debian/experimental branch:
commit cf0c49acb350f4bf464fdfff5c9555b54dc80d4d
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 3 22:54:49 2010 +0000

    Fix the i386 build with a static_cast hammer.
    
    * mathml/RenderMathMLFraction.cpp:
    (WebCore::RenderMathMLFraction::layout):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64600 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5fe24dd..221ce35 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-03  Mark Rowe  <mrowe at apple.com>
+
+        Fix the i386 build with a static_cast hammer.
+
+        * mathml/RenderMathMLFraction.cpp:
+        (WebCore::RenderMathMLFraction::layout):
+
 2010-08-03  Beth Dakin  <bdakin at apple.com>
 
         Speculative build fix for Leopard.
diff --git a/WebCore/mathml/RenderMathMLFraction.cpp b/WebCore/mathml/RenderMathMLFraction.cpp
index cd0681d..72f7298 100644
--- a/WebCore/mathml/RenderMathMLFraction.cpp
+++ b/WebCore/mathml/RenderMathMLFraction.cpp
@@ -122,23 +122,22 @@ void RenderMathMLFraction::addChild(RenderObject* child, RenderObject* beforeChi
 void RenderMathMLFraction::layout()
 {
     updateFromElement();
-    
+
     // Adjust the fraction line thickness for the zoom
     if (lastChild() && lastChild()->isRenderBlock())
-        m_lineThickness = m_lineThickness * ceil(gFractionBarWidth * style()->fontSize());
-    
+        m_lineThickness = static_cast<int>(m_lineThickness * ceil(gFractionBarWidth * style()->fontSize()));
+
     RenderBlock::layout();
-    
+
     // The row layout can affect the numerator/denominator width.
     // FIXME: This is probably only needed if one of the children
     // contains an mrow.
     setNeedsLayoutAndPrefWidthsRecalc();
     markContainingBlocksForLayout();
-    
+
     RenderBlock::layout();
-    
 }
-    
+
 void RenderMathMLFraction::paint(PaintInfo& info, int tx, int ty)
 {
     RenderMathMLBlock::paint(info, tx, ty);

-- 
WebKit Debian packaging