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

Unified Diff: third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.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/win/FontCacheSkiaWin.cpp
diff --git a/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp b/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp
index d511e0620d7e11c0f95857276ef14fbc2e45c27a..ed5c3ec71cfdfac6d5cdeeb0651f4971482a9550 100644
--- a/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp
+++ b/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp
@@ -369,15 +369,16 @@ std::unique_ptr<FontPlatformData> FontCache::createFontPlatformData(
}
}
- std::unique_ptr<FontPlatformData> result = wrapUnique(new FontPlatformData(
- tf, name.data(), fontSize,
- (fontDescription.weight() >= FontWeight600 && !tf->isBold()) ||
- fontDescription.isSyntheticBold(),
- ((fontDescription.style() == FontStyleItalic ||
- fontDescription.style() == FontStyleOblique) &&
- !tf->isItalic()) ||
- fontDescription.isSyntheticItalic(),
- fontDescription.orientation()));
+ std::unique_ptr<FontPlatformData> result =
+ WTF::wrapUnique(new FontPlatformData(
+ tf, name.data(), fontSize,
+ (fontDescription.weight() >= FontWeight600 && !tf->isBold()) ||
+ fontDescription.isSyntheticBold(),
+ ((fontDescription.style() == FontStyleItalic ||
+ fontDescription.style() == FontStyleOblique) &&
+ !tf->isItalic()) ||
+ fontDescription.isSyntheticItalic(),
+ fontDescription.orientation()));
struct FamilyMinSize {
const wchar_t* family;

Powered by Google App Engine
This is Rietveld 408576698