Attachment 358077 Details for Bug 193036 – Patch

[patch] Patch

bug-193036-20181226131517.patch (text/plain), 1.99 KB, created by Jim Mason on 2018-12-26 05:15:18 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Jim Mason

Created: 2018-12-26 05:15:18 PST

Size: 1.99 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 239552)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -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 NOBODY (OOPS!).
>+
>+        * platform/graphics/FontPlatformData.h:
>+        * platform/graphics/freetype/FontPlatformDataFreeType.cpp:
>+
> 2018-12-24  Fujii Hironori  <Hironori.Fujii@sony.com>
> 
>         Remove "using namespace std;"
>Index: Source/WebCore/platform/graphics/FontPlatformData.h
>===================================================================
>--- Source/WebCore/platform/graphics/FontPlatformData.h	(revision 239552)
>+++ Source/WebCore/platform/graphics/FontPlatformData.h	(working copy)
>@@ -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: Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp	(revision 239552)
>+++ Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp	(working copy)
>@@ -296,6 +296,7 @@ RefPtr<SharedBuffer> FontPlatformData::o
>     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:
> 
>     return HbUniquePtr<hb_font_t>(hb_font_create(face.get()));
> }
>+#endif
> 
> } // namespace WebCore

Actions: View | Formatted Diff | Diff

Attachments on bug 193036: 358077