[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[ojan at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 19be61f59831a19a7ff5248d584a0e2d2ce9ef2c
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 5 03:53:28 2010 +0000

    2010-01-04  Ojan Vafai  <ojan at ojanmacpro.sfo.corp.google.com>
    
            Reviewed by Dan Bernstein.
    
            Remove unnecessary division by a constant in SimpleFontDataMac.mm.
            https://bugs.webkit.org/show_bug.cgi?id=33189
    
            This was added in http://trac.webkit.org/changeset/8104 and seems like
            it was just there to match the previously private function which we no
            longer use.
    
            No new tests. No change in behavior.
    
            * platform/graphics/mac/SimpleFontDataMac.mm:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52782 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ac1dd8f..6ee68b4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-01-04  Ojan Vafai  <ojan at ojanmacpro.sfo.corp.google.com>
+
+        Reviewed by Dan Bernstein.
+
+        Remove unnecessary division by a constant in SimpleFontDataMac.mm.
+        https://bugs.webkit.org/show_bug.cgi?id=33189
+
+        This was added in http://trac.webkit.org/changeset/8104 and seems like
+        it was just there to match the previously private function which we no
+        longer use.
+
+        No new tests. No change in behavior.
+
+        * platform/graphics/mac/SimpleFontDataMac.mm:
+
 2010-01-04  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej Stachowiak.
diff --git a/WebCore/platform/graphics/mac/SimpleFontDataMac.mm b/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
index 97a7251..c46ba1c 100644
--- a/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
+++ b/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
@@ -55,8 +55,7 @@ using namespace std;
 namespace WebCore {
   
 const float smallCapsFontSizeMultiplier = 0.7f;
-const float contextDPI = 72.0f;
-static inline float scaleEmToUnits(float x, unsigned unitsPerEm) { return x * (contextDPI / (contextDPI * unitsPerEm)); }
+static inline float scaleEmToUnits(float x, unsigned unitsPerEm) { return x / unitsPerEm; }
 
 static bool initFontData(SimpleFontData* fontData)
 {

-- 
WebKit Debian packaging