Merge from Chromium at DEPS revision 257591
This commit was generated by merge_to_master.py.
Change-Id: I834f3ca85c1ef7ec2c1061847a3d92aa461da043
diff --git a/Source/core/css/CSSPrimitiveValue.h b/Source/core/css/CSSPrimitiveValue.h
index 0c53c77..ad00053 100644
--- a/Source/core/css/CSSPrimitiveValue.h
+++ b/Source/core/css/CSSPrimitiveValue.h
@@ -149,6 +149,9 @@
};
static UnitCategory unitCategory(CSSPrimitiveValue::UnitTypes);
+ typedef HashMap<String, CSSPrimitiveValue::UnitTypes> UnitTable;
+ static UnitTable& getUnitTable();
+
bool isAngle() const
{
return m_primitiveUnitType == CSS_DEG
@@ -198,39 +201,39 @@
static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createIdentifier(CSSValueID valueID)
{
- return adoptRefCountedWillBeRefCountedGarbageCollected(new CSSPrimitiveValue(valueID));
+ return adoptRefWillBeRefCountedGarbageCollected(new CSSPrimitiveValue(valueID));
}
static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createIdentifier(CSSPropertyID propertyID)
{
- return adoptRefCountedWillBeRefCountedGarbageCollected(new CSSPrimitiveValue(propertyID));
+ return adoptRefWillBeRefCountedGarbageCollected(new CSSPrimitiveValue(propertyID));
}
static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createParserOperator(int parserOperator)
{
- return adoptRefCountedWillBeRefCountedGarbageCollected(new CSSPrimitiveValue(parserOperator));
+ return adoptRefWillBeRefCountedGarbageCollected(new CSSPrimitiveValue(parserOperator));
}
static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createColor(unsigned rgbValue)
{
- return adoptRefCountedWillBeRefCountedGarbageCollected(new CSSPrimitiveValue(rgbValue));
+ return adoptRefWillBeRefCountedGarbageCollected(new CSSPrimitiveValue(rgbValue));
}
static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> create(double value, UnitTypes type)
{
- return adoptRefCountedWillBeRefCountedGarbageCollected(new CSSPrimitiveValue(value, type));
+ return adoptRefWillBeRefCountedGarbageCollected(new CSSPrimitiveValue(value, type));
}
static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> create(const String& value, UnitTypes type)
{
- return adoptRefCountedWillBeRefCountedGarbageCollected(new CSSPrimitiveValue(value, type));
+ return adoptRefWillBeRefCountedGarbageCollected(new CSSPrimitiveValue(value, type));
}
static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> create(const Length& value, float zoom)
{
- return adoptRefCountedWillBeRefCountedGarbageCollected(new CSSPrimitiveValue(value, zoom));
+ return adoptRefWillBeRefCountedGarbageCollected(new CSSPrimitiveValue(value, zoom));
}
static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> create(const LengthSize& value)
{
- return adoptRefCountedWillBeRefCountedGarbageCollected(new CSSPrimitiveValue(value));
+ return adoptRefWillBeRefCountedGarbageCollected(new CSSPrimitiveValue(value));
}
template<typename T> static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> create(T value)
{
- return adoptRefCountedWillBeRefCountedGarbageCollected(new CSSPrimitiveValue(value));
+ return adoptRefWillBeRefCountedGarbageCollected(new CSSPrimitiveValue(value));
}
// This value is used to handle quirky margins in reflow roots (body, td, and th) like WinIE.
@@ -241,7 +244,7 @@
{
CSSPrimitiveValue* quirkValue = new CSSPrimitiveValue(value, type);
quirkValue->m_isQuirkValue = true;
- return adoptRefCountedWillBeRefCountedGarbageCollected(quirkValue);
+ return adoptRefWillBeRefCountedGarbageCollected(quirkValue);
}
~CSSPrimitiveValue();
@@ -314,7 +317,7 @@
Quad* getQuadValue(ExceptionState&) const;
Quad* getQuadValue() const { return m_primitiveUnitType != CSS_QUAD ? 0 : m_value.quad; }
- PassRefPtr<RGBColor> getRGBColorValue(ExceptionState&) const;
+ PassRefPtrWillBeRawPtr<RGBColor> getRGBColorValue(ExceptionState&) const;
RGBA32 getRGBA32Value() const { return m_primitiveUnitType != CSS_RGBCOLOR ? 0 : m_value.rgbcolor; }
Pair* getPairValue(ExceptionState&) const;
@@ -363,24 +366,15 @@
template<typename T> CSSPrimitiveValue(T* val)
: CSSValue(PrimitiveClass)
{
- init(PassRefPtr<T>(val));
+ init(PassRefPtrWillBeRawPtr<T>(val));
}
- template<typename T> CSSPrimitiveValue(PassRefPtr<T> val)
+ template<typename T> CSSPrimitiveValue(PassRefPtrWillBeRawPtr<T> val)
: CSSValue(PrimitiveClass)
{
init(val);
}
- // Remove below overloaded constructors once all callers of CSSPrimitiveValue(...)
- // have been converted to PassRefPtrWillBeRawPtr.
- explicit CSSPrimitiveValue(CSSCalcValue*);
- explicit CSSPrimitiveValue(PassRefPtrWillBeRawPtr<CSSCalcValue>);
- explicit CSSPrimitiveValue(Pair*);
- explicit CSSPrimitiveValue(PassRefPtrWillBeRawPtr<Pair>);
- explicit CSSPrimitiveValue(Counter*);
- explicit CSSPrimitiveValue(PassRefPtrWillBeRawPtr<Counter>);
-
static void create(int); // compile-time guard
static void create(unsigned); // compile-time guard
template<typename T> operator T*(); // compile-time guard
@@ -388,10 +382,10 @@
void init(const Length&);
void init(const LengthSize&);
void init(PassRefPtrWillBeRawPtr<Counter>);
- void init(PassRefPtr<Rect>);
+ void init(PassRefPtrWillBeRawPtr<Rect>);
void init(PassRefPtrWillBeRawPtr<Pair>);
- void init(PassRefPtr<Quad>);
- void init(PassRefPtr<CSSBasicShape>);
+ void init(PassRefPtrWillBeRawPtr<Quad>);
+ void init(PassRefPtrWillBeRawPtr<CSSBasicShape>);
void init(PassRefPtrWillBeRawPtr<CSSCalcValue>);
bool getDoubleValueInternal(UnitTypes targetUnitType, double* result) const;
@@ -403,14 +397,14 @@
int parserOperator;
double num;
StringImpl* string;
- Rect* rect;
- Quad* quad;
unsigned rgbcolor;
- CSSBasicShape* shape;
// FIXME: oilpan: Should be members, but no support for members in unions. Just trace the raw ptr for now.
+ CSSBasicShape* shape;
CSSCalcValue* calc;
Counter* counter;
Pair* pair;
+ Rect* rect;
+ Quad* quad;
} m_value;
};