Changeset 222908 in webkit

Timestamp:

Oct 5, 2017 3:49:45 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

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

Patch by Fujii Hironori <Fujii Hironori> 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).

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/FontCascade.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/platform/graphics/FontCascade.cpp

@@ -1594 +1594 @@
 #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