diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-01 21:58:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-01 22:24:23 +0200 |
| commit | 9b4236a660dcf0b9883fbc6dd388dccbe71ee0b2 (patch) | |
| tree | 42cd71ba96171398f3482e16243745b5866ca0b4 /Source/WebCore/css/CSSPropertyNames.in | |
| parent | 4671ed5b9df8f8edd3856b24bab93d7246f700f5 (diff) | |
| parent | dbc4556842aa6541b9c8ce48fe34a36811709e64 (diff) | |
| download | qtwebkit-9b4236a660dcf0b9883fbc6dd388dccbe71ee0b2.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I124ff77524133fb9b88e76c4af99efb2aa1ff6c8
Diffstat (limited to 'Source/WebCore/css/CSSPropertyNames.in')
| -rw-r--r-- | Source/WebCore/css/CSSPropertyNames.in | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/Source/WebCore/css/CSSPropertyNames.in b/Source/WebCore/css/CSSPropertyNames.in index 358ee2cbb..bc6f7066b 100644 --- a/Source/WebCore/css/CSSPropertyNames.in +++ b/Source/WebCore/css/CSSPropertyNames.in @@ -287,17 +287,28 @@ z-index #if defined(ENABLE_CSS_FILTERS) && ENABLE_CSS_FILTERS -webkit-filter #endif --webkit-align-content --webkit-align-items --webkit-align-self --webkit-flex --webkit-flex-basis --webkit-flex-direction --webkit-flex-flow --webkit-flex-grow --webkit-flex-shrink --webkit-flex-wrap --webkit-justify-content +align-content +-webkit-align-content = align-content +align-items +-webkit-align-items = align-items +align-self +-webkit-align-self = align-self +flex +-webkit-flex = flex +flex-basis +-webkit-flex-basis = flex-basis +flex-direction +-webkit-flex-direction = flex-direction +flex-flow +-webkit-flex-flow = flex-flow +flex-grow +-webkit-flex-grow = flex-grow +flex-shrink +-webkit-flex-shrink = flex-shrink +flex-wrap +-webkit-flex-wrap = flex-wrap +justify-content +-webkit-justify-content = justify-content -webkit-font-size-delta -webkit-grid-auto-columns -webkit-grid-auto-rows @@ -363,7 +374,8 @@ z-index -webkit-min-logical-width -webkit-min-logical-height -webkit-nbsp-mode --webkit-order +order +-webkit-order = order -webkit-padding-after -webkit-padding-before -webkit-padding-end |