Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / css / RuntimeCSSEnabled.cpp

diff --git a/src/third_party/WebKit/Source/core/css/RuntimeCSSEnabled.cpp b/src/third_party/WebKit/Source/core/css/RuntimeCSSEnabled.cpp
index 07864df..4fc13b0 100644 (file)
--- a/src/third_party/WebKit/Source/core/css/RuntimeCSSEnabled.cpp
+++ b/src/third_party/WebKit/Source/core/css/RuntimeCSSEnabled.cpp
@@ -52,7 +52,6 @@ static void setPropertySwitchesFromRuntimeFeatures()
     setCSSPropertiesEnabled(exclusionProperties, WTF_ARRAY_LENGTH(exclusionProperties), RuntimeEnabledFeatures::cssExclusionsEnabled());
     CSSPropertyID shapeProperties[] = {
         CSSPropertyShapeMargin,
-        CSSPropertyShapePadding,
         CSSPropertyShapeImageThreshold,
         CSSPropertyShapeOutside,
     };
@@ -83,6 +82,8 @@ static void setPropertySwitchesFromRuntimeFeatures()
         CSSPropertyGridArea,
         CSSPropertyGridAutoFlow,
         CSSPropertyGridTemplateAreas,
+        CSSPropertyGridTemplate,
+        CSSPropertyGrid,
         CSSPropertyJustifySelf
     };
     setCSSPropertiesEnabled(cssGridLayoutProperties, WTF_ARRAY_LENGTH(cssGridLayoutProperties), RuntimeEnabledFeatures::cssGridLayoutEnabled());