| Index: Source/core/css/CSSFontFace.cpp
|
| diff --git a/Source/core/css/CSSFontFace.cpp b/Source/core/css/CSSFontFace.cpp
|
| index f0e611432ee4eb38e6ec2029bc361538a9edd467..207a1b1af5ddc5059ace881377be1dd77bd191e4 100644
|
| --- a/Source/core/css/CSSFontFace.cpp
|
| +++ b/Source/core/css/CSSFontFace.cpp
|
| @@ -37,6 +37,8 @@
|
|
|
| namespace WebCore {
|
|
|
| +DEFINE_GC_TYPE_MARKER(CSSFontFace);
|
| +
|
| bool CSSFontFace::isLoaded() const
|
| {
|
| size_t size = m_sources.size();
|
| @@ -57,19 +59,14 @@ bool CSSFontFace::isValid() const
|
| return false;
|
| }
|
|
|
| -void CSSFontFace::addedToSegmentedFontFace(CSSSegmentedFontFace* segmentedFontFace)
|
| +void CSSFontFace::addedToSegmentedFontFace(Handle<CSSSegmentedFontFace> segmentedFontFace)
|
| {
|
| m_segmentedFontFaces.add(segmentedFontFace);
|
| }
|
|
|
| -void CSSFontFace::removedFromSegmentedFontFace(CSSSegmentedFontFace* segmentedFontFace)
|
| -{
|
| - m_segmentedFontFaces.remove(segmentedFontFace);
|
| -}
|
| -
|
| void CSSFontFace::addSource(PassOwnPtr<CSSFontFaceSource> source)
|
| {
|
| - source->setFontFace(this);
|
| + source->setFontFace(Handle<CSSFontFace>(this));
|
| m_sources.append(source);
|
| }
|
|
|
| @@ -96,9 +93,9 @@ void CSSFontFace::fontLoaded(CSSFontFaceSource* source)
|
| notifyFontLoader(Error);
|
| }
|
|
|
| - HashSet<CSSSegmentedFontFace*>::iterator end = m_segmentedFontFaces.end();
|
| - for (HashSet<CSSSegmentedFontFace*>::iterator it = m_segmentedFontFaces.begin(); it != end; ++it)
|
| - (*it)->fontLoaded(this);
|
| + HashSet<Member<CSSSegmentedFontFace> >::iterator end = m_segmentedFontFaces.end();
|
| + for (HashSet<Member<CSSSegmentedFontFace> >::iterator it = m_segmentedFontFaces.begin(); it != end; ++it)
|
| + (*it)->fontLoaded(Handle<CSSFontFace>(this));
|
| }
|
|
|
| PassRefPtr<SimpleFontData> CSSFontFace::getFontData(const FontDescription& fontDescription, bool syntheticBold, bool syntheticItalic)
|
| @@ -163,4 +160,10 @@ bool CSSFontFace::hasSVGFontFaceSource() const
|
| }
|
| #endif
|
|
|
| +void CSSFontFace::accept(Visitor* visitor) const
|
| +{
|
| + visitor->visit(m_rule);
|
| + visitor->visit(m_segmentedFontFaces);
|
| +}
|
| +
|
| }
|
|
|