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

[tkent at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 8cc067dd049edcb05564d2469430884b792cddf0
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 16 08:40:24 2010 +0000

    2010-12-16  Kent Tamura  <tkent at chromium.org>
    
            Unreviewed, build fix.
    
            Fix a warning on 32-bit Mac.
    
            * platform/graphics/mac/SimpleFontDataMac.mm:
            (WebCore::SimpleFontData::emphasisMarkFontData): 0.5 -> 0.5f
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74178 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 93b49b4..0827bf5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-16  Kent Tamura  <tkent at chromium.org>
+
+        Unreviewed, build fix.
+
+        Fix a warning on 32-bit Mac.
+
+        * platform/graphics/mac/SimpleFontDataMac.mm:
+        (WebCore::SimpleFontData::emphasisMarkFontData): 0.5 -> 0.5f
+
 2010-12-16  Zoltan Herczeg  <zherczeg at webkit.org>
 
         Reviewed by Dirk Schulze.
diff --git a/WebCore/platform/graphics/mac/SimpleFontDataMac.mm b/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
index e1322de..92585c6 100644
--- a/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
+++ b/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
@@ -428,7 +428,7 @@ SimpleFontData* SimpleFontData::emphasisMarkFontData(const FontDescription& font
     if (!m_derivedFontData)
         m_derivedFontData = DerivedFontData::create(isCustomFont());
     if (!m_derivedFontData->emphasisMark)
-        m_derivedFontData->emphasisMark = scaledFontData(fontDescription, .5);
+        m_derivedFontData->emphasisMark = scaledFontData(fontDescription, .5f);
 
     return m_derivedFontData->emphasisMark.get();
 }

-- 
WebKit Debian packaging