Skip to content
Permalink
Browse files
[WinCairo] Fix build after Bug 167956
https://bugs.webkit.org/show_bug.cgi?id=177921

Patch by Fujii Hironori <Hironori.Fujii@sony.com> on 2017-10-05
Reviewed by Carlos Garcia Campos.

FontCascade::fontForCombiningCharacterSequence wasn't defined for
WinCairo port. It should be defined if !USE(HARFBUZZ).

No new tests because there is no behavior change.

* platform/graphics/FontCascade.cpp: Use !USE(HARFBUZZ) instead of !USE(CAIRO).

Canonical link: https://commits.webkit.org/194183@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@222908 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
fujii authored and webkit-commit-queue committed Oct 5, 2017
1 parent 3d38fd0 commit 9e192767f6c98c7e4a3227d1d4d2230703ad32f9
Showing 2 changed files with 15 additions and 1 deletion.
@@ -1,3 +1,17 @@
2017-10-05 Fujii Hironori <Hironori.Fujii@sony.com>

[WinCairo] Fix build after Bug 167956
https://bugs.webkit.org/show_bug.cgi?id=177921

Reviewed by Carlos Garcia Campos.

FontCascade::fontForCombiningCharacterSequence wasn't defined for
WinCairo port. It should be defined if !USE(HARFBUZZ).

No new tests because there is no behavior change.

* platform/graphics/FontCascade.cpp: Use !USE(HARFBUZZ) instead of !USE(CAIRO).

2017-10-05 Zan Dobersek <zdobersek@igalia.com>

Align BitmapImage::LargeAnimationCutoff to a megabyte value
@@ -1593,7 +1593,7 @@ int FontCascade::offsetForPositionForComplexText(const TextRun& run, float x, bo
}
#endif

#if !PLATFORM(COCOA) && !USE(CAIRO)
#if !PLATFORM(COCOA) && !USE(HARFBUZZ)
// FIXME: Unify this with the macOS and iOS implementation.
const Font* FontCascade::fontForCombiningCharacterSequence(const UChar* characters, size_t length) const
{

0 comments on commit 9e19276

Please sign in to comment.