Title: [228833] branches/safari-605-branch
- Revision
- 228833
- Author
- [email protected]
- Date
- 2018-02-20 14:29:48 -0800 (Tue, 20 Feb 2018)
Log Message
Cherry-pick r228585. rdar://problem/37697677
Modified Paths
Added Paths
Diff
Added: branches/safari-605-branch/LayoutTests/fast/css/calc-mixed-blend-crash-expected.txt (0 => 228833)
--- branches/safari-605-branch/LayoutTests/fast/css/calc-mixed-blend-crash-expected.txt (rev 0)
+++ branches/safari-605-branch/LayoutTests/fast/css/calc-mixed-blend-crash-expected.txt 2018-02-20 22:29:48 UTC (rev 228833)
@@ -0,0 +1 @@
+This test passes if it doesn't crash.
Added: branches/safari-605-branch/LayoutTests/fast/css/calc-mixed-blend-crash.html (0 => 228833)
--- branches/safari-605-branch/LayoutTests/fast/css/calc-mixed-blend-crash.html (rev 0)
+++ branches/safari-605-branch/LayoutTests/fast/css/calc-mixed-blend-crash.html 2018-02-20 22:29:48 UTC (rev 228833)
@@ -0,0 +1,27 @@
+<html>
+<div id="targetElem"></div>
+This test passes if it doesn't crash.
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+var head = document.getElementsByTagName("head")[0];
+var style = document.createElement("style");
+style.innerHTML=`* {
+position: inherit;
+-webkit-animation-name: name;
+-webkit-animation-duration: 0.1s;
+-webkit-animation-direction: alternate;
+}
+@-webkit-keyframes name {
+ from {
+ word-spacing: 5;
+ }
+ to {
+ word-spacing: 10%;
+ }
+}
+`;
+head.appendChild(style);
+document.getElementById("targetElem").style.WebkitTransitionDuration="1s";
+</script>
+</html>
Modified: branches/safari-605-branch/Source/WebCore/ChangeLog (228832 => 228833)
--- branches/safari-605-branch/Source/WebCore/ChangeLog 2018-02-20 22:29:46 UTC (rev 228832)
+++ branches/safari-605-branch/Source/WebCore/ChangeLog 2018-02-20 22:29:48 UTC (rev 228833)
@@ -1,5 +1,24 @@
2018-02-20 Jason Marcell <[email protected]>
+ Cherry-pick r228585. rdar://problem/37697677
+
+ 2018-02-16 Antti Koivisto <[email protected]>
+
+ Assert in mixed blend animation
+ https://bugs.webkit.org/show_bug.cgi?id=182887
+ <rdar://problem/37598140>
+
+ Reviewed by Zalan Bujtas.
+
+ Test: fast/css/calc-mixed-blend-crash.html
+
+ * platform/CalculationValue.cpp:
+ (WebCore::CalcExpressionBlendLength::CalcExpressionBlendLength):
+
+ Fix mismatch between the type test and the value used.
+
+2018-02-20 Jason Marcell <[email protected]>
+
Cherry-pick r228574. rdar://problem/37697675
2018-02-16 Chris Dumez <[email protected]>
Modified: branches/safari-605-branch/Source/WebCore/platform/CalculationValue.cpp (228832 => 228833)
--- branches/safari-605-branch/Source/WebCore/platform/CalculationValue.cpp 2018-02-20 22:29:46 UTC (rev 228832)
+++ branches/safari-605-branch/Source/WebCore/platform/CalculationValue.cpp 2018-02-20 22:29:48 UTC (rev 228833)
@@ -178,7 +178,7 @@
if (m_from.isCalculated() && m_from.calculationValue()._expression_().type() == CalcExpressionNodeBlendLength)
m_from = toCalcExpressionBlendLength(m_from.calculationValue()._expression_()).from();
if (m_to.isCalculated() && m_to.calculationValue()._expression_().type() == CalcExpressionNodeBlendLength)
- m_to = toCalcExpressionBlendLength(m_from.calculationValue()._expression_()).to();
+ m_to = toCalcExpressionBlendLength(m_to.calculationValue()._expression_()).to();
}
float CalcExpressionBlendLength::evaluate(float maxValue) const
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
