Source/WebCore/css/CSSFontFaceSource.h - Issue 6469011: Merge 76990

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/WebCore/css/CSSFontFaceSource.h

Issue 6469011: Merge 76990 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/

Patch Set: Created 9 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: Source/WebCore/css/CSSFontFaceSource.h

===================================================================

--- Source/WebCore/css/CSSFontFaceSource.h (revision 78116)

+++ Source/WebCore/css/CSSFontFaceSource.h (working copy)

@@ -63,8 +63,8 @@

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

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

};