Support calc() in webkit-line-clamp

When parsing webkit-line-clamp, it was explicitly checked if the token was a number token, which excluded calc() values. Remove that check so calc() values are supported. Bug: 397061 Change-Id: Idc8602f6ebeed22d1d849bdd6d6bb9be7064e5d2 Reviewed-on: https://chromium-review.googlesource.com/1034386Reviewed-by: Rune Lillesveen <futhark@chromium.org> Commit-Queue: Chris Nardi <cnardi@chromium.org> Cr-Commit-Position: refs/heads/master@{#554823}

Support calc() in webkit-line-clamp
When parsing webkit-line-clamp, it was explicitly checked if the token was a number token, which excluded calc() values. Remove that check so calc() values are supported. Bug: 397061 Change-Id: Idc8602f6ebeed22d1d849bdd6d6bb9be7064e5d2 Reviewed-on: https://chromium-review.googlesource.com/1034386Reviewed-by: Rune Lillesveen <futhark@chromium.org> Commit-Queue: Chris Nardi <cnardi@chromium.org> Cr-Commit-Position: refs/heads/master@{#554823}
fa9c81b1 · Chris Nardi · Commit Bot · 0a445800 · fa9c81b1 · fa9c81b1
Commit fa9c81b1 authored Apr 30, 2018 by Chris Nardi Committed by Commit Bot Apr 30, 2018
2 changed files
--- a/third_party/WebKit/LayoutTests/css3/calc/webkit-line-clamp-calc.html
+++ b/third_party/WebKit/LayoutTests/css3/calc/webkit-line-clamp-calc.html
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Test: calc() function in webkit-line-clamp</title>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<style>
+    #test {
+        -webkit-line-clamp: calc(2);
+    }
+</style>
+<div id="test"></div>
+<script>
+    const div = document.querySelector("#test");
+    test(function() {
+        assert_equals(getComputedStyle(div).webkitLineClamp, "2");
+    }, "calc() in webkit-line-clamp");
+</script>
--- a/third_party/blink/renderer/core/css/properties/longhands/webkit_line_clamp_custom.cc
+++ b/third_party/blink/renderer/core/css/properties/longhands/webkit_line_clamp_custom.cc
@@ -14,9 +14,6 @@ const CSSValue* WebkitLineClamp::ParseSingleValue(
    CSSParserTokenRange& range,
    const CSSParserContext& context,
    const CSSParserLocalContext&) const {
-  if (range.Peek().GetType() != kNumberToken)
-    return nullptr;
-
  // When specifying number of lines, don't allow 0 as a valid value.
  return CSSPropertyParserHelpers::ConsumePositiveInteger(range);
 }