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

Unified Diff: third_party/WebKit/Source/core/css/FontFaceCache.cpp

Issue 1858753003: Remove RawPtr from core/css (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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: third_party/WebKit/Source/core/css/FontFaceCache.cpp
diff --git a/third_party/WebKit/Source/core/css/FontFaceCache.cpp b/third_party/WebKit/Source/core/css/FontFaceCache.cpp
index dc9f9b0c1593ff3bbd01a4c7e1b7534930c03555..7330dd45df597c43a3948e4263eb8cf29af57259 100644
--- a/third_party/WebKit/Source/core/css/FontFaceCache.cpp
+++ b/third_party/WebKit/Source/core/css/FontFaceCache.cpp
@@ -47,18 +47,15 @@ FontFaceCache::FontFaceCache()
{
}
-void FontFaceCache::add(CSSFontSelector* cssFontSelector, const StyleRuleFontFace* fontFaceRule, RawPtr<FontFace> prpFontFace)
+void FontFaceCache::add(CSSFontSelector* cssFontSelector, const StyleRuleFontFace* fontFaceRule, FontFace* fontFace)
{
- RawPtr<FontFace> fontFace = prpFontFace;
if (!m_styleRuleToFontFace.add(fontFaceRule, fontFace).isNewEntry)
return;
addFontFace(cssFontSelector, fontFace, true);
}
-void FontFaceCache::addFontFace(CSSFontSelector* cssFontSelector, RawPtr<FontFace> prpFontFace, bool cssConnected)
+void FontFaceCache::addFontFace(CSSFontSelector* cssFontSelector, FontFace* fontFace, bool cssConnected)
{
- RawPtr<FontFace> fontFace = prpFontFace;
-
FamilyToTraitsMap::AddResult traitsResult = m_fontFaces.add(fontFace->family(), nullptr);
if (!traitsResult.storedValue->value)
traitsResult.storedValue->value = new TraitsMap;
@@ -94,7 +91,7 @@ void FontFaceCache::removeFontFace(FontFace* fontFace, bool cssConnected)
TraitsMap::iterator familyFontFacesIter = familyFontFaces->find(fontFace->traits().bitfield());
if (familyFontFacesIter == familyFontFaces->end())
return;
- RawPtr<CSSSegmentedFontFace> segmentedFontFace = familyFontFacesIter->value;
+ CSSSegmentedFontFace* segmentedFontFace = familyFontFacesIter->value;
segmentedFontFace->removeFontFace(fontFace);
if (segmentedFontFace->isEmpty()) {
« no previous file with comments | « third_party/WebKit/Source/core/css/FontFaceCache.h ('k') | third_party/WebKit/Source/core/css/FontFaceSet.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698