Title: [209659] trunk/Source/WebCore
- Revision
- 209659
- Author
- [email protected]
- Date
- 2016-12-10 01:58:06 -0800 (Sat, 10 Dec 2016)
Log Message
CrashTracer: com.apple.WebKit.WebContent.Development at com.apple.WebCore: WTF::match_constness<WebCore::CSSValue, WebCore::CSSContentDistributionValue>::type& WTF::downcast<WebCore::CSSContentDistributionValue, WebCore::CSSValue> + 65
https://bugs.webkit.org/show_bug.cgi?id=165652
rdar://problem/28465278
Reviewed by Darin Adler.
No, test don't know how to get here.
* css/StyleBuilderConverter.h:
(WebCore::StyleBuilderConverter::convertContentAlignmentData):
Add type checks.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (209658 => 209659)
--- trunk/Source/WebCore/ChangeLog 2016-12-10 09:29:08 UTC (rev 209658)
+++ trunk/Source/WebCore/ChangeLog 2016-12-10 09:58:06 UTC (rev 209659)
@@ -1,3 +1,18 @@
+2016-12-10 Antti Koivisto <[email protected]>
+
+ CrashTracer: com.apple.WebKit.WebContent.Development at com.apple.WebCore: WTF::match_constness<WebCore::CSSValue, WebCore::CSSContentDistributionValue>::type& WTF::downcast<WebCore::CSSContentDistributionValue, WebCore::CSSValue> + 65
+ https://bugs.webkit.org/show_bug.cgi?id=165652
+ rdar://problem/28465278
+
+ Reviewed by Darin Adler.
+
+ No, test don't know how to get here.
+
+ * css/StyleBuilderConverter.h:
+ (WebCore::StyleBuilderConverter::convertContentAlignmentData):
+
+ Add type checks.
+
2016-12-10 Jiewen Tan <[email protected]>
[WebCrypto] RSA algorithms should allow importing keys without usages
Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (209658 => 209659)
--- trunk/Source/WebCore/css/StyleBuilderConverter.h 2016-12-10 09:29:08 UTC (rev 209658)
+++ trunk/Source/WebCore/css/StyleBuilderConverter.h 2016-12-10 09:58:06 UTC (rev 209659)
@@ -1356,6 +1356,8 @@
StyleContentAlignmentData alignmentData = RenderStyle::initialContentAlignment();
#if ENABLE(CSS_GRID_LAYOUT)
if (RuntimeEnabledFeatures::sharedFeatures().isCSSGridLayoutEnabled()) {
+ if (!is<CSSContentDistributionValue>(value))
+ return alignmentData;
auto& contentValue = downcast<CSSContentDistributionValue>(value);
if (contentValue.distribution()->valueID() != CSSValueInvalid)
alignmentData.setDistribution(contentValue.distribution().get());
@@ -1366,6 +1368,8 @@
return alignmentData;
}
#endif
+ if (!is<CSSPrimitiveValue>(value))
+ return alignmentData;
auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
switch (primitiveValue.valueID()) {
case CSSValueStretch:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes