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

[zecke at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit ca9e78cec4fb4d4b1a2819f868d41689527b5dcd
Author: zecke at webkit.org <zecke at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 15 09:29:19 2009 +0000

    [Qt] Remove dead code from FontPlatformDataQt.cpp
    
    https://bugs.webkit.org/show_bug.cgi?id=32540
    
    In r51758 the code that used familyNames was removed
    and we should remove the creation of the familyNames
    as well.
    
    * platform/graphics/qt/FontPlatformDataQt.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52143 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6c02c5c..1e2e84b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2009-12-14  Holger Hans Peter Freyther  <zecke at selfish.org>
+
+        Reviewed by Eric Seidel.
+
+        [Qt] Remove dead code from FontPlatformDataQt.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=32540
+
+        In r51758 the code that used familyNames was removed
+        and we should remove the creation of the familyNames
+        as well.
+
+        * platform/graphics/qt/FontPlatformDataQt.cpp:
+        (WebCore::FontPlatformData::FontPlatformData):
+
 2009-12-15  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp b/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp
index 2cc2fc6..0a1075f 100644
--- a/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp
+++ b/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp
@@ -49,17 +49,6 @@ FontPlatformData::FontPlatformData(const FontPlatformData &other) : m_data(other
 FontPlatformData::FontPlatformData(const FontDescription& description, const AtomicString& familyName, int wordSpacing, int letterSpacing)
     : m_data(new FontPlatformDataPrivate())
 {
-    QString familyNames(familyName);
-    if (!familyName.isEmpty())
-        familyNames += QLatin1Char(',');
-
-    const FontFamily* family = &description.family();
-    while (family) {
-        familyNames += family->family();
-        family = family->next();
-        if (family)
-            familyNames += QLatin1Char(',');
-    }
     QFont& font = m_data->font;
     font.setFamily(familyName);
     font.setPixelSize(qRound(description.computedSize()));

-- 
WebKit Debian packaging