Title: [176410] trunk/Source/WebCore
- Revision
- 176410
- Author
- [email protected]
- Date
- 2014-11-20 13:45:54 -0800 (Thu, 20 Nov 2014)
Log Message
Fix the !ENABLE(SVG_FONTS) build after r176276
https://bugs.webkit.org/show_bug.cgi?id=138924
Reviewed by Csaba Osztrogonác.
No new tests because there is no behavior change.
* css/CSSFontFaceSource.cpp:
(WebCore::CSSFontFaceSource::getFontData):
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::requestFont):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (176409 => 176410)
--- trunk/Source/WebCore/ChangeLog 2014-11-20 21:43:21 UTC (rev 176409)
+++ trunk/Source/WebCore/ChangeLog 2014-11-20 21:45:54 UTC (rev 176410)
@@ -1,3 +1,17 @@
+2014-11-20 Myles C. Maxfield <[email protected]>
+
+ Fix the !ENABLE(SVG_FONTS) build after r176276
+ https://bugs.webkit.org/show_bug.cgi?id=138924
+
+ Reviewed by Csaba Osztrogonác.
+
+ No new tests because there is no behavior change.
+
+ * css/CSSFontFaceSource.cpp:
+ (WebCore::CSSFontFaceSource::getFontData):
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::requestFont):
+
2014-11-19 Ada Chan <[email protected]>
Add a way to mute an AudioContext.
Modified: trunk/Source/WebCore/css/CSSFontFaceSource.cpp (176409 => 176410)
--- trunk/Source/WebCore/css/CSSFontFaceSource.cpp 2014-11-20 21:43:21 UTC (rev 176409)
+++ trunk/Source/WebCore/css/CSSFontFaceSource.cpp 2014-11-20 21:45:54 UTC (rev 176410)
@@ -124,10 +124,14 @@
if (isLoaded()) {
if (m_font) {
// Create new FontPlatformData from our CGFontRef, point size and ATSFontRef.
- if (!m_font->ensureCustomFontData(m_hasExternalSVGFont))
+ bool hasExternalSVGFont = false;
+#if ENABLE(SVG_FONTS)
+ hasExternalSVGFont = m_hasExternalSVGFont;
+#endif
+ if (!m_font->ensureCustomFontData(hasExternalSVGFont))
return nullptr;
- fontData = m_font->getFontData(fontDescription, m_string, syntheticBold, syntheticItalic, m_hasExternalSVGFont);
+ fontData = m_font->getFontData(fontDescription, m_string, syntheticBold, syntheticItalic, hasExternalSVGFont);
} else {
#if ENABLE(SVG_FONTS)
// In-Document SVG Fonts
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (176409 => 176410)
--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-11-20 21:43:21 UTC (rev 176409)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-11-20 21:45:54 UTC (rev 176410)
@@ -182,8 +182,12 @@
CachedResourceHandle<CachedFont> CachedResourceLoader::requestFont(CachedResourceRequest& request, bool isSVG)
{
+#if ENABLE(SVG_FONTS)
if (isSVG)
return downcast<CachedSVGFont>(requestResource(CachedResource::SVGFontResource, request).get());
+#else
+ UNUSED_PARAM(isSVG);
+#endif
return downcast<CachedFont>(requestResource(CachedResource::FontResource, request).get());
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
