Merge from Chromium at DEPS revision 240154
This commit was generated by merge_to_master.py.
Change-Id: Idca0efe87ed6b721349fbeab55bfdc919cc4941d
diff --git a/Source/core/css/CSSPrimitiveValue.h b/Source/core/css/CSSPrimitiveValue.h
index 086532e..65b1cfb 100644
--- a/Source/core/css/CSSPrimitiveValue.h
+++ b/Source/core/css/CSSPrimitiveValue.h
@@ -34,6 +34,7 @@
class CSSBasicShape;
class CSSCalcValue;
+class CSSToLengthConversionData;
class Counter;
class ExceptionState;
class Length;
@@ -245,8 +246,7 @@
}
/*
- * computes a length in pixels out of the given CSSValue. Need the RenderStyle to get
- * the fontinfo in case val is defined in em or ex.
+ * Computes a length in pixels out of the given CSSValue
*
* The metrics have to be a bit different for screen and printer output.
* For screen output we assume 1 inch == 72 px, for printer we assume 300 dpi
@@ -254,10 +254,10 @@
* this is screen/printer dependent, so we probably need a config option for this,
* and some tool to calibrate.
*/
- template<typename T> T computeLength(const RenderStyle* currStyle, const RenderStyle* rootStyle, float multiplier = 1.0f, bool computingFontSize = false);
+ template<typename T> T computeLength(const CSSToLengthConversionData&);
// Converts to a Length, mapping various unit types appropriately.
- template<int> Length convertToLength(const RenderStyle* currStyle, const RenderStyle* rootStyle, double multiplier = 1.0, bool computingFontSize = false);
+ template<int> Length convertToLength(const CSSToLengthConversionData&);
// use with care!!!
void setPrimitiveType(unsigned short type) { m_primitiveUnitType = type; }
@@ -366,7 +366,7 @@
void init(PassRefPtr<CSSCalcValue>);
bool getDoubleValueInternal(UnitTypes targetUnitType, double* result) const;
- double computeLengthDouble(const RenderStyle* currentStyle, const RenderStyle* rootStyle, float multiplier, bool computingFontSize);
+ double computeLengthDouble(const CSSToLengthConversionData&);
union {
CSSPropertyID propertyID;