Index: third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp |
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp b/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp |
index 175f0722c128dd66583525fb1d5ce29b6d605f4c..6935b778e4469d82bdbe8b0e87c2641366782e4c 100644 |
--- a/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp |
+++ b/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp |
@@ -46,9 +46,11 @@ |
#include "core/css/CSSValuePair.h" |
#include "core/css/resolver/FilterOperationResolver.h" |
#include "core/frame/LocalFrame.h" |
+#include "core/frame/UseCounter.h" |
#include "core/style/ClipPathOperation.h" |
#include "core/style/TextSizeAdjust.h" |
#include "core/svg/SVGURIReference.h" |
+#include "platform/fonts/FontCache.h" |
#include "platform/transforms/RotateTransformOperation.h" |
#include "platform/transforms/ScaleTransformOperation.h" |
#include "platform/transforms/TranslateTransformOperation.h" |
@@ -188,6 +190,12 @@ static bool convertFontFamilyName( |
if (value.isFontFamilyValue()) { |
genericFamily = FontDescription::NoFamily; |
familyName = AtomicString(toCSSFontFamilyValue(value).value()); |
+#if OS(MACOSX) |
+ if (familyName == FontCache::legacySystemFontFamily()) { |
+ UseCounter::count(state.document(), UseCounter::BlinkMacSystemFont); |
+ familyName = FontFamilyNames::system_ui; |
+ } |
+#endif |
} else if (state.document().settings()) { |
genericFamily = |
convertGenericFamily(toCSSIdentifierValue(value).getValueID()); |