diff options
author | Steve Block <steveblock@google.com> | 2011-02-17 09:06:39 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-17 09:06:39 -0800 |
commit | 7aed021d3442e74aedc738192c55d8978b2d9643 (patch) | |
tree | 7801e8554b642ef58b280135c847003f833bb70e /WebCore/css/CSSFontFaceSource.h | |
parent | 990373e4c55ba4f0312b5ab7974388d717d1907c (diff) | |
parent | f7f6d6409be37f76dc308902285d24806dc87ef2 (diff) | |
download | external_webkit-7aed021d3442e74aedc738192c55d8978b2d9643.zip external_webkit-7aed021d3442e74aedc738192c55d8978b2d9643.tar.gz external_webkit-7aed021d3442e74aedc738192c55d8978b2d9643.tar.bz2 |
Merge "Merge WebKit at Chromium 9.0.597.106: Initial merge by Git"
Diffstat (limited to 'WebCore/css/CSSFontFaceSource.h')
-rw-r--r-- | WebCore/css/CSSFontFaceSource.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/css/CSSFontFaceSource.h b/WebCore/css/CSSFontFaceSource.h index e2057cc..a5c3e61 100644 --- a/WebCore/css/CSSFontFaceSource.h +++ b/WebCore/css/CSSFontFaceSource.h @@ -63,8 +63,8 @@ public: void pruneTable(); #if ENABLE(SVG_FONTS) - SVGFontFaceElement* svgFontFaceElement() const { return m_svgFontFaceElement; } - void setSVGFontFaceElement(SVGFontFaceElement* element) { m_svgFontFaceElement = element; } + SVGFontFaceElement* svgFontFaceElement() const; + void setSVGFontFaceElement(PassRefPtr<SVGFontFaceElement>); bool isSVGFontFaceSource() const; #endif @@ -75,7 +75,7 @@ private: HashMap<unsigned, SimpleFontData*> m_fontDataTable; // The hash key is composed of size synthetic styles. #if ENABLE(SVG_FONTS) - SVGFontFaceElement* m_svgFontFaceElement; + RefPtr<SVGFontFaceElement> m_svgFontFaceElement; RefPtr<SVGFontElement> m_externalSVGFontElement; #endif }; |