From dd91e772430dc294e3bf478c119ef8d43c0a3358 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 12 Mar 2012 14:11:15 +0100 Subject: Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a (http://svn.webkit.org/repository/webkit/trunk@110422) This includes build fixes for the latest qtbase/qtdeclarative as well as the final QML2 API. --- Source/WebCore/css/CSSProperty.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Source/WebCore/css/CSSProperty.cpp') diff --git a/Source/WebCore/css/CSSProperty.cpp b/Source/WebCore/css/CSSProperty.cpp index fd85e9bae..01e7077bf 100644 --- a/Source/WebCore/css/CSSProperty.cpp +++ b/Source/WebCore/css/CSSProperty.cpp @@ -573,6 +573,9 @@ bool CSSProperty::isInheritedProperty(unsigned propertyID) #if ENABLE(CSS_GRID_LAYOUT) case CSSPropertyWebkitGridColumns: case CSSPropertyWebkitGridRows: + + case CSSPropertyWebkitGridColumn: + case CSSPropertyWebkitGridRow: #endif case CSSPropertyWebkitLineClamp: case CSSPropertyWebkitLogicalWidth: -- cgit v1.2.1