Merge from Chromium at DEPS revision 230120
This commit was generated by merge_to_master.py.
Change-Id: Iab152fc67d869deb6e9505babd8d71cab63335dd
diff --git a/Source/core/css/CSSPrimitiveValue.h b/Source/core/css/CSSPrimitiveValue.h
index b4ca9d1..70b4f6b 100644
--- a/Source/core/css/CSSPrimitiveValue.h
+++ b/Source/core/css/CSSPrimitiveValue.h
@@ -36,14 +36,13 @@
class CSSCalcValue;
class Counter;
class ExceptionState;
+class Length;
class Pair;
class Quad;
class RGBColor;
class Rect;
class RenderStyle;
-struct Length;
-
// Dimension calculations are imprecise, often resulting in values of e.g.
// 44.99998. We need to go ahead and round if we're really close to the next
// integer value.
@@ -308,7 +307,7 @@
template<typename T> inline operator T() const; // Defined in CSSPrimitiveValueMappings.h
- String customCssText(CssTextFormattingFlags = QuoteCSSStringIfNeeded) const;
+ String customCSSText(CSSTextFormattingFlags = QuoteCSSStringIfNeeded) const;
String customSerializeResolvingVariables(const HashMap<AtomicString, String>&) const;
bool hasVariableReference() const;
@@ -385,7 +384,7 @@
} m_value;
};
-DEFINE_CSS_VALUE_TYPE_CASTS(PrimitiveValue);
+DEFINE_CSS_VALUE_TYPE_CASTS(CSSPrimitiveValue, isPrimitiveValue());
} // namespace WebCore