head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.8 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.6 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.4 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.2 pkgsrc-2011Q2-base:1.2; locks; strict; comment @# @; 1.2 date 2011.06.09.11.00.02; author drochner; state dead; branches; next 1.1; 1.1 date 2011.04.14.18.11.45; author drochner; state Exp; branches; next ; desc @@ 1.2 log @update to 1.4.1 this switches to the new stable branch (shlib major changed -> PKGREV bumps needed) @ text @$NetBSD: patch-cb,v 1.1 2011/04/14 18:11:45 drochner Exp $ --- WebCore/css/CSSFontFaceSource.cpp.orig 2010-09-10 13:20:33.000000000 +0000 +++ WebCore/css/CSSFontFaceSource.cpp @@@@ -75,6 +75,18 @@@@ void CSSFontFaceSource::pruneTable() m_fontDataTable.clear(); } +#if ENABLE(SVG_FONTS) +SVGFontFaceElement* CSSFontFaceSource::svgFontFaceElement() const +{ + return m_svgFontFaceElement.get(); +} + +void CSSFontFaceSource::setSVGFontFaceElement(PassRefPtr element) +{ + m_svgFontFaceElement = element; +} +#endif + bool CSSFontFaceSource::isLoaded() const { if (m_font) @@@@ -168,7 +180,7 @@@@ SimpleFontData* CSSFontFaceSource::getFo #if ENABLE(SVG_FONTS) // In-Document SVG Fonts if (m_svgFontFaceElement) { - SVGFontData* svgFontData = new SVGFontData(m_svgFontFaceElement); + SVGFontData* svgFontData = new SVGFontData(m_svgFontFaceElement.get()); fontData.set(new SimpleFontData(FontPlatformData(fontDescription.computedPixelSize(), syntheticBold, syntheticItalic), true, false, svgFontData)); } #endif @ 1.1 log @add patches from upstream, mostly fixing pointer handling isses which can lead to crashes and possibly code injection (cve-2010-4205, cve-2011-0471, cve-2011-0473, cve-2011-0478, cve-2011-0981, cve-2011-0982) bump PKGREV @ text @d1 1 a1 1 $NetBSD$ @