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

Unified Diff: third_party/WebKit/Source/platform/fonts/FontCache.cpp

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years 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/platform/fonts/FontCache.cpp
diff --git a/third_party/WebKit/Source/platform/fonts/FontCache.cpp b/third_party/WebKit/Source/platform/fonts/FontCache.cpp
index b863c7102127f79f2082b8638bb8d9daf0c1db73..240740f73360f6f291e3ec770638fdee8e16517a 100644
--- a/third_party/WebKit/Source/platform/fonts/FontCache.cpp
+++ b/third_party/WebKit/Source/platform/fonts/FontCache.cpp
@@ -186,7 +186,7 @@ FontPlatformData* FontCache::getFontPlatformData(
auto adding =
&gFontPlatformDataCache->add(key, SizedFontPlatformDataSet())
.storedValue->value;
- adding->set(roundedSize, wrapUnique(new FontPlatformData(*result)));
+ adding->set(roundedSize, WTF::wrapUnique(new FontPlatformData(*result)));
}
}
@@ -201,7 +201,7 @@ std::unique_ptr<FontPlatformData> FontCache::scaleFontPlatformData(
#if OS(MACOSX)
return createFontPlatformData(fontDescription, creationParams, fontSize);
#else
- return makeUnique<FontPlatformData>(fontPlatformData, fontSize);
+ return WTF::makeUnique<FontPlatformData>(fontPlatformData, fontSize);
#endif
}
@@ -213,7 +213,7 @@ ShapeCache* FontCache::getShapeCache(const FallbackListCompositeKey& key) {
ShapeCache* result = nullptr;
if (it == gFallbackListShaperCache->end()) {
result = new ShapeCache();
- gFallbackListShaperCache->set(key, wrapUnique(result));
+ gFallbackListShaperCache->set(key, WTF::wrapUnique(result));
} else {
result = it->value.get();
}

Powered by Google App Engine
This is Rietveld 408576698