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

Unified Diff: Source/core/css/resolver/TransformBuilder.cpp

Issue 108653006: Assert that convertToLength succeeds instead of returning Length(Undefined) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebased Created 7 years 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 | « Source/core/css/resolver/StyleBuilderCustom.cpp ('k') | Source/core/rendering/style/BasicShapes.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/TransformBuilder.cpp
diff --git a/Source/core/css/resolver/TransformBuilder.cpp b/Source/core/css/resolver/TransformBuilder.cpp
index 3779a01f6a58f28c9a632c76b73aa664fdf5ef6f..83581d6ec81d24b081123effb89009b7f80982fe 100644
--- a/Source/core/css/resolver/TransformBuilder.cpp
+++ b/Source/core/css/resolver/TransformBuilder.cpp
@@ -53,7 +53,8 @@ TransformBuilder::~TransformBuilder()
static Length convertToFloatLength(CSSPrimitiveValue* primitiveValue, const CSSToLengthConversionData& conversionData)
{
- return primitiveValue ? primitiveValue->convertToLength<FixedConversion | PercentConversion>(conversionData) : Length(Undefined);
+ ASSERT(primitiveValue);
+ return primitiveValue->convertToLength<FixedConversion | PercentConversion>(conversionData);
}
static TransformOperation::OperationType getTransformOperationType(CSSTransformValue::TransformOperationType type)
@@ -180,9 +181,6 @@ bool TransformBuilder::createTransformOperations(CSSValue* inValue, const CSSToL
}
}
- if (tx.isUndefined() || ty.isUndefined())
- return false;
-
operations.operations().append(TranslateTransformOperation::create(tx, ty, Length(0, Fixed), getTransformOperationType(transformValue->operationType())));
break;
}
@@ -209,9 +207,6 @@ bool TransformBuilder::createTransformOperations(CSSValue* inValue, const CSSToL
}
}
- if (tx.isUndefined() || ty.isUndefined() || tz.isUndefined())
- return false;
-
operations.operations().append(TranslateTransformOperation::create(tx, ty, tz, getTransformOperationType(transformValue->operationType())));
break;
}
@@ -311,12 +306,11 @@ bool TransformBuilder::createTransformOperations(CSSValue* inValue, const CSSToL
else {
// This is a quirk that should go away when 3d transforms are finalized.
double val = firstValue->getDoubleValue();
- p = val >= 0 ? Length(clampToPositiveInteger(val), Fixed) : Length(Undefined);
+ if (val < 0)
+ return false;
+ p = Length(clampToPositiveInteger(val), Fixed);
}
- if (p.isUndefined())
- return false;
-
operations.operations().append(PerspectiveTransformOperation::create(p));
break;
}
« no previous file with comments | « Source/core/css/resolver/StyleBuilderCustom.cpp ('k') | Source/core/rendering/style/BasicShapes.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698