Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(566)

Unified Diff: Source/core/css/CSSFontFace.cpp

Issue 18375005: [oilpan] Move CSSFontFace and CSSSegmentedFontFace to the managed heap (Closed) Base URL: svn://svn.chromium.org/blink/branches/oilpan
Patch Set: Created 7 years, 6 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:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/css/CSSFontFace.cpp
diff --git a/Source/core/css/CSSFontFace.cpp b/Source/core/css/CSSFontFace.cpp
index f0e611432ee4eb38e6ec2029bc361538a9edd467..0cded8d6d5f21c0f26ed39ce2d4134ef738c8eca 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,19 @@ 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)
+void CSSFontFace::removedFromSegmentedFontFace(Handle<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 +98,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)

Powered by Google App Engine
This is Rietveld 408576698