[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[evan at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit a64083d74473e1f596a786c981bb49832d947f0c
Author: evan at chromium.org <evan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 24 11:50:34 2010 +0000

    2010-12-24  Evan Martin  <evan at chromium.org>
    
            Reviewed by Darin Adler.
    
            TextMetrics::width is an integer, but the member is a float
            https://bugs.webkit.org/show_bug.cgi?id=51566
    
            Change the return type to a float.
    
            No tests, fixing a compiler warning.
            (I was unable to produce a difference in the values exposed to pages
            with a float versus the previous conversion to an integer.)
    
            * html/TextMetrics.h:
            (WebCore::TextMetrics::width):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74628 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ee69b86..722da11 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-12-24  Evan Martin  <evan at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        TextMetrics::width is an integer, but the member is a float
+        https://bugs.webkit.org/show_bug.cgi?id=51566
+
+        Change the return type to a float.
+
+        No tests, fixing a compiler warning.
+        (I was unable to produce a difference in the values exposed to pages
+        with a float versus the previous conversion to an integer.)
+
+        * html/TextMetrics.h:
+        (WebCore::TextMetrics::width):
+
 2010-12-24  Ryuan Choi  <ryuan.choi at samsung.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/html/TextMetrics.h b/WebCore/html/TextMetrics.h
index c786fca..b272ef6 100644
--- a/WebCore/html/TextMetrics.h
+++ b/WebCore/html/TextMetrics.h
@@ -35,8 +35,7 @@ class TextMetrics : public RefCounted<TextMetrics> {
 public:
     static PassRefPtr<TextMetrics> create() { return adoptRef(new TextMetrics); }
 
-    // FIXME: Is coercing to an integer value intentional? If so, there should be a static_cast<unsigned>() here.
-    unsigned width() const { return m_width; }
+    float width() const { return m_width; }
     void setWidth(float w) { m_width = w; }
 
 private:

-- 
WebKit Debian packaging