Changeset 178142 in webkit

Timestamp:

Jan 8, 2015 3:51:11 PM (9 years ago)

Author:

Brent Fulgham

Message:

[Win] Build fix after r178133.

• platform/graphics/FontCache.h: Correct declaration of fontDataFromDescriptionAndLogFont
• platform/graphics/SimpleFontData.h: We still need 'platformDestroy'
• platform/graphics/mac/SimpleFontDataMac.mm:

(WebCore::SimpleFontData::platformDestroy): Add stub back to prevent build break.

• platform/graphics/win/FontCacheWin.cpp:

(WebCore::FontCache::fontDataFromDescriptionAndLogFont): Correct signature.
(WebCore::FontCache::lastResortFallbackFont): Correct '::' syntax.
(WebCore::FontCache:lastResortFallbackFont): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/FontCache.h (modified) (1 diff)
• platform/graphics/SimpleFontData.h (modified) (1 diff)
• platform/graphics/mac/SimpleFontDataMac.mm (modified) (1 diff)
• platform/graphics/win/FontCacheWin.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-01-08  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Build fix after r178133.
+
+        * platform/graphics/FontCache.h: Correct declaration of fontDataFromDescriptionAndLogFont
+        * platform/graphics/SimpleFontData.h: We still need 'platformDestroy'
+        * platform/graphics/mac/SimpleFontDataMac.mm:
+        (WebCore::SimpleFontData::platformDestroy): Add stub back to prevent build break.
+        * platform/graphics/win/FontCacheWin.cpp:
+        (WebCore::FontCache::fontDataFromDescriptionAndLogFont): Correct signature.
+        (WebCore::FontCache::lastResortFallbackFont): Correct '::' syntax.
+        (WebCore::FontCache:lastResortFallbackFont): Deleted.
+
 2015-01-08  Antti Koivisto  <antti@apple.com>
 

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

@@ -146 +146 @@
 
 #if PLATFORM(WIN)
-    PassRef<SimpleFontData> fontDataFromDescriptionAndLogFont(const FontDescription&, const LOGFONT&, AtomicString& outFontFamilyName);
+    RefPtr<SimpleFontData> fontDataFromDescriptionAndLogFont(const FontDescription&, const LOGFONT&, AtomicString& outFontFamilyName);
 #endif
 

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

@@ -223 +223 @@
     void platformGlyphInit();
     void platformCharWidthInit();
+    void platformDestroy();
 
     void initCharWidths();

trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm

@@ -263 +263 @@
 #endif // USE(APPKIT)
 
+void SimpleFontData::platformDestroy()
+{
+}
+
 #if !PLATFORM(IOS)
 PassRefPtr<SimpleFontData> SimpleFontData::platformCreateScaledFontData(const FontDescription& fontDescription, float scaleFactor) const

trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp

@@ -310 +310 @@
 }
 
-PassRef<SimpleFontData> FontCache::fontDataFromDescriptionAndLogFont(const FontDescription& fontDescription, const LOGFONT& font, AtomicString& outFontFamilyName)
+RefPtr<SimpleFontData> FontCache::fontDataFromDescriptionAndLogFont(const FontDescription& fontDescription, const LOGFONT& font, AtomicString& outFontFamilyName)
 {
     AtomicString familyName = String(font.lfFaceName, wcsnlen(font.lfFaceName, LF_FACESIZE));
@@ -319 +319 @@
 }
 
-Ref<SimpleFontData> FontCache:lastResortFallbackFont(const FontDescription& fontDescription)
+Ref<SimpleFontData> FontCache::lastResortFallbackFont(const FontDescription& fontDescription)
 {
     DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, fallbackFontName, ());