[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[bdakin at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 1a1e4d537b43f75e7dccd9f91f90867bcf5a4924
Author: bdakin at apple.com <bdakin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 1 20:08:11 2009 +0000

    Just removing a comment I accidentally committed earlier.
    
    * platform/graphics/mac/SimpleFontDataMac.mm:
    (WebCore::SimpleFontData::getCFStringAttributes):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48993 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3742ae4..6d40407 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-01  Beth Dakin  <bdakin at apple.com>
+
+        Just removing a comment I accidentally committed earlier. 
+
+        * platform/graphics/mac/SimpleFontDataMac.mm:
+        (WebCore::SimpleFontData::getCFStringAttributes):
+
 2009-09-30  Jeremy Orlow  <jorlow at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/graphics/mac/SimpleFontDataMac.mm b/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
index 0274d29..97a7251 100644
--- a/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
+++ b/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
@@ -459,7 +459,6 @@ CFDictionaryRef SimpleFontData::getCFStringAttributes(TextRenderingMode textMode
     static const int ligaturesAllowedValue = 1;
     static CFNumberRef ligaturesAllowed = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &ligaturesAllowedValue);
 
-    // This is where the if would go.
     if (!allowKerning) {
         static const float kerningAdjustmentValue = 0;
         static CFNumberRef kerningAdjustment = CFNumberCreate(kCFAllocatorDefault, kCFNumberFloatType, &kerningAdjustmentValue);

-- 
WebKit Debian packaging