Title: [171785] trunk
- Revision
- 171785
- Author
- [email protected]
- Date
- 2014-07-29 20:51:31 -0700 (Tue, 29 Jul 2014)
Log Message
Crash when using 'em' units to specify font-size inside animation keyframe.
<https://webkit.org/b/135395>
<rdar://problem/17851910>
Source/WebCore:
We'd forgotten to initialize the "parent style" when resolving keyframe
styles, and this led to a crash in length conversion where the code
assumes a parent style will be present.
To keep this fix minimal, simply make the "parent style" a clone of the
base element style.
Reviewed by Simon Fraser.
Test: fast/animation/keyframe-with-font-size-in-em-units.html
* css/StyleResolver.cpp:
(WebCore::StyleResolver::styleForKeyframe):
LayoutTests:
Add a reduced test case to cover this bug.
Reviewed by Simon Fraser.
* fast/animation/keyframe-with-font-size-in-em-units-expected.txt: Added.
* fast/animation/keyframe-with-font-size-in-em-units.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (171784 => 171785)
--- trunk/LayoutTests/ChangeLog 2014-07-30 03:48:54 UTC (rev 171784)
+++ trunk/LayoutTests/ChangeLog 2014-07-30 03:51:31 UTC (rev 171785)
@@ -1,3 +1,16 @@
+2014-07-29 Andreas Kling <[email protected]>
+
+ Crash when using 'em' units to specify font-size inside animation keyframe.
+ <https://webkit.org/b/135395>
+ <rdar://problem/17851910>
+
+ Add a reduced test case to cover this bug.
+
+ Reviewed by Simon Fraser.
+
+ * fast/animation/keyframe-with-font-size-in-em-units-expected.txt: Added.
+ * fast/animation/keyframe-with-font-size-in-em-units.html: Added.
+
2014-07-29 Alexey Proskuryakov <[email protected]>
fast/borders/border-radius-on-subpixel-position-non-hidpi.html fails on Retina machines
Added: trunk/LayoutTests/fast/animation/keyframe-with-font-size-in-em-units-expected.txt (0 => 171785)
--- trunk/LayoutTests/fast/animation/keyframe-with-font-size-in-em-units-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/animation/keyframe-with-font-size-in-em-units-expected.txt 2014-07-30 03:51:31 UTC (rev 171785)
@@ -0,0 +1 @@
+PASS (no crash)
Added: trunk/LayoutTests/fast/animation/keyframe-with-font-size-in-em-units.html (0 => 171785)
--- trunk/LayoutTests/fast/animation/keyframe-with-font-size-in-em-units.html (rev 0)
+++ trunk/LayoutTests/fast/animation/keyframe-with-font-size-in-em-units.html 2014-07-30 03:51:31 UTC (rev 171785)
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@-webkit-keyframes foo {
+ from {
+ font-size: 2em;
+ }
+}
+#foo {
+ -webkit-animation: foo 1s linear 0.0s infinite;
+}
+</style>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+<body>
+<div id="foo"></div>
+<span>PASS (no crash)</span>
+</body>
+</html>
Modified: trunk/Source/WebCore/ChangeLog (171784 => 171785)
--- trunk/Source/WebCore/ChangeLog 2014-07-30 03:48:54 UTC (rev 171784)
+++ trunk/Source/WebCore/ChangeLog 2014-07-30 03:51:31 UTC (rev 171785)
@@ -1,3 +1,23 @@
+2014-07-29 Andreas Kling <[email protected]>
+
+ Crash when using 'em' units to specify font-size inside animation keyframe.
+ <https://webkit.org/b/135395>
+ <rdar://problem/17851910>
+
+ We'd forgotten to initialize the "parent style" when resolving keyframe
+ styles, and this led to a crash in length conversion where the code
+ assumes a parent style will be present.
+
+ To keep this fix minimal, simply make the "parent style" a clone of the
+ base element style.
+
+ Reviewed by Simon Fraser.
+
+ Test: fast/animation/keyframe-with-font-size-in-em-units.html
+
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::styleForKeyframe):
+
2014-07-29 Pratik Solanki <[email protected]>
[iOS] REGRESSION(r171526): PDF documents fail to load in WebKit1 with disk image caching enabled
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (171784 => 171785)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-07-30 03:48:54 UTC (rev 171784)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-07-30 03:51:31 UTC (rev 171785)
@@ -825,6 +825,7 @@
// Create the style
state.setStyle(RenderStyle::clone(elementStyle));
+ state.setParentStyle(RenderStyle::clone(elementStyle));
state.setLineHeightValue(0);
TextDirection direction;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
