Changeset 112770 in webkit
- Timestamp:
- Mar 30, 2012 8:44:24 PM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r112769 r112770 1 2012-03-30 Dan Bernstein <mitz@apple.com> 2 3 Tried to fix the Chromium Mac build after r112767. 4 5 * platform/graphics/SimpleFontData.h: 6 (SimpleFontData): 7 (DerivedFontData): 8 1 9 2012-03-30 Dirk Schulze <krit@webkit.org> 2 10 -
trunk/Source/WebCore/platform/graphics/SimpleFontData.h
r112767 r112770 165 165 #endif 166 166 167 #if PLATFORM(MAC) 167 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN)) 168 168 const SimpleFontData* getCompositeFontReferenceFontData(NSFont *key) const; 169 #endif170 171 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))172 169 NSFont* getNSFont() const { return m_platformData.font(); } 173 170 #elif (PLATFORM(WX) && OS(DARWIN)) … … 268 265 OwnPtr<SimpleFontData> verticalRightOrientation; 269 266 OwnPtr<SimpleFontData> uprightOrientation; 270 #if PLATFORM(MAC) 267 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN)) 271 268 mutable RetainPtr<CFMutableDictionaryRef> compositeFontReferences; 272 269 #endif
Note: See TracChangeset
for help on using the changeset viewer.