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

[mihaip at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit c7134fa1e8c0058083f9cb56a8959a2f84270dc3
Author: mihaip at chromium.org <mihaip at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 21 22:37:31 2010 +0000

    2010-10-21  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by James Robinson.
    
            [Chromium] Fix Chromium Mac build
            https://bugs.webkit.org/show_bug.cgi?id=48096
    
            Fix Chromium Mac build after r70225 (Chromium uses Core Text but is not
            PLATFORM(MAC)).
    
            * platform/graphics/SimpleFontData.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70272 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index edaf791..759c38e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-21  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by James Robinson.
+
+        [Chromium] Fix Chromium Mac build
+        https://bugs.webkit.org/show_bug.cgi?id=48096
+
+        Fix Chromium Mac build after r70225 (Chromium uses Core Text but is not
+        PLATFORM(MAC)).
+
+        * platform/graphics/SimpleFontData.h:
+
 2010-10-21  Xiaomei Ji  <xji at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebCore/platform/graphics/SimpleFontData.h b/WebCore/platform/graphics/SimpleFontData.h
index b67939c..7bd58ad 100644
--- a/WebCore/platform/graphics/SimpleFontData.h
+++ b/WebCore/platform/graphics/SimpleFontData.h
@@ -37,7 +37,7 @@
 typedef struct OpaqueATSUStyle* ATSUStyle;
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) || USE(CORE_TEXT)
 #include <wtf/RetainPtr.h>
 #endif
 
@@ -130,7 +130,7 @@ public:
     NSFont* getNSFont() const { return m_platformData.nsFont(); }
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) || USE(CORE_TEXT)
     CFDictionaryRef getCFStringAttributes(TypesettingFeatures) const;
 #endif
 
@@ -234,7 +234,7 @@ public:
 private:
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) || USE(CORE_TEXT)
     mutable HashMap<unsigned, RetainPtr<CFDictionaryRef> > m_CFStringAttributes;
 #endif
 

-- 
WebKit Debian packaging