external/harfbuzz/ExternalProject_harfbuzz.mk | 1 -
vcl/quartz/ctfonts.cxx | 12 +-----------
2 files changed, 1 insertion(+), 12 deletions(-)
New commits:
commit 5de0472e27d4bd7d2ff0d1b54a7324c67ec98de7
Author: Khaled Hosny <khaledho...@eglug.org>
AuthorDate: Fri Mar 8 14:56:15 2019 +0200
Commit: Khaled Hosny <khaledho...@eglug.org>
CommitDate: Fri Mar 8 17:23:23 2019 +0100
Don'tbuild HarfBuzz with Core Text support on macOS/iOS
HarfBuzz 2.x has native support for AAT fonts which is, according to Chrome
developers, sgnificantly faster that HarfBuzz Core Text integration.
Change-Id: I4d5e861a1958402a6e3ccb720b10f40828c3db6a
Reviewed-on: https://gerrit.libreoffice.org/68919
Tested-by: Jenkins
Reviewed-by: Khaled Hosny <khaledho...@eglug.org>
diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk
b/external/harfbuzz/ExternalProject_harfbuzz.mk
index 19a3cf1918c1..82e10ecb76cc 100644
--- a/external/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/external/harfbuzz/ExternalProject_harfbuzz.mk
@@ -38,7 +38,6 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
--with-glib=no \
--with-ucdn=no \
--with-graphite2=yes \
- $(if $(filter iOS MACOSX,$(OS)),--with-coretext=yes) \
$(if
$(verbose),--disable-silent-rules,--enable-silent-rules) \
--libdir=$(call
gb_UnpackedTarball_get_dir,harfbuzz/src/.libs) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index d15fb1376784..5a0b5b62916d 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -270,17 +270,7 @@ static hb_blob_t* getFontTable(hb_face_t* /*face*/,
hb_tag_t nTableTag, void* pU
hb_font_t* CoreTextStyle::ImplInitHbFont()
{
- // On macOS we use HarfBuzz for AAT shaping, but HarfBuzz will then
- // need a CGFont (as it offloads the actual AAT shaping to Core Text),
- // if we have one we use it to create the hb_face_t.
- hb_face_t* pHbFace;
- CTFontRef pCTFont =
static_cast<CTFontRef>(CFDictionaryGetValue(GetStyleDict(),
kCTFontAttributeName));
- CGFontRef pCGFont = CTFontCopyGraphicsFont(pCTFont, nullptr);
- if (pCGFont)
- pHbFace = hb_coretext_face_create(pCGFont);
- else
- pHbFace = hb_face_create_for_tables(getFontTable,
const_cast<PhysicalFontFace*>(GetFontFace()), nullptr);
- CGFontRelease(pCGFont);
+ hb_face_t* pHbFace = hb_face_create_for_tables(getFontTable,
const_cast<PhysicalFontFace*>(GetFontFace()), nullptr);
return InitHbFont(pHbFace);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
