Title: [199830] trunk/Source/WebCore
- Revision
- 199830
- Author
- commit-qu...@webkit.org
- Date
- 2016-04-21 13:07:40 -0700 (Thu, 21 Apr 2016)
Log Message
Fixed compilation with !ENABLE(SVG_FONTS).
https://bugs.webkit.org/show_bug.cgi?id=156850
Patch by Konstantin Tokarev <annu...@yandex.ru> on 2016-04-21
Reviewed by Michael Catanzaro.
No new tests needed.
* css/CSSFontFaceSource.cpp:
(WebCore::CSSFontFaceSource::CSSFontFaceSource):
Added missing ENABLE(SVG_FONTS) guards.
* css/CSSFontFaceSource.h: Ditto.
* platform/graphics/FontCascade.cpp: Ditto.
* svg/SVGToOTFFontConversion.cpp:
(WebCore::FontCascade::drawGlyphBuffer): Deleted extraneous
!ENABLE(SVG_FONTS) guard.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (199829 => 199830)
--- trunk/Source/WebCore/ChangeLog 2016-04-21 20:05:56 UTC (rev 199829)
+++ trunk/Source/WebCore/ChangeLog 2016-04-21 20:07:40 UTC (rev 199830)
@@ -1,3 +1,21 @@
+2016-04-21 Konstantin Tokarev <annu...@yandex.ru>
+
+ Fixed compilation with !ENABLE(SVG_FONTS).
+ https://bugs.webkit.org/show_bug.cgi?id=156850
+
+ Reviewed by Michael Catanzaro.
+
+ No new tests needed.
+
+ * css/CSSFontFaceSource.cpp:
+ (WebCore::CSSFontFaceSource::CSSFontFaceSource):
+ Added missing ENABLE(SVG_FONTS) guards.
+ * css/CSSFontFaceSource.h: Ditto.
+ * platform/graphics/FontCascade.cpp: Ditto.
+ * svg/SVGToOTFFontConversion.cpp:
+ (WebCore::FontCascade::drawGlyphBuffer): Deleted extraneous
+ !ENABLE(SVG_FONTS) guard.
+
2016-04-21 Beth Dakin <bda...@apple.com>
Remove reliance on WebAVMediaSelectionOptionMac for the
Modified: trunk/Source/WebCore/css/CSSFontFaceSource.cpp (199829 => 199830)
--- trunk/Source/WebCore/css/CSSFontFaceSource.cpp 2016-04-21 20:05:56 UTC (rev 199829)
+++ trunk/Source/WebCore/css/CSSFontFaceSource.cpp 2016-04-21 20:07:40 UTC (rev 199830)
@@ -73,8 +73,14 @@
: m_familyNameOrURI(familyNameOrURI)
, m_font(font)
, m_face(owner)
+#if ENABLE(SVG_FONTS)
, m_svgFontFaceElement(fontFace)
+#endif
{
+#if !ENABLE(SVG_FONTS)
+ UNUSED_PARAM(fontFace);
+#endif
+
// This may synchronously call fontLoaded().
if (m_font)
m_font->addClient(this);
Modified: trunk/Source/WebCore/css/CSSFontFaceSource.h (199829 => 199830)
--- trunk/Source/WebCore/css/CSSFontFaceSource.h 2016-04-21 20:05:56 UTC (rev 199829)
+++ trunk/Source/WebCore/css/CSSFontFaceSource.h 2016-04-21 20:07:40 UTC (rev 199830)
@@ -81,7 +81,9 @@
RefPtr<SharedBuffer> m_generatedOTFBuffer;
+#if ENABLE(SVG_FONTS)
RefPtr<SVGFontFaceElement> m_svgFontFaceElement;
+#endif
std::unique_ptr<FontCustomPlatformData> m_inDocumentCustomPlatformData;
Status m_status { Status::Pending };
Modified: trunk/Source/WebCore/platform/graphics/FontCascade.cpp (199829 => 199830)
--- trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2016-04-21 20:05:56 UTC (rev 199829)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2016-04-21 20:07:40 UTC (rev 199830)
@@ -1276,10 +1276,6 @@
void FontCascade::drawGlyphBuffer(GraphicsContext& context, const GlyphBuffer& glyphBuffer, FloatPoint& point) const
{
-#if !ENABLE(SVG_FONTS)
- UNUSED_PARAM(run);
-#endif
-
// Draw each contiguous run of glyphs that use the same font data.
const Font* fontData = glyphBuffer.fontAt(0);
FloatSize offset = glyphBuffer.offsetAt(0);
Modified: trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp (199829 => 199830)
--- trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2016-04-21 20:05:56 UTC (rev 199829)
+++ trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2016-04-21 20:07:40 UTC (rev 199830)
@@ -26,6 +26,8 @@
#include "config.h"
#include "SVGToOTFFontConversion.h"
+#if ENABLE(SVG_FONTS)
+
#include "CSSStyleDeclaration.h"
#include "ElementChildIterator.h"
#include "Glyph.h"
@@ -1593,3 +1595,5 @@
}
}
+
+#endif // ENABLE(SVG_FONTS)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
