Title: [239554] trunk/Source/WebCore
- Revision
- 239554
- Author
- [email protected]
- Date
- 2018-12-26 12:42:47 -0800 (Wed, 26 Dec 2018)
Log Message
[FreeType] Restore conditional compilation logic for recent HarfBuzz refactoring
https://bugs.webkit.org/show_bug.cgi?id=193036
Patch by Jim Mason <[email protected]> on 2018-12-26
Reviewed by Michael Catanzaro.
* platform/graphics/FontPlatformData.h:
* platform/graphics/freetype/FontPlatformDataFreeType.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (239553 => 239554)
--- trunk/Source/WebCore/ChangeLog 2018-12-26 18:30:10 UTC (rev 239553)
+++ trunk/Source/WebCore/ChangeLog 2018-12-26 20:42:47 UTC (rev 239554)
@@ -1,3 +1,13 @@
+2018-12-26 Jim Mason <[email protected]>
+
+ [FreeType] Restore conditional compilation logic for recent HarfBuzz refactoring
+ https://bugs.webkit.org/show_bug.cgi?id=193036
+
+ Reviewed by Michael Catanzaro.
+
+ * platform/graphics/FontPlatformData.h:
+ * platform/graphics/freetype/FontPlatformDataFreeType.cpp:
+
2018-12-24 Fujii Hironori <[email protected]>
Remove "using namespace std;"
Modified: trunk/Source/WebCore/platform/graphics/FontPlatformData.h (239553 => 239554)
--- trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2018-12-26 18:30:10 UTC (rev 239553)
+++ trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2018-12-26 20:42:47 UTC (rev 239554)
@@ -168,7 +168,9 @@
#endif
#if USE(FREETYPE)
+#if USE(HARFBUZZ) && !ENABLE(OPENTYPE_MATH)
HbUniquePtr<hb_font_t> createOpenTypeMathHarfBuzzFont() const;
+#endif
bool hasCompatibleCharmap() const;
FcPattern* fcPattern() const;
bool isFixedWidth() const { return m_fixedWidth; }
Modified: trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp (239553 => 239554)
--- trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2018-12-26 18:30:10 UTC (rev 239553)
+++ trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2018-12-26 20:42:47 UTC (rev 239554)
@@ -296,6 +296,7 @@
return SharedBuffer::create(WTFMove(data));
}
+#if USE(HARFBUZZ) && !ENABLE(OPENTYPE_MATH)
HbUniquePtr<hb_font_t> FontPlatformData::createOpenTypeMathHarfBuzzFont() const
{
CairoFtFaceLocker cairoFtFaceLocker(m_scaledFont.get());
@@ -309,5 +310,6 @@
return HbUniquePtr<hb_font_t>(hb_font_create(face.get()));
}
+#endif
} // namespace WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
