Changeset 112770 in webkit

Timestamp:

Mar 30, 2012 8:44:24 PM (12 years ago)

Author:

mitz@apple.com

Message:

Tried to fix the Chromium Mac build after r112767.

• platform/graphics/SimpleFontData.h:

(SimpleFontData):
(DerivedFontData):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/SimpleFontData.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-30  Dan Bernstein  <mitz@apple.com>
+
+        Tried to fix the Chromium Mac build after r112767.
+
+        * platform/graphics/SimpleFontData.h:
+        (SimpleFontData):
+        (DerivedFontData):
+
 2012-03-30  Dirk Schulze  <krit@webkit.org>
 

trunk/Source/WebCore/platform/graphics/SimpleFontData.h

@@ -165 +165 @@
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
     const SimpleFontData* getCompositeFontReferenceFontData(NSFont *key) const;
-#endif
-    
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
     NSFont* getNSFont() const { return m_platformData.font(); }
 #elif (PLATFORM(WX) && OS(DARWIN)) 
@@ -268 +265 @@
         OwnPtr<SimpleFontData> verticalRightOrientation;
         OwnPtr<SimpleFontData> uprightOrientation;
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
         mutable RetainPtr<CFMutableDictionaryRef> compositeFontReferences;
 #endif