[FreeType] Restore conditional compilation logic for recent HarfBuzz refactoring
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 26 Dec 2018 20:42:47 +0000 (20:42 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 26 Dec 2018 20:42:47 +0000 (20:42 +0000)
https://bugs.webkit.org/show_bug.cgi?id=193036

Patch by Jim Mason <jmason@ibinx.com> on 2018-12-26
Reviewed by Michael Catanzaro.

* platform/graphics/FontPlatformData.h:
* platform/graphics/freetype/FontPlatformDataFreeType.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239554 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/FontPlatformData.h
Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp

index cc1b98a..a238b4f 100644 (file)
@@ -1,3 +1,13 @@
+2018-12-26  Jim Mason  <jmason@ibinx.com>
+
+        [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  <Hironori.Fujii@sony.com>
 
         Remove "using namespace std;"
index 8a17c8b..6cd022c 100644 (file)
@@ -168,7 +168,9 @@ public:
 #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; }
index 645cd17..0437934 100644 (file)
@@ -296,6 +296,7 @@ RefPtr<SharedBuffer> FontPlatformData::openTypeTable(uint32_t table) const
     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 @@ HbUniquePtr<hb_font_t> FontPlatformData::createOpenTypeMathHarfBuzzFont() const
 
     return HbUniquePtr<hb_font_t>(hb_font_create(face.get()));
 }
+#endif
 
 } // namespace WebCore