Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / css / resolver / StyleBuilderConverter.h

diff --git a/src/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.h b/src/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.h
index 89eb582..e0e38f2 100644 (file)
--- a/src/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.h
+++ b/src/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.h
@@ -33,6 +33,7 @@
 #include "core/rendering/style/QuotesData.h"
 #include "core/rendering/style/ShadowList.h"
 #include "core/rendering/style/StyleReflection.h"
+#include "core/rendering/style/TransformOrigin.h"
 #include "core/svg/SVGLength.h"
 #include "platform/LengthSize.h"
 #include "platform/fonts/FontDescription.h"
@@ -49,11 +50,13 @@ public:
     template <typename T> static T convertComputedLength(StyleResolverState&, CSSValue*);
     static LengthBox convertClip(StyleResolverState&, CSSValue*);
     template <typename T> static T convertFlags(StyleResolverState&, CSSValue*);
+    static FontDescription::FamilyDescription convertFontFamily(StyleResolverState&, CSSValue*);
     static PassRefPtr<FontFeatureSettings> convertFontFeatureSettings(StyleResolverState&, CSSValue*);
     static FontDescription::Size convertFontSize(StyleResolverState&, CSSValue*);
     static FontWeight convertFontWeight(StyleResolverState&, CSSValue*);
     static FontDescription::VariantLigatures convertFontVariantLigatures(StyleResolverState&, CSSValue*);
     static EGlyphOrientation convertGlyphOrientation(StyleResolverState&, CSSValue*);
+    static GridAutoFlow convertGridAutoFlow(StyleResolverState&, CSSValue*);
     static GridPosition convertGridPosition(StyleResolverState&, CSSValue*);
     static GridTrackSize convertGridTrackSize(StyleResolverState&, CSSValue*);
     template <typename T> static T convertLineWidth(StyleResolverState&, CSSValue*);
@@ -64,10 +67,13 @@ public:
     static LengthPoint convertLengthPoint(StyleResolverState&, CSSValue*);
     static LineBoxContain convertLineBoxContain(StyleResolverState&, CSSValue*);
     static float convertNumberOrPercentage(StyleResolverState&, CSSValue*);
+    static float convertPerspective(StyleResolverState&, CSSValue*);
+    static LengthPoint convertPerspectiveOrigin(StyleResolverState&, CSSValue*);
     static PassRefPtr<QuotesData> convertQuotes(StyleResolverState&, CSSValue*);
     static LengthSize convertRadius(StyleResolverState&, CSSValue*);
     static EPaintOrder convertPaintOrder(StyleResolverState&, CSSValue*);
     static PassRefPtr<ShadowList> convertShadow(StyleResolverState&, CSSValue*);
+    static PassRefPtr<ShapeValue> convertShapeValue(StyleResolverState&, CSSValue*);
     static float convertSpacing(StyleResolverState&, CSSValue*);
     template <CSSValueID IdForNone> static AtomicString convertString(StyleResolverState&, CSSValue*);
     static PassRefPtr<SVGLengthList> convertStrokeDasharray(StyleResolverState&, CSSValue*);
@@ -75,6 +81,7 @@ public:
     static Color convertSVGColor(StyleResolverState&, CSSValue*);
     static PassRefPtr<SVGLength> convertSVGLength(StyleResolverState&, CSSValue*);
     static float convertTextStrokeWidth(StyleResolverState&, CSSValue*);
+    static TransformOrigin convertTransformOrigin(StyleResolverState&, CSSValue*);
 
     static bool convertGridTrackList(CSSValue*, Vector<GridTrackSize>&, NamedGridLinesMap&, OrderedNamedGridLines&, StyleResolverState&);
     static void createImplicitNamedGridLinesFromGridArea(const NamedGridAreaMap&, NamedGridLinesMap&, GridTrackSizingDirection);
@@ -90,6 +97,8 @@ template <typename T>
 T StyleBuilderConverter::convertFlags(StyleResolverState& state, CSSValue* value)
 {
     T flags = static_cast<T>(0);
+    if (value->isPrimitiveValue() && toCSSPrimitiveValue(value)->getValueID() == CSSValueNone)
+        return flags;
     for (CSSValueListIterator i(value); i.hasMore(); i.advance())
         flags |= *toCSSPrimitiveValue(i.value());
     return flags;