diff options
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/css')
| -rw-r--r-- | chromium/third_party/WebKit/Source/core/css/CSSFontSelector.cpp | 9 | ||||
| -rw-r--r-- | chromium/third_party/WebKit/Source/core/css/resolver/CSSToStyleMap.cpp | 10 |
2 files changed, 13 insertions, 6 deletions
diff --git a/chromium/third_party/WebKit/Source/core/css/CSSFontSelector.cpp b/chromium/third_party/WebKit/Source/core/css/CSSFontSelector.cpp index 166e2c3e4ba..9b83e9e2182 100644 --- a/chromium/third_party/WebKit/Source/core/css/CSSFontSelector.cpp +++ b/chromium/third_party/WebKit/Source/core/css/CSSFontSelector.cpp @@ -167,12 +167,15 @@ static AtomicString familyNameFromSettings(const GenericFontFamilySettings& sett { UScriptCode script = fontDescription.script(); +#if OS(ANDROID) if (fontDescription.genericFamily() == FontDescription::StandardFamily && !fontDescription.isSpecifiedFont()) - return settings.standard(script); + return FontCache::getGenericFamilyNameForScript(FontFamilyNames::webkit_standard, script); -#if OS(ANDROID) - return FontCache::getGenericFamilyNameForScript(genericFamilyName, script); + if (genericFamilyName.startsWith("-webkit-")) + return FontCache::getGenericFamilyNameForScript(genericFamilyName, script); #else + if (fontDescription.genericFamily() == FontDescription::StandardFamily && !fontDescription.isSpecifiedFont()) + return settings.standard(script); if (genericFamilyName == FontFamilyNames::webkit_serif) return settings.serif(script); if (genericFamilyName == FontFamilyNames::webkit_sans_serif) diff --git a/chromium/third_party/WebKit/Source/core/css/resolver/CSSToStyleMap.cpp b/chromium/third_party/WebKit/Source/core/css/resolver/CSSToStyleMap.cpp index 31303805178..9eeec75b2c7 100644 --- a/chromium/third_party/WebKit/Source/core/css/resolver/CSSToStyleMap.cpp +++ b/chromium/third_party/WebKit/Source/core/css/resolver/CSSToStyleMap.cpp @@ -180,11 +180,15 @@ void CSSToStyleMap::mapFillRepeatY(CSSPropertyID, FillLayer* layer, CSSValue* va void CSSToStyleMap::mapFillSize(CSSPropertyID, FillLayer* layer, CSSValue* value) const { - if (!value->isPrimitiveValue()) { - layer->setSizeType(SizeNone); + if (value->isInitialValue()) { + layer->setSizeType(FillLayer::initialFillSizeType(layer->type())); + layer->setSizeLength(FillLayer::initialFillSizeLength(layer->type())); return; } + if (!value->isPrimitiveValue()) + return; + CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); if (primitiveValue->getValueID() == CSSValueContain) layer->setSizeType(Contain); @@ -195,7 +199,7 @@ void CSSToStyleMap::mapFillSize(CSSPropertyID, FillLayer* layer, CSSValue* value LengthSize b = FillLayer::initialFillSizeLength(layer->type()); - if (value->isInitialValue() || primitiveValue->getValueID() == CSSValueContain || primitiveValue->getValueID() == CSSValueCover) { + if (primitiveValue->getValueID() == CSSValueContain || primitiveValue->getValueID() == CSSValueCover) { layer->setSizeLength(b); return; } |