Title: [255485] trunk/Source/WebCore
- Revision
- 255485
- Author
- [email protected]
- Date
- 2020-01-30 21:35:42 -0800 (Thu, 30 Jan 2020)
Log Message
Ensure non-initial values for CSS Font properties
https://bugs.webkit.org/show_bug.cgi?id=206312
Patch by Doug Kelly <[email protected]> on 2020-01-30
Reviewed by Antti Koivisto.
If CSS font properties are currently initial values, set them to a normal value.
* css/CSSFontFaceSet.cpp:
(WebCore::computeFontSelectionRequest):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (255484 => 255485)
--- trunk/Source/WebCore/ChangeLog 2020-01-31 05:28:11 UTC (rev 255484)
+++ trunk/Source/WebCore/ChangeLog 2020-01-31 05:35:42 UTC (rev 255485)
@@ -1,5 +1,17 @@
2020-01-30 Doug Kelly <[email protected]>
+ Ensure non-initial values for CSS Font properties
+ https://bugs.webkit.org/show_bug.cgi?id=206312
+
+ Reviewed by Antti Koivisto.
+
+ If CSS font properties are currently initial values, set them to a normal value.
+
+ * css/CSSFontFaceSet.cpp:
+ (WebCore::computeFontSelectionRequest):
+
+2020-01-30 Doug Kelly <[email protected]>
+
Crash in GraphicsLayerCA::fetchCloneLayers() when setting contents to solid color
https://bugs.webkit.org/show_bug.cgi?id=205530
Modified: trunk/Source/WebCore/css/CSSFontFaceSet.cpp (255484 => 255485)
--- trunk/Source/WebCore/css/CSSFontFaceSet.cpp 2020-01-31 05:28:11 UTC (rev 255484)
+++ trunk/Source/WebCore/css/CSSFontFaceSet.cpp 2020-01-31 05:35:42 UTC (rev 255485)
@@ -303,15 +303,15 @@
static ExceptionOr<FontSelectionRequest> computeFontSelectionRequest(MutableStyleProperties& style)
{
RefPtr<CSSValue> weightValue = style.getPropertyCSSValue(CSSPropertyFontWeight).get();
- if (!weightValue)
+ if (!weightValue || weightValue->isInitialValue())
weightValue = CSSValuePool::singleton().createIdentifierValue(CSSValueNormal).ptr();
RefPtr<CSSValue> stretchValue = style.getPropertyCSSValue(CSSPropertyFontStretch).get();
- if (!stretchValue)
+ if (!stretchValue || stretchValue->isInitialValue())
stretchValue = CSSValuePool::singleton().createIdentifierValue(CSSValueNormal).ptr();
RefPtr<CSSValue> styleValue = style.getPropertyCSSValue(CSSPropertyFontStyle).get();
- if (!styleValue)
+ if (!styleValue || styleValue->isInitialValue())
styleValue = CSSFontStyleValue::create(CSSValuePool::singleton().createIdentifierValue(CSSValueNormal));
if (weightValue->isGlobalKeyword() || stretchValue->isGlobalKeyword() || styleValue->isGlobalKeyword())
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
