Title: [222908] trunk/Source/WebCore
- Revision
- 222908
- Author
- [email protected]
- Date
- 2017-10-05 03:49:45 -0700 (Thu, 05 Oct 2017)
Log Message
[WinCairo] Fix build after Bug 167956
https://bugs.webkit.org/show_bug.cgi?id=177921
Patch by Fujii Hironori <[email protected]> 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).
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (222907 => 222908)
--- trunk/Source/WebCore/ChangeLog 2017-10-05 09:32:58 UTC (rev 222907)
+++ trunk/Source/WebCore/ChangeLog 2017-10-05 10:49:45 UTC (rev 222908)
@@ -1,3 +1,17 @@
+2017-10-05 Fujii Hironori <[email protected]>
+
+ [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 <[email protected]>
Align BitmapImage::LargeAnimationCutoff to a megabyte value
Modified: trunk/Source/WebCore/platform/graphics/FontCascade.cpp (222907 => 222908)
--- trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2017-10-05 09:32:58 UTC (rev 222907)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2017-10-05 10:49:45 UTC (rev 222908)
@@ -1593,7 +1593,7 @@
}
#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
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
