Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(396)

Unified Diff: third_party/WebKit/Source/core/animation/FilterInterpolationFunctions.cpp

Issue 2165833006: Merge CSSSVGDocumentValue with CSSURIValue (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixup FilterInterpolationFunctions Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/core.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/animation/FilterInterpolationFunctions.cpp
diff --git a/third_party/WebKit/Source/core/animation/FilterInterpolationFunctions.cpp b/third_party/WebKit/Source/core/animation/FilterInterpolationFunctions.cpp
index b12ffaf59feed844e18a14ca169935c0687878d0..7c1fbd98833a24235700e7d835283d66af92e520 100644
--- a/third_party/WebKit/Source/core/animation/FilterInterpolationFunctions.cpp
+++ b/third_party/WebKit/Source/core/animation/FilterInterpolationFunctions.cpp
@@ -91,8 +91,11 @@ double clampParameter(double value, FilterOperation::OperationType type)
InterpolationValue FilterInterpolationFunctions::maybeConvertCSSFilter(const CSSValue& value)
{
+ if (value.isURIValue())
+ return nullptr;
+
const CSSFunctionValue& filter = toCSSFunctionValue(value);
- ASSERT(filter.length() <= 1);
+ DCHECK_LE(filter.length(), 1u);
FilterOperation::OperationType type = FilterOperationResolver::filterOperationForType(filter.functionType());
InterpolationValue result = nullptr;
@@ -136,9 +139,6 @@ InterpolationValue FilterInterpolationFunctions::maybeConvertCSSFilter(const CSS
break;
}
- case FilterOperation::REFERENCE:
- return nullptr;
-
default:
NOTREACHED();
return nullptr;
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/core.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698