Title: [93149] trunk/Source/WebCore
- Revision
- 93149
- Author
- [email protected]
- Date
- 2011-08-16 13:28:38 -0700 (Tue, 16 Aug 2011)
Log Message
Unreviewed Chromium Windows build fix after r93140.
* platform/graphics/FontCache.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (93148 => 93149)
--- trunk/Source/WebCore/ChangeLog 2011-08-16 20:13:15 UTC (rev 93148)
+++ trunk/Source/WebCore/ChangeLog 2011-08-16 20:28:38 UTC (rev 93149)
@@ -1,5 +1,11 @@
2011-08-16 Joseph Pecoraro <[email protected]>
+ Unreviewed Chromium Windows build fix after r93140.
+
+ * platform/graphics/FontCache.h:
+
+2011-08-16 Joseph Pecoraro <[email protected]>
+
Unreviewed Windows and Chromium Windows build fix after r93140.
* platform/graphics/FontCache.h:
Modified: trunk/Source/WebCore/platform/graphics/FontCache.h (93148 => 93149)
--- trunk/Source/WebCore/platform/graphics/FontCache.h 2011-08-16 20:13:15 UTC (rev 93148)
+++ trunk/Source/WebCore/platform/graphics/FontCache.h 2011-08-16 20:28:38 UTC (rev 93149)
@@ -98,12 +98,10 @@
void purgeInactiveFontData(int count = INT_MAX);
#if PLATFORM(WIN)
-#if !PLATFORM(CHROMIUM)
SimpleFontData* fontDataFromDescriptionAndLogFont(const FontDescription&, ShouldRetain, const LOGFONT& font, AtomicString& outFontFamilyName);
-#else
+#elif PLATFORM(CHROMIUM) && OS(WINDOWS)
SimpleFontData* fontDataFromDescriptionAndLogFont(const FontDescription&, ShouldRetain, const LOGFONT& font, wchar_t* outFontFamilyName);
-#endif // PLATFORM(CHROMIUM)
-#endif // PLATFORM(WIN)
+#endif
private:
FontCache();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
