Title: [205445] releases/WebKitGTK/webkit-2.12
- Revision
- 205445
- Author
- [email protected]
- Date
- 2016-09-05 02:35:33 -0700 (Mon, 05 Sep 2016)
Log Message
Merge r205392 - Should never be reached failure in WebCore::floatValueForLength
https://bugs.webkit.org/show_bug.cgi?id=139397
<rdar://problem/27704376>
Reviewed by Simon Fraser.
Source/WebCore:
floatValueForLength can't resolve unspecified Length types. Filter them out and return 0 as if they were auto.
Test: svg/css/assert-on-non-resolvable-dimension.html
* svg/SVGLengthContext.cpp:
(WebCore::SVGLengthContext::valueForLength):
LayoutTests:
* svg/css/assert-on-non-resolvable-dimension-expected.txt: Added.
* svg/css/assert-on-non-resolvable-dimension.html: Added.
Modified Paths
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (205444 => 205445)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-09-05 09:34:19 UTC (rev 205444)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-09-05 09:35:33 UTC (rev 205445)
@@ -1,5 +1,16 @@
2016-09-02 Zalan Bujtas <[email protected]>
+ Should never be reached failure in WebCore::floatValueForLength
+ https://bugs.webkit.org/show_bug.cgi?id=139397
+ <rdar://problem/27704376>
+
+ Reviewed by Simon Fraser.
+
+ * svg/css/assert-on-non-resolvable-dimension-expected.txt: Added.
+ * svg/css/assert-on-non-resolvable-dimension.html: Added.
+
+2016-09-02 Zalan Bujtas <[email protected]>
+
ASSERT_NOT_REACHED() is touched in WebCore::valueForLength
https://bugs.webkit.org/show_bug.cgi?id=123337
<rdar://problem/27684121>
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/svg/css/assert-on-non-resolvable-dimension-expected.txt (0 => 205445)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/svg/css/assert-on-non-resolvable-dimension-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/svg/css/assert-on-non-resolvable-dimension-expected.txt 2016-09-05 09:35:33 UTC (rev 205445)
@@ -0,0 +1 @@
+PASS if no assert in debug.
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/svg/css/assert-on-non-resolvable-dimension.html (0 => 205445)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/svg/css/assert-on-non-resolvable-dimension.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/svg/css/assert-on-non-resolvable-dimension.html 2016-09-05 09:35:33 UTC (rev 205445)
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we don't assert on non-resolvable values.</title>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+<body>
+PASS if no assert in debug.
+<svg>
+ <rect style="width: -webkit-fit-content;"></rect>
+ <rect sstyle="width: max-content;">foobar</rect>
+ <rect sstyle="width: min-content;">foobar</rect>
+ <rect sstyle="width: fit-content;">foobar</rect>
+ <rect sstyle="width: intrinsic;">foobar</rect>
+ <rect sstyle="width: min-intrinsic;">foobar</rect>
+ <rect sstyle="width: relative;">foobar</rect>
+ <rect sstyle="width: undefined;">foobar</rect>
+</svg>
+</body>
+</html>
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (205444 => 205445)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-09-05 09:34:19 UTC (rev 205444)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-09-05 09:35:33 UTC (rev 205445)
@@ -1,5 +1,20 @@
2016-09-02 Zalan Bujtas <[email protected]>
+ Should never be reached failure in WebCore::floatValueForLength
+ https://bugs.webkit.org/show_bug.cgi?id=139397
+ <rdar://problem/27704376>
+
+ Reviewed by Simon Fraser.
+
+ floatValueForLength can't resolve unspecified Length types. Filter them out and return 0 as if they were auto.
+
+ Test: svg/css/assert-on-non-resolvable-dimension.html
+
+ * svg/SVGLengthContext.cpp:
+ (WebCore::SVGLengthContext::valueForLength):
+
+2016-09-02 Zalan Bujtas <[email protected]>
+
ASSERT_NOT_REACHED() is touched in WebCore::valueForLength
https://bugs.webkit.org/show_bug.cgi?id=123337
<rdar://problem/27684121>
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/svg/SVGLengthContext.cpp (205444 => 205445)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/svg/SVGLengthContext.cpp 2016-09-05 09:34:19 UTC (rev 205444)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/svg/SVGLengthContext.cpp 2016-09-05 09:35:33 UTC (rev 205445)
@@ -91,7 +91,7 @@
{
if (length.isPercent())
return convertValueFromPercentageToUserUnits(length.value() / 100, mode, IGNORE_EXCEPTION);
- if (length.isAuto())
+ if (length.isAuto() || !length.isSpecified())
return 0;
FloatSize viewportSize;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
