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

Unified Diff: Source/core/css/CSSPrimitiveValue.h

Issue 813233002: Animation: Fix loss of type information when interpolating value of 0 (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Attempt no2 at fixing linux oilpan errors Created 6 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
Index: Source/core/css/CSSPrimitiveValue.h
diff --git a/Source/core/css/CSSPrimitiveValue.h b/Source/core/css/CSSPrimitiveValue.h
index 11ad30d3a8ab9920a3b7539f607a54e499397448..410224339bea23fa0337b3e9ec3679562106e015 100644
--- a/Source/core/css/CSSPrimitiveValue.h
+++ b/Source/core/css/CSSPrimitiveValue.h
@@ -26,6 +26,7 @@
#include "core/CSSValueKeywords.h"
#include "core/css/CSSValue.h"
#include "platform/graphics/Color.h"
+#include "wtf/BitVector.h"
#include "wtf/Forward.h"
#include "wtf/MathExtras.h"
#include "wtf/PassRefPtr.h"
@@ -150,7 +151,9 @@ public:
};
typedef Vector<double, CSSPrimitiveValue::LengthUnitTypeCount> CSSLengthArray;
- void accumulateLengthArray(CSSLengthArray&, double multiplier = 1) const;
+ typedef BitVector CSSLengthTypeArray;
samli 2014/12/22 03:38:04 Since we're only going to need to use this in one
+
+ void accumulateLengthArray(CSSLengthArray&, CSSLengthTypeArray&, double multiplier = 1) const;
samli 2014/12/22 03:38:04 Add an extra accumulateLengthArray that doesn't re
// This enum follows the BisonCSSParser::Units enum augmented with UNIT_FREQUENCY for frequencies.
enum UnitCategory {
@@ -385,6 +388,8 @@ private:
};
typedef CSSPrimitiveValue::CSSLengthArray CSSLengthArray;
+typedef CSSPrimitiveValue::CSSLengthTypeArray CSSLengthTypeArray;
samli 2014/12/22 03:38:04 We definitely don't need this anymore :)
evemj (not active) 2014/12/22 06:09:05 Done.
+
DEFINE_CSS_VALUE_TYPE_CASTS(CSSPrimitiveValue, isPrimitiveValue());

Powered by Google App Engine
This is Rietveld 408576698