Changeset 196481 in webkit for trunk/Source/WebCore/css/CSSFontFaceSource.cpp

Timestamp:

Feb 12, 2016, 9:33:00 AM (9 years ago)

Author:

Csaba Osztrogonác

Message:

[EFL][GTK] Fix ENABLE(SVG_OTF_CONVERTER) build
​https://bugs.webkit.org/show_bug.cgi?id=154165

Reviewed by Alex Christensen.

.:

• Source/cmake/OptionsEfl.cmake:
• Source/cmake/OptionsGTK.cmake:

Source/WebCore:

• CMakeLists.txt:
• css/CSSFontFaceSource.cpp:

(WebCore::CSSFontFaceSource::font):

• svg/SVGToOTFFontConversion.cpp:
• svg/SVGToOTFFontConversion.h:

File:

• trunk/Source/WebCore/css/CSSFontFaceSource.cpp (modified) (1 diff)

trunk/Source/WebCore/css/CSSFontFaceSource.cpp

@@ -160 +160 @@
     if (!m_inDocumentCustomPlatformData)
         return nullptr;
+#if PLATFORM(COCOA)
     return Font::create(m_inDocumentCustomPlatformData->fontPlatformData(fontDescription, syntheticBold, syntheticItalic, fontFaceFeatures, fontFaceVariantSettings), true, false);
+#else
+    return Font::create(m_inDocumentCustomPlatformData->fontPlatformData(fontDescription, syntheticBold, syntheticItalic), true, false);
+#endif
 #else
     return Font::create(std::make_unique<SVGFontData>(m_svgFontFaceElement.get()), fontDescription.computedPixelSize(), syntheticBold, syntheticItalic);