[css-grid] Unprefix CSS Grid Layout properties
https://bugs.webkit.org/show_bug.cgi?id=157137
Reviewed by Simon Fraser.
Remove "-webkit" prefix from all the grid layout properties,
including the display value.
Update the source code to remove the prefix where it was used too.
.:
* ManualTests/css-grid-layout-item-with-huge-span-crash.html:
PerformanceTests:
* Layout/auto-grid-lots-of-data.html:
* Layout/fixed-grid-lots-of-data.html:
* Layout/fixed-grid-lots-of-stretched-data.html:
Source/WebCore:
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::isLayoutDependent):
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSParser.cpp:
(WebCore::isSimpleLengthPropertyID):
(WebCore::isValidKeywordPropertyAndValue):
(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseGridGapShorthand):
(WebCore::CSSParser::parseGridTemplateRowsAndAreasAndColumns):
(WebCore::CSSParser::parseGridTemplateShorthand):
(WebCore::CSSParser::parseGridShorthand):
(WebCore::CSSParser::parseGridAreaShorthand):
* css/CSSPrimitiveValueMappings.h:
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
* css/CSSPropertyNames.in:
* css/CSSValueKeywords.in:
* css/StyleBuilderCustom.h:
(WebCore::StyleBuilderCustom::applyInitialGridTemplateAreas):
(WebCore::StyleBuilderCustom::applyInheritGridTemplateAreas):
(WebCore::StyleBuilderCustom::applyValueGridTemplateAreas):
(WebCore::StyleBuilderCustom::applyInitialGridTemplateColumns):
(WebCore::StyleBuilderCustom::applyInheritGridTemplateColumns):
(WebCore::StyleBuilderCustom::applyValueGridTemplateColumns):
(WebCore::StyleBuilderCustom::applyInitialGridTemplateRows):
(WebCore::StyleBuilderCustom::applyInheritGridTemplateRows):
(WebCore::StyleBuilderCustom::applyValueGridTemplateRows):
* css/StyleProperties.cpp:
(WebCore::StyleProperties::getPropertyValue):
Source/WebInspectorUI:
* UserInterface/Models/CSSKeywordCompletions.js:
Tools:
* TestWebKitAPI/Tests/WebCore/CSSParser.cpp:
(TestWebKitAPI::TEST):
LayoutTests:
* css3/parse-align-content.html:
* css3/parse-align-items.html:
* css3/parse-align-self.html:
* css3/parse-justify-content.html:
* fast/css-grid-layout/absolute-positioning-definite-sizes.html:
* fast/css-grid-layout/absolute-positioning-grid-container-containing-block.html:
* fast/css-grid-layout/absolute-positioning-grid-container-parent.html:
* fast/css-grid-layout/anonymous-grid-items-expected.html:
* fast/css-grid-layout/anonymous-grid-items.html:
* fast/css-grid-layout/auto-content-resolution-columns.html:
* fast/css-grid-layout/auto-content-resolution-rows.html:
* fast/css-grid-layout/breadth-size-resolution-grid.html:
* fast/css-grid-layout/calc-resolution-grid-item.html:
* fast/css-grid-layout/compute-intrinsic-widths-scrollbar.html:
* fast/css-grid-layout/display-grid-set-get-expected.txt:
* fast/css-grid-layout/explicit-grid-size.html:
* fast/css-grid-layout/flex-and-content-sized-resolution-columns-expected.txt:
* fast/css-grid-layout/flex-and-content-sized-resolution-columns.html:
* fast/css-grid-layout/flex-and-intrinsic-sizes.html:
* fast/css-grid-layout/flex-and-minmax-content-resolution-columns.html:
* fast/css-grid-layout/flex-and-minmax-content-resolution-rows.html:
* fast/css-grid-layout/flex-content-distribution.html:
* fast/css-grid-layout/flex-content-resolution-columns.html:
* fast/css-grid-layout/flex-content-resolution-rows.html:
* fast/css-grid-layout/flex-content-sized-column-use-available-width.html:
* fast/css-grid-layout/flex-content-sized-columns-resize.html:
* fast/css-grid-layout/flex-factor-sum-less-than-1.html:
* fast/css-grid-layout/float-not-protruding-into-next-grid-item.html:
* fast/css-grid-layout/floating-empty-grids.html:
* fast/css-grid-layout/grid-align-content-distribution-vertical-lr.html:
* fast/css-grid-layout/grid-align-content-distribution-vertical-rl.html:
* fast/css-grid-layout/grid-align-content-distribution.html:
* fast/css-grid-layout/grid-align-content-vertical-lr.html:
* fast/css-grid-layout/grid-align-content-vertical-rl.html:
* fast/css-grid-layout/grid-align-content.html:
* fast/css-grid-layout/grid-align-justify-margin-border-padding-vertical-lr.html:
* fast/css-grid-layout/grid-align-justify-margin-border-padding-vertical-rl.html:
* fast/css-grid-layout/grid-align-justify-margin-border-padding.html:
* fast/css-grid-layout/grid-align-justify-overflow.html:
* fast/css-grid-layout/grid-align-justify-stretch.html:
* fast/css-grid-layout/grid-align-stretching-replaced-items.html:
* fast/css-grid-layout/grid-align.html:
* fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html:
* fast/css-grid-layout/grid-auto-columns-rows-get-set-expected.txt:
* fast/css-grid-layout/grid-auto-columns-rows-get-set.html:
* fast/css-grid-layout/grid-auto-columns-rows-resolution.html:
* fast/css-grid-layout/grid-auto-columns-rows-update.html:
* fast/css-grid-layout/grid-auto-flow-get-set-expected.txt:
* fast/css-grid-layout/grid-auto-flow-get-set.html:
* fast/css-grid-layout/grid-auto-flow-resolution.html:
* fast/css-grid-layout/grid-auto-flow-sparse.html:
* fast/css-grid-layout/grid-auto-flow-update.html:
* fast/css-grid-layout/grid-automatic-minimum-for-auto-columns-expected.txt:
* fast/css-grid-layout/grid-automatic-minimum-for-auto-columns.html:
* fast/css-grid-layout/grid-automatic-minimum-for-auto-rows-expected.txt:
* fast/css-grid-layout/grid-automatic-minimum-for-auto-rows.html:
* fast/css-grid-layout/grid-columns-rows-get-set-expected.txt:
* fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt:
* fast/css-grid-layout/grid-columns-rows-get-set-multiple.html:
* fast/css-grid-layout/grid-columns-rows-get-set.html:
* fast/css-grid-layout/grid-container-change-named-grid-lines-recompute-child.html:
* fast/css-grid-layout/grid-container-ignore-first-letter.html:
* fast/css-grid-layout/grid-content-alignment-and-self-alignment-spanning.html:
* fast/css-grid-layout/grid-content-alignment-and-self-alignment.html:
* fast/css-grid-layout/grid-content-alignment-overflow.html:
* fast/css-grid-layout/grid-content-alignment-stretch-only-valid-for-auto-sized-tracks.html:
* fast/css-grid-layout/grid-content-alignment-stretch-with-different-sized-tracks.html:
* fast/css-grid-layout/grid-content-alignment-with-span-vertical-lr.html:
* fast/css-grid-layout/grid-content-alignment-with-span-vertical-rl.html:
* fast/css-grid-layout/grid-content-alignment-with-span.html:
* fast/css-grid-layout/grid-content-sized-columns-resolution-expected.txt:
* fast/css-grid-layout/grid-content-sized-columns-resolution.html:
* fast/css-grid-layout/grid-disable.html:
* fast/css-grid-layout/grid-dynamic-updates-relayout.html:
* fast/css-grid-layout/grid-element-auto-repeat-get-set-expected.txt:
* fast/css-grid-layout/grid-element-auto-repeat-get-set.html:
* fast/css-grid-layout/grid-element-border-grid-item.html:
* fast/css-grid-layout/grid-element-border-padding-grid-item.html:
* fast/css-grid-layout/grid-element-change-columns-repaint.html:
* fast/css-grid-layout/grid-element-change-rows-repaint.html:
* fast/css-grid-layout/grid-element-empty-row-column.html:
* fast/css-grid-layout/grid-element-min-max-height.html:
* fast/css-grid-layout/grid-element-min-max-width.html:
* fast/css-grid-layout/grid-element-padding-grid-item.html:
* fast/css-grid-layout/grid-element-padding-margin.html:
* fast/css-grid-layout/grid-element-repeat-get-set-expected.txt:
* fast/css-grid-layout/grid-element-repeat-get-set.html:
* fast/css-grid-layout/grid-element-shrink-to-fit.html:
* fast/css-grid-layout/grid-grow-tracks-to-their-max-expected.txt:
* fast/css-grid-layout/grid-grow-tracks-to-their-max.html:
* fast/css-grid-layout/grid-gutters-and-alignment.html:
* fast/css-grid-layout/grid-gutters-and-flex-content.html:
* fast/css-grid-layout/grid-gutters-and-tracks.html:
* fast/css-grid-layout/grid-gutters-get-set-expected.txt:
* fast/css-grid-layout/grid-gutters-get-set.html:
* fast/css-grid-layout/grid-indefinite-calculated-height-crash-expected.txt:
* fast/css-grid-layout/grid-indefinite-calculated-height-crash.html:
* fast/css-grid-layout/grid-initialize-span-one-items-expected.txt:
* fast/css-grid-layout/grid-initialize-span-one-items.html:
* fast/css-grid-layout/grid-item-addition-auto-placement-update.html:
* fast/css-grid-layout/grid-item-addition-track-breadth-update.html:
* fast/css-grid-layout/grid-item-area-get-set-expected.txt:
* fast/css-grid-layout/grid-item-area-get-set.html:
* fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-lr.html:
* fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-rl.html:
* fast/css-grid-layout/grid-item-auto-margins-alignment.html:
* fast/css-grid-layout/grid-item-auto-margins-and-stretch.html:
* fast/css-grid-layout/grid-item-auto-margins-must-respect-specified-margins.html:
* fast/css-grid-layout/grid-item-auto-placement-automatic-span.html:
* fast/css-grid-layout/grid-item-auto-placement-definite-span.html:
* fast/css-grid-layout/grid-item-auto-placement-fixed-row-column.html:
* fast/css-grid-layout/grid-item-auto-sized-align-justify-margin-border-padding.html:
* fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html:
* fast/css-grid-layout/grid-item-bad-resolution-double-span.html:
* fast/css-grid-layout/grid-item-change-column-repaint.html:
* fast/css-grid-layout/grid-item-change-row-repaint.html:
* fast/css-grid-layout/grid-item-column-row-get-set-expected.txt:
* fast/css-grid-layout/grid-item-column-row-get-set.html:
* fast/css-grid-layout/grid-item-display.html:
* fast/css-grid-layout/grid-item-end-after-get-set-expected.txt:
* fast/css-grid-layout/grid-item-end-after-get-set.html:
* fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-ltr.html:
* fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-rtl.html:
* fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-ltr.html:
* fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-rtl.html:
* fast/css-grid-layout/grid-item-margin-resolution.html:
* fast/css-grid-layout/grid-item-margins-not-collapse.html:
* fast/css-grid-layout/grid-item-multiple-minmax-content-resolution.html:
* fast/css-grid-layout/grid-item-named-grid-area-resolution.html:
* fast/css-grid-layout/grid-item-named-grid-line-resolution.html:
* fast/css-grid-layout/grid-item-negative-indexes.html:
* fast/css-grid-layout/grid-item-negative-integer-explicit-grid-resolution.html:
* fast/css-grid-layout/grid-item-negative-position-resolution.html:
* fast/css-grid-layout/grid-item-order-auto-flow-resolution.html:
* fast/css-grid-layout/grid-item-order-in-content-sized-columns-resolution.html:
* fast/css-grid-layout/grid-item-order-paint-order.html:
* fast/css-grid-layout/grid-item-position-changed-dynamic.html:
* fast/css-grid-layout/grid-item-removal-auto-placement-update.html:
* fast/css-grid-layout/grid-item-removal-track-breadth-update.html:
* fast/css-grid-layout/grid-item-spanning-resolution.html:
* fast/css-grid-layout/grid-item-start-before-get-set-expected.txt:
* fast/css-grid-layout/grid-item-start-before-get-set.html:
* fast/css-grid-layout/grid-item-stretch-with-margins-borders-padding-vertical-lr.html:
* fast/css-grid-layout/grid-item-stretch-with-margins-borders-padding-vertical-rl.html:
* fast/css-grid-layout/grid-item-stretch-with-margins-borders-padding.html:
* fast/css-grid-layout/grid-item-text-background-not-interleaved.html:
* fast/css-grid-layout/grid-item-unknown-named-grid-line-resolution.html:
* fast/css-grid-layout/grid-item-with-border-in-fr.html:
* fast/css-grid-layout/grid-item-with-border-in-intrinsic.html:
* fast/css-grid-layout/grid-item-with-percent-height-in-auto-height-grid-resolution.html:
* fast/css-grid-layout/grid-item-with-percent-min-max-height-dynamic.html:
* fast/css-grid-layout/grid-item-z-index-change-repaint-expected.html:
* fast/css-grid-layout/grid-item-z-index-change-repaint.html:
* fast/css-grid-layout/grid-item-z-index-stacking-context-expected.html:
* fast/css-grid-layout/grid-item-z-index-stacking-context.html:
* fast/css-grid-layout/grid-item-z-index-support.html:
* fast/css-grid-layout/grid-items-should-not-be-stretched-when-height-or-width-or-margin-change.html:
* fast/css-grid-layout/grid-justify-content-distribution-vertical-lr.html:
* fast/css-grid-layout/grid-justify-content-distribution-vertical-rl.html:
* fast/css-grid-layout/grid-justify-content-distribution.html:
* fast/css-grid-layout/grid-justify-content-vertical-lr.html:
* fast/css-grid-layout/grid-justify-content-vertical-rl.html:
* fast/css-grid-layout/grid-justify-content.html:
* fast/css-grid-layout/grid-percent-track-margin-border-padding.html:
* fast/css-grid-layout/grid-percent-track-scrollbar.html:
* fast/css-grid-layout/grid-positioned-children-writing-modes.html:
* fast/css-grid-layout/grid-positioned-items-background-rtl.html:
* fast/css-grid-layout/grid-positioned-items-background.html:
* fast/css-grid-layout/grid-positioned-items-content-alignment-rtl.html:
* fast/css-grid-layout/grid-positioned-items-content-alignment.html:
* fast/css-grid-layout/grid-positioned-items-gaps-rtl.html:
* fast/css-grid-layout/grid-positioned-items-gaps.html:
* fast/css-grid-layout/grid-positioned-items-implicit-grid-line.html:
* fast/css-grid-layout/grid-positioned-items-implicit-grid.html:
* fast/css-grid-layout/grid-positioned-items-padding.html:
* fast/css-grid-layout/grid-positioned-items-unknown-named-grid-line.html:
* fast/css-grid-layout/grid-positioned-items-within-grid-implicit-track.html:
* fast/css-grid-layout/grid-preferred-logical-widths.html:
* fast/css-grid-layout/grid-repeat-calc-expected.txt:
* fast/css-grid-layout/grid-repeat-calc.html:
* fast/css-grid-layout/grid-shorthand-computed-style-crash.html:
* fast/css-grid-layout/grid-shorthand-get-set-expected.txt:
* fast/css-grid-layout/grid-shorthand-get-set.html:
* fast/css-grid-layout/grid-sizing-positioned-items.html:
* fast/css-grid-layout/grid-strict-ordering-crash.html:
* fast/css-grid-layout/grid-template-areas-empty-string-crash.html:
* fast/css-grid-layout/grid-template-areas-get-set-expected.txt:
* fast/css-grid-layout/grid-template-areas-get-set.html:
* fast/css-grid-layout/grid-template-areas-infinite-loop.html:
* fast/css-grid-layout/grid-template-columns-rows-computed-style-gaps-content-alignment-expected.txt:
* fast/css-grid-layout/grid-template-columns-rows-computed-style-gaps-content-alignment.html:
* fast/css-grid-layout/grid-template-shorthand-computed-style-crash.html:
* fast/css-grid-layout/grid-template-shorthand-get-set-expected.txt:
* fast/css-grid-layout/grid-template-shorthand-get-set.html:
* fast/css-grid-layout/grid-update-sizes-after-distributing-all-expected.txt:
* fast/css-grid-layout/grid-update-sizes-after-distributing-all.html:
* fast/css-grid-layout/grid-was-populated-assert.html:
* fast/css-grid-layout/grid-with-relative-font-length-crash.html:
* fast/css-grid-layout/implicit-columns-auto-resolution.html:
* fast/css-grid-layout/implicit-position-dynamic-change-expected.txt:
* fast/css-grid-layout/implicit-position-dynamic-change.html:
* fast/css-grid-layout/implicit-rows-auto-resolution.html:
* fast/css-grid-layout/implicit-tracks-before-explicit.html:
* fast/css-grid-layout/justify-self-cell.html:
* fast/css-grid-layout/mark-as-infinitely-growable-expected.txt:
* fast/css-grid-layout/mark-as-infinitely-growable.html:
* fast/css-grid-layout/maximize-tracks-definite-indefinite-height.html:
* fast/css-grid-layout/min-content-row-must-shrink-when-column-grows.html:
* fast/css-grid-layout/min-height-border-box.html:
* fast/css-grid-layout/min-width-height-auto-and-margins.html:
* fast/css-grid-layout/min-width-height-auto-overflow.html:
* fast/css-grid-layout/min-width-height-auto.html:
* fast/css-grid-layout/min-width-margin-box.html:
* fast/css-grid-layout/minmax-fixed-logical-height-only.html:
* fast/css-grid-layout/minmax-fixed-logical-width-only.html:
* fast/css-grid-layout/minmax-max-content-resolution-columns.html:
* fast/css-grid-layout/minmax-max-content-resolution-rows.html:
* fast/css-grid-layout/minmax-min-content-column-resolution-columns.html:
* fast/css-grid-layout/minmax-min-content-column-resolution-rows.html:
* fast/css-grid-layout/minmax-spanning-resolution-columns.html:
* fast/css-grid-layout/minmax-spanning-resolution-rows.html:
* fast/css-grid-layout/named-grid-line-get-set-expected.txt:
* fast/css-grid-layout/named-grid-line-get-set.html:
* fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks-expected.txt:
* fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks.html:
* fast/css-grid-layout/named-grid-lines-with-named-grid-areas-dynamic-get-set.html:
* fast/css-grid-layout/named-grid-lines-with-named-grid-areas-get-set-expected.txt:
* fast/css-grid-layout/named-grid-lines-with-named-grid-areas-get-set.html:
* fast/css-grid-layout/named-grid-lines-with-named-grid-areas-resolution.html:
* fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt:
* fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt:
* fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html:
* fast/css-grid-layout/non-grid-columns-rows-get-set.html:
* fast/css-grid-layout/non-grid-element-repeat-get-set-expected.txt:
* fast/css-grid-layout/non-grid-element-repeat-get-set.html:
* fast/css-grid-layout/non-named-grid-line-get-set-expected.txt:
* fast/css-grid-layout/non-named-grid-line-get-set.html:
* fast/css-grid-layout/percent-grid-item-in-percent-grid-track-in-percent-grid.html:
* fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update.html:
* fast/css-grid-layout/percent-grid-item-in-percent-grid-track.html:
* fast/css-grid-layout/percent-intrinsic-track-breadth.html:
* fast/css-grid-layout/percent-of-indefinite-track-size-in-auto.html:
* fast/css-grid-layout/percent-of-indefinite-track-size-in-minmax-crash.html:
* fast/css-grid-layout/percent-of-indefinite-track-size.html:
* fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update.html:
* fast/css-grid-layout/percent-padding-margin-resolution-grid-item.html:
* fast/css-grid-layout/percent-resolution-grid-item.html:
* fast/css-grid-layout/percent-track-breadths-regarding-container-size.html:
* fast/css-grid-layout/place-cell-by-index.html:
* fast/css-grid-layout/positioned-grid-items-should-not-create-implicit-tracks.html:
* fast/css-grid-layout/positioned-grid-items-should-not-take-up-space.html:
* fast/css-grid-layout/relayout-align-items-changed.html:
* fast/css-grid-layout/relayout-align-self-changed.html:
* fast/css-grid-layout/relayout-indefinite-heights.html:
* fast/css-grid-layout/relayout-justify-items-changed.html:
* fast/css-grid-layout/relayout-justify-self-changed.html:
* fast/css-grid-layout/resources/display-grid-set-get.js:
* fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js:
(testInherit):
(testInitial):
* fast/css-grid-layout/resources/grid-columns-rows-get-set.js:
(testInherit):
(testInitial):
* fast/css-grid-layout/resources/grid-definitions-parsing-utils.js:
(testGridTemplatesValues):
(checkGridTemplatesSetJSValues):
(testGridTemplatesSetBadJSValues):
(checkGridAutoFlowSetCSSValue):
(checkGridAutoFlowSetJSValue):
(testGridAutoDefinitionsValues):
(testGridGapDefinitionsValues):
* fast/css-grid-layout/resources/grid-item-column-row-parsing-utils.js:
(checkColumnRowValues):
(window.testColumnRowJSParsing):
(window.testColumnRowInvalidJSParsing):
(window.testColumnStartRowStartJSParsing):
(window.testColumnEndRowEndJSParsing):
(setupInheritTest):
(setupInitialTest):
(window.testColumnRowInheritJSParsing):
(window.testStartBeforeInheritJSParsing):
(window.testEndAfterInheritJSParsing):
(window.testColumnRowInitialJSParsing):
(window.testStartBeforeInitialJSParsing):
(window.testEndAfterInitialJSParsing):
* fast/css-grid-layout/resources/grid-shorthand-parsing-utils.js:
(testGridDefinitionsValues):
(checkGridDefinitionsSetJSValues):
(testGridDefinitionsSetBadJSValues):
* fast/css-grid-layout/resources/grid-template-shorthand-parsing-utils.js:
(testGridDefinitionsValues):
(checkGridDefinitionsSetJSValues):
(testGridDefinitionsSetBadJSValues):
* fast/css-grid-layout/resources/grid.css:
(.grid):
(.inline-grid):
(.firstRowFirstColumn):
(.onlyFirstRowOnlyFirstColumn):
(.firstRowSecondColumn):
(.onlyFirstRowOnlySecondColumn):
(.firstRowThirdColumn):
(.firstRowFourthColumn):
(.secondRowFirstColumn):
(.onlySecondRowOnlyFirstColumn):
(.secondRowSecondColumn):
(.onlySecondRowOnlySecondColumn):
(.endSecondRowEndSecondColumn):
(.secondRowThirdColumn):
(.secondRowFourthColumn):
(.thirdRowFirstColumn):
(.thirdRowSecondColumn):
(.thirdRowThirdColumn):
(.fourthRowFirstColumn):
(.fourthRowSecondColumn):
(.firstAutoRowSecondAutoColumn):
(.autoLastRowAutoLastColumn):
(.autoSecondRowAutoFirstColumn):
(.firstRowBothColumn):
(.secondRowBothColumn):
(.bothRowFirstColumn):
(.bothRowSecondColumn):
(.bothRowBothColumn):
(.autoRowAutoColumn):
(.firstRowAutoColumn):
(.secondRowAutoColumn):
(.thirdRowAutoColumn):
(.autoRowFirstColumn):
(.autoRowSecondColumn):
(.autoRowThirdColumn):
(.autoRowAutoColumnSpanning2):
(.autoRowSpanning2AutoColumn):
(.autoRowSpanning2AutoColumnSpanning3):
(.autoRowSpanning3AutoColumnSpanning2):
(.autoRowFirstColumnSpanning2):
(.autoRowSecondColumnSpanning2):
(.firstRowSpanning2AutoColumn):
(.secondRowSpanning2AutoColumn):
(.gridAutoFlowColumnSparse):
(.gridAutoFlowColumnDense):
(.gridAutoFlowRowSparse):
(.gridAutoFlowRowDense):
* fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js:
(testInherit):
(testInitial):
* fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js:
(testInherit):
(testInitial):
* fast/css-grid-layout/should-not-collapse-anonymous-blocks.html:
* fast/css-grid-layout/swap-lines-if-start-is-further-endward-than-end-line-expected.html:
* fast/css-grid-layout/swap-lines-if-start-is-further-endward-than-end-line.html:
* fast/css-grid-layout/tracks-number-greatly-exceeding-available-size-crash.html:
* fast/css/auto-min-size.html:
* fast/css/first-letter-ignores-display-property.html:
* fast/css/getComputedStyle/computed-style-expected.txt:
* fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
* fast/css/getComputedStyle/resources/property-names.js:
* fast/css/parse-justify-items.html:
* fast/events/key-events-in-editable-gridbox.html:
* fast/repaint/align-items-overflow-change.html:
* fast/repaint/align-self-change.html:
* fast/repaint/align-self-overflow-change.html:
* fast/repaint/justify-items-change.html:
* fast/repaint/justify-items-legacy-change.html:
* fast/repaint/justify-items-overflow-change.html:
* fast/repaint/justify-self-change.html:
* fast/repaint/justify-self-overflow-change.html:
* fast/text-autosizing/cluster-inline-grid-flex-box-expected.html:
* fast/text-autosizing/cluster-inline-grid-flex-box.html:
* ietestcenter/css3/grid/display-grid-001-expected.htm:
* ietestcenter/css3/grid/display-grid-001.htm:
* ietestcenter/css3/grid/display-grid-002-expected.htm:
* ietestcenter/css3/grid/display-grid-002.htm:
* ietestcenter/css3/grid/grid-column-001-expected.htm:
* ietestcenter/css3/grid/grid-column-001.htm:
* ietestcenter/css3/grid/grid-column-002-expected.htm:
* ietestcenter/css3/grid/grid-column-002.htm:
* ietestcenter/css3/grid/grid-column-003-expected.htm:
* ietestcenter/css3/grid/grid-column-003.htm:
* ietestcenter/css3/grid/grid-columns-001-expected.htm:
* ietestcenter/css3/grid/grid-columns-001.htm:
* ietestcenter/css3/grid/grid-items-001-expected.htm:
* ietestcenter/css3/grid/grid-items-001.htm:
* ietestcenter/css3/grid/grid-items-002-expected.htm:
* ietestcenter/css3/grid/grid-items-002.htm:
* ietestcenter/css3/grid/grid-items-003-expected.htm:
* ietestcenter/css3/grid/grid-items-003.htm:
* ietestcenter/css3/grid/grid-items-004-expected.htm:
* ietestcenter/css3/grid/grid-items-004.htm:
* ietestcenter/css3/grid/grid-items-005-expected.htm:
* ietestcenter/css3/grid/grid-items-005.htm:
* svg/css/getComputedStyle-basic-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@200510 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/fast/css-grid-layout/absolute-positioning-definite-sizes.html b/LayoutTests/fast/css-grid-layout/absolute-positioning-definite-sizes.html
index e74c4e9..1fbd9b8 100644
--- a/LayoutTests/fast/css-grid-layout/absolute-positioning-definite-sizes.html
+++ b/LayoutTests/fast/css-grid-layout/absolute-positioning-definite-sizes.html
@@ -2,7 +2,7 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template: 50px 1fr / 1fr;
+ grid-template: 50px 1fr / 1fr;
position: absolute;
left: 50px;
diff --git a/LayoutTests/fast/css-grid-layout/absolute-positioning-grid-container-containing-block.html b/LayoutTests/fast/css-grid-layout/absolute-positioning-grid-container-containing-block.html
index 918fd9c..e7ed349 100644
--- a/LayoutTests/fast/css-grid-layout/absolute-positioning-grid-container-containing-block.html
+++ b/LayoutTests/fast/css-grid-layout/absolute-positioning-grid-container-containing-block.html
@@ -4,8 +4,8 @@
<style>
.grid {
- -webkit-grid-template-columns: 50px 100px 150px 200px;
- -webkit-grid-template-rows: 50px 100px 150px 200px;
+ grid-template-columns: 50px 100px 150px 200px;
+ grid-template-rows: 50px 100px 150px 200px;
width: 500px;
height: 500px;
border: 5px solid black;
@@ -20,56 +20,56 @@
}
.thirdRowThirdColumnSpanning2Rows {
- -webkit-grid-column: 3;
- -webkit-grid-row: 3 / span 2;
+ grid-column: 3;
+ grid-row: 3 / span 2;
background-color: maroon;
}
.thirdRowThirdColumnSpanning2Rows2Columns {
- -webkit-grid-column: 3 / span 2;
- -webkit-grid-row: 3 / span 2;
+ grid-column: 3 / span 2;
+ grid-row: 3 / span 2;
background-color: aqua;
}
.endFirstRowEndFirstColumn {
background-color: blue;
- -webkit-grid-column-end: 2;
- -webkit-grid-row-end: 2;
+ grid-column-end: 2;
+ grid-row-end: 2;
}
.endFirstRowEndSecondColumn {
background-color: lime;
- -webkit-grid-column-end: 3;
- -webkit-grid-row-end: 2;
+ grid-column-end: 3;
+ grid-row-end: 2;
}
.endSecondRowEndFirstColumn {
background-color: purple;
- -webkit-grid-column-end: 2;
- -webkit-grid-row-end: 3;
+ grid-column-end: 2;
+ grid-row-end: 3;
}
.endThirdRowEndThirdColumnSpanning2Rows {
- -webkit-grid-column-end: 4;
- -webkit-grid-row: span 2 / 4;
+ grid-column-end: 4;
+ grid-row: span 2 / 4;
background-color: maroon;
}
.endThirdRowEndThirdColumnSpanning2Rows2Columns {
- -webkit-grid-column: span 2 / 4;
- -webkit-grid-row: span 2 / 4;
+ grid-column: span 2 / 4;
+ grid-row: span 2 / 4;
background-color: aqua;
}
.onlyThirdRowOnlyThirdColumnSpanning2Rows {
- -webkit-grid-column: 3 / 4;
- -webkit-grid-row: 3 / 5;
+ grid-column: 3 / 4;
+ grid-row: 3 / 5;
background-color: maroon;
}
.onlyThirdRowOnlyThirdColumnSpanning2Rows2Columns {
- -webkit-grid-column: 3 / 5;
- -webkit-grid-row: 3 / 5;
+ grid-column: 3 / 5;
+ grid-row: 3 / 5;
background-color: aqua;
}
diff --git a/LayoutTests/fast/css-grid-layout/absolute-positioning-grid-container-parent.html b/LayoutTests/fast/css-grid-layout/absolute-positioning-grid-container-parent.html
index b286f77..1a128d6 100644
--- a/LayoutTests/fast/css-grid-layout/absolute-positioning-grid-container-parent.html
+++ b/LayoutTests/fast/css-grid-layout/absolute-positioning-grid-container-parent.html
@@ -4,8 +4,8 @@
<style>
.grid {
- -webkit-grid-template-columns: 50px 100px 150px;
- -webkit-grid-template-rows: 25px 50px 100px;
+ grid-template-columns: 50px 100px 150px;
+ grid-template-rows: 25px 50px 100px;
width: 300px;
height: 200px;
border: 5px solid black;
diff --git a/LayoutTests/fast/css-grid-layout/anonymous-grid-items-expected.html b/LayoutTests/fast/css-grid-layout/anonymous-grid-items-expected.html
index c591744..d73553bc 100644
--- a/LayoutTests/fast/css-grid-layout/anonymous-grid-items-expected.html
+++ b/LayoutTests/fast/css-grid-layout/anonymous-grid-items-expected.html
@@ -2,7 +2,7 @@
<html>
<body>
<div>Checks that anonymous grid items are supported. This should not crash.</div>
- <div style="display: -webkit-grid;">
+ <div style="display: grid;">
<div>anonymous item</div>
</div>
</body>
diff --git a/LayoutTests/fast/css-grid-layout/anonymous-grid-items.html b/LayoutTests/fast/css-grid-layout/anonymous-grid-items.html
index c6aee04..0b5ca90 100644
--- a/LayoutTests/fast/css-grid-layout/anonymous-grid-items.html
+++ b/LayoutTests/fast/css-grid-layout/anonymous-grid-items.html
@@ -2,7 +2,7 @@
<html>
<body>
<div>Checks that anonymous grid items are supported. This should not crash.</div>
- <div style="display: -webkit-grid;">
+ <div style="display: grid;">
anonymous item
</div>
</body>
diff --git a/LayoutTests/fast/css-grid-layout/auto-content-resolution-columns.html b/LayoutTests/fast/css-grid-layout/auto-content-resolution-columns.html
index dcf4a67..d3874d0 100644
--- a/LayoutTests/fast/css-grid-layout/auto-content-resolution-columns.html
+++ b/LayoutTests/fast/css-grid-layout/auto-content-resolution-columns.html
@@ -4,8 +4,8 @@
<link href="resources/grid-alignment.css" rel="stylesheet">
<style>
.gridAutoContent {
- -webkit-grid-template-columns: auto;
- -webkit-grid-template-rows: 50px;
+ grid-template-columns: auto;
+ grid-template-rows: 50px;
}
.firstRowFirstColumn {
diff --git a/LayoutTests/fast/css-grid-layout/auto-content-resolution-rows.html b/LayoutTests/fast/css-grid-layout/auto-content-resolution-rows.html
index fc8898a..907565a 100644
--- a/LayoutTests/fast/css-grid-layout/auto-content-resolution-rows.html
+++ b/LayoutTests/fast/css-grid-layout/auto-content-resolution-rows.html
@@ -3,8 +3,8 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.gridAutoContent {
- -webkit-grid-template-columns: 50px;
- -webkit-grid-template-rows: auto;
+ grid-template-columns: 50px;
+ grid-template-rows: auto;
}
.firstRowFirstColumn {
diff --git a/LayoutTests/fast/css-grid-layout/breadth-size-resolution-grid.html b/LayoutTests/fast/css-grid-layout/breadth-size-resolution-grid.html
index 34d27c7..1245c2b 100644
--- a/LayoutTests/fast/css-grid-layout/breadth-size-resolution-grid.html
+++ b/LayoutTests/fast/css-grid-layout/breadth-size-resolution-grid.html
@@ -3,8 +3,8 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-columns: 100px 10vw;
- -webkit-grid-template-rows: 10vh 100px;
+ grid-template-columns: 100px 10vw;
+ grid-template-rows: 10vh 100px;
}
.firstRowFirstColumn {
diff --git a/LayoutTests/fast/css-grid-layout/calc-resolution-grid-item.html b/LayoutTests/fast/css-grid-layout/calc-resolution-grid-item.html
index e6bf3f1..9026f55 100644
--- a/LayoutTests/fast/css-grid-layout/calc-resolution-grid-item.html
+++ b/LayoutTests/fast/css-grid-layout/calc-resolution-grid-item.html
@@ -3,8 +3,8 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-columns: 100px 300px;
- -webkit-grid-template-rows: 50px 150px;
+ grid-template-columns: 100px 300px;
+ grid-template-rows: 50px 150px;
height: 200px;
width: 400px;
}
diff --git a/LayoutTests/fast/css-grid-layout/compute-intrinsic-widths-scrollbar.html b/LayoutTests/fast/css-grid-layout/compute-intrinsic-widths-scrollbar.html
index 2b25116..0bf9cd7 100644
--- a/LayoutTests/fast/css-grid-layout/compute-intrinsic-widths-scrollbar.html
+++ b/LayoutTests/fast/css-grid-layout/compute-intrinsic-widths-scrollbar.html
@@ -11,11 +11,11 @@
}
.oneColumn {
- -webkit-grid-template-columns: 200px;
+ grid-template-columns: 200px;
}
.fourColumns {
- -webkit-grid-template-columns: repeat(4, 50px);
+ grid-template-columns: repeat(4, 50px);
}
</style>
<script src="../../resources/check-layout.js"></script>
diff --git a/LayoutTests/fast/css-grid-layout/display-grid-set-get-expected.txt b/LayoutTests/fast/css-grid-layout/display-grid-set-get-expected.txt
index 3fe18e3..faaa00f 100644
--- a/LayoutTests/fast/css-grid-layout/display-grid-set-get-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/display-grid-set-get-expected.txt
@@ -4,14 +4,14 @@
Test getting |display| set through CSS
-PASS getComputedStyle(gridElement, '').getPropertyValue('display') is '-webkit-grid'
-PASS getComputedStyle(inlineGridElement, '').getPropertyValue('display') is '-webkit-inline-grid'
+PASS getComputedStyle(gridElement, '').getPropertyValue('display') is 'grid'
+PASS getComputedStyle(inlineGridElement, '').getPropertyValue('display') is 'inline-grid'
Test getting and setting display through JS
PASS getComputedStyle(element, '').getPropertyValue('display') is 'block'
-PASS getComputedStyle(element, '').getPropertyValue('display') is '-webkit-grid'
+PASS getComputedStyle(element, '').getPropertyValue('display') is 'grid'
PASS getComputedStyle(element, '').getPropertyValue('display') is 'block'
-PASS getComputedStyle(element, '').getPropertyValue('display') is '-webkit-inline-grid'
+PASS getComputedStyle(element, '').getPropertyValue('display') is 'inline-grid'
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/explicit-grid-size.html b/LayoutTests/fast/css-grid-layout/explicit-grid-size.html
index 11e7dfe..e1e6b81 100644
--- a/LayoutTests/fast/css-grid-layout/explicit-grid-size.html
+++ b/LayoutTests/fast/css-grid-layout/explicit-grid-size.html
@@ -3,46 +3,46 @@
<style>
.grid {
- -webkit-grid-auto-columns: 10px;
- -webkit-grid-auto-rows: 10px;
+ grid-auto-columns: 10px;
+ grid-auto-rows: 10px;
position: relative;
}
.oneColumnOneRow {
- -webkit-grid-template-columns: 50px;
- -webkit-grid-template-rows: 50px;
+ grid-template-columns: 50px;
+ grid-template-rows: 50px;
}
.twoColumnsOneRow {
- -webkit-grid-template-columns: 50px 50px;
- -webkit-grid-template-rows: 50px;
+ grid-template-columns: 50px 50px;
+ grid-template-rows: 50px;
}
.oneColumnTwoRows {
- -webkit-grid-template-columns: 50px;
- -webkit-grid-template-rows: 50px 50px;
+ grid-template-columns: 50px;
+ grid-template-rows: 50px 50px;
}
.twoColumnsTwoRows {
- -webkit-grid-template-columns: 50px 50px;
- -webkit-grid-template-rows: 50px 50px;
+ grid-template-columns: 50px 50px;
+ grid-template-rows: 50px 50px;
}
.oneColumnOneRowAreas {
- -webkit-grid-template-areas: "a";
+ grid-template-areas: "a";
}
.twoColumnsOneRowAreas {
- -webkit-grid-template-areas: "a b";
+ grid-template-areas: "a b";
}
.oneColumnTwoRowsAreas {
- -webkit-grid-template-areas: "a"
+ grid-template-areas: "a"
"b";
}
.twoColumnsTwoRowsAreas {
- -webkit-grid-template-areas: "a b"
+ grid-template-areas: "a b"
"c d";
}
diff --git a/LayoutTests/fast/css-grid-layout/flex-and-content-sized-resolution-columns-expected.txt b/LayoutTests/fast/css-grid-layout/flex-and-content-sized-resolution-columns-expected.txt
index 328eb16..aea55e2 100644
--- a/LayoutTests/fast/css-grid-layout/flex-and-content-sized-resolution-columns-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/flex-and-content-sized-resolution-columns-expected.txt
@@ -1,10 +1,10 @@
-PASS window.getComputedStyle(gridFixedAndMinContentAndFlex, '').getPropertyValue('-webkit-grid-template-columns') is "20px 30px 50px"
-PASS window.getComputedStyle(gridFixedAndMinContentAndFlexMultipleOverlap, '').getPropertyValue('-webkit-grid-template-columns') is "20px 10px 70px"
-PASS window.getComputedStyle(gridMinMaxFixedFlexAndMaxContentAndAuto, '').getPropertyValue('-webkit-grid-template-columns') is "60px 20px 20px"
-PASS window.getComputedStyle(gridMinMaxFixedFlexAndMaxContentAndAutoNoFlexSpanningItems, '').getPropertyValue('-webkit-grid-template-columns') is "100px 0px 0px"
-PASS window.getComputedStyle(gridMinMaxFlexFixedAndMinContentAndFixed, '').getPropertyValue('-webkit-grid-template-columns') is "35px 5px 25px"
-PASS window.getComputedStyle(gridMinContentAndMinMaxFixedMinContentAndFlex, '').getPropertyValue('-webkit-grid-template-columns') is "20px 20px 60px"
-PASS window.getComputedStyle(gridMaxContentAndMinMaxFixedMaxContentAndFlex, '').getPropertyValue('-webkit-grid-template-columns') is "70px 20px 10px"
+PASS window.getComputedStyle(gridFixedAndMinContentAndFlex, '').getPropertyValue('grid-template-columns') is "20px 30px 50px"
+PASS window.getComputedStyle(gridFixedAndMinContentAndFlexMultipleOverlap, '').getPropertyValue('grid-template-columns') is "20px 10px 70px"
+PASS window.getComputedStyle(gridMinMaxFixedFlexAndMaxContentAndAuto, '').getPropertyValue('grid-template-columns') is "60px 20px 20px"
+PASS window.getComputedStyle(gridMinMaxFixedFlexAndMaxContentAndAutoNoFlexSpanningItems, '').getPropertyValue('grid-template-columns') is "100px 0px 0px"
+PASS window.getComputedStyle(gridMinMaxFlexFixedAndMinContentAndFixed, '').getPropertyValue('grid-template-columns') is "35px 5px 25px"
+PASS window.getComputedStyle(gridMinContentAndMinMaxFixedMinContentAndFlex, '').getPropertyValue('grid-template-columns') is "20px 20px 60px"
+PASS window.getComputedStyle(gridMaxContentAndMinMaxFixedMaxContentAndFlex, '').getPropertyValue('grid-template-columns') is "70px 20px 10px"
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/flex-and-content-sized-resolution-columns.html b/LayoutTests/fast/css-grid-layout/flex-and-content-sized-resolution-columns.html
index d4ec1b2..f04b5d6 100644
--- a/LayoutTests/fast/css-grid-layout/flex-and-content-sized-resolution-columns.html
+++ b/LayoutTests/fast/css-grid-layout/flex-and-content-sized-resolution-columns.html
@@ -8,23 +8,23 @@
}
.gridFixedAndMinContentAndFlex {
- -webkit-grid-template-columns: 20px -webkit-min-content 1fr;
+ grid-template-columns: 20px -webkit-min-content 1fr;
}
.gridMinMaxFixedFlexAndMaxContentAndAuto {
- -webkit-grid-template-columns: minmax(20px, 1fr) -webkit-max-content auto;
+ grid-template-columns: minmax(20px, 1fr) -webkit-max-content auto;
}
.gridMinMaxFlexFixedAndMinContentAndFixed {
- -webkit-grid-template-columns: minmax(0.5fr, 35px) -webkit-min-content 25px;
+ grid-template-columns: minmax(0.5fr, 35px) -webkit-min-content 25px;
}
.gridMinContentAndMinMaxFixedMinContentAndFlex {
- -webkit-grid-template-columns: -webkit-min-content minmax(20px, -webkit-min-content) 2fr;
+ grid-template-columns: -webkit-min-content minmax(20px, -webkit-min-content) 2fr;
}
.gridMaxContentAndMinMaxFixedMaxContentAndFlex {
- -webkit-grid-template-columns: -webkit-max-content minmax(20px, -webkit-max-content) 1fr;
+ grid-template-columns: -webkit-max-content minmax(20px, -webkit-max-content) 1fr;
}
</style>
@@ -36,54 +36,54 @@
<div style="position: relative; width: 100px;">
<div id="gridFixedAndMinContentAndFlex" class="grid gridFixedAndMinContentAndFlex">
- <div style="-webkit-grid-column: 2 / span 2;">XXXXXXXX</div>
- <div style="-webkit-grid-column: 1 / span 2; -webkit-grid-row: 2;">XXXXX</div>
+ <div style="grid-column: 2 / span 2;">XXXXXXXX</div>
+ <div style="grid-column: 1 / span 2; grid-row: 2;">XXXXX</div>
</div>
</div>
<div style="position: relative; width: 100px;">
<div id="gridFixedAndMinContentAndFlexMultipleOverlap" class="grid gridFixedAndMinContentAndFlex">
- <div style="-webkit-grid-column: 1 / span 2;">XXX XXX</div>
- <div style="-webkit-grid-column: 1 / -1; -webkit-grid-row: 2;">XXXX</div>
+ <div style="grid-column: 1 / span 2;">XXX XXX</div>
+ <div style="grid-column: 1 / -1; grid-row: 2;">XXXX</div>
</div>
</div>
<div style="position: relative; width: 100px;">
<div id="gridMinMaxFixedFlexAndMaxContentAndAuto" class="grid gridMinMaxFixedFlexAndMaxContentAndAuto">
- <div style="-webkit-grid-column: 1 / span 2;">XXX XXX</div>
- <div style="-webkit-grid-column: 2 / span 2; -webkit-grid-row: 2;">XXXX</div>
+ <div style="grid-column: 1 / span 2;">XXX XXX</div>
+ <div style="grid-column: 2 / span 2; grid-row: 2;">XXXX</div>
</div>
</div>
<div style="position: relative; width: 100px;">
<div id="gridMinMaxFixedFlexAndMaxContentAndAutoNoFlexSpanningItems" class="grid gridMinMaxFixedFlexAndMaxContentAndAuto">
- <div style="-webkit-grid-column: 1 / -1;">XXX XXX</div>
- <div style="-webkit-grid-column: 1 / span 2; -webkit-grid-row: 2;">XXXX XXXX</div>
+ <div style="grid-column: 1 / -1;">XXX XXX</div>
+ <div style="grid-column: 1 / span 2; grid-row: 2;">XXXX XXXX</div>
</div>
</div>
<div style="position: relative; width: 100px;">
<div id="gridMinMaxFlexFixedAndMinContentAndFixed" class="grid gridMinMaxFlexFixedAndMinContentAndFixed">
- <div style="-webkit-grid-column: 1 / span 2;">XXXX XXXX</div>
- <div style="-webkit-grid-column: 2 / span 2; -webkit-grid-row: 2;">XXX XXX</div>
- <div style="-webkit-grid-column: 1 / -1; -webkit-grid-row: 3;">XXXXX XXXXX</div>
- <div style="-webkit-grid-column: 2 / span 2; -webkit-grid-row: 4;">XX XX XX XX</div>
+ <div style="grid-column: 1 / span 2;">XXXX XXXX</div>
+ <div style="grid-column: 2 / span 2; grid-row: 2;">XXX XXX</div>
+ <div style="grid-column: 1 / -1; grid-row: 3;">XXXXX XXXXX</div>
+ <div style="grid-column: 2 / span 2; grid-row: 4;">XX XX XX XX</div>
</div>
</div>
<div style="position: relative; width: 100px;">
<div id="gridMinContentAndMinMaxFixedMinContentAndFlex" class="grid gridMinContentAndMinMaxFixedMinContentAndFlex">
- <div style="-webkit-grid-column: 2 / span 2;">XXXXX</div>
- <div style="-webkit-grid-column: 1 / -1; -webkit-grid-row: 2;">XXX XXX XXX</div>
- <div style="-webkit-grid-column: 1 / span 2; -webkit-grid-row: 3;">XXXX XXXX</div>
+ <div style="grid-column: 2 / span 2;">XXXXX</div>
+ <div style="grid-column: 1 / -1; grid-row: 2;">XXX XXX XXX</div>
+ <div style="grid-column: 1 / span 2; grid-row: 3;">XXXX XXXX</div>
</div>
</div>
<div style="position: relative; width: 100px;">
<div id="gridMaxContentAndMinMaxFixedMaxContentAndFlex" class="grid gridMaxContentAndMinMaxFixedMaxContentAndFlex">
- <div style="-webkit-grid-column: 2 / span 2;">XXXXX</div>
- <div style="-webkit-grid-column: 1 / -1; -webkit-grid-row: 2;">XXX XXX XXX</div>
- <div style="-webkit-grid-column: 1 / span 2; -webkit-grid-row: 3;">XXXX XXXX</div>
+ <div style="grid-column: 2 / span 2;">XXXXX</div>
+ <div style="grid-column: 1 / -1; grid-row: 2;">XXX XXX XXX</div>
+ <div style="grid-column: 1 / span 2; grid-row: 3;">XXXX XXXX</div>
</div>
</div>
@@ -93,7 +93,7 @@
function checkColumns(gridId, columnValue)
{
window.gridElement = document.getElementById(gridId);
- shouldBeEqualToString("window.getComputedStyle(" + gridId + ", '').getPropertyValue('-webkit-grid-template-columns')", columnValue);
+ shouldBeEqualToString("window.getComputedStyle(" + gridId + ", '').getPropertyValue('grid-template-columns')", columnValue);
}
checkColumns("gridFixedAndMinContentAndFlex", "20px 30px 50px");
diff --git a/LayoutTests/fast/css-grid-layout/flex-and-intrinsic-sizes.html b/LayoutTests/fast/css-grid-layout/flex-and-intrinsic-sizes.html
index 18ee9a0..3510dc9 100644
--- a/LayoutTests/fast/css-grid-layout/flex-and-intrinsic-sizes.html
+++ b/LayoutTests/fast/css-grid-layout/flex-and-intrinsic-sizes.html
@@ -11,8 +11,8 @@
}
.grid {
- -webkit-grid-template-columns: 1fr;
- -webkit-grid-template-rows: 1fr;
+ grid-template-columns: 1fr;
+ grid-template-rows: 1fr;
}
div { font: 10px/1 Ahem; }
diff --git a/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-columns.html b/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-columns.html
index 200ef107..a6d455a 100644
--- a/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-columns.html
+++ b/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-columns.html
@@ -3,37 +3,37 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.gridMaxMaxContent {
- -webkit-grid-template-columns: minmax(10px, -webkit-max-content) minmax(10px, 1fr);
- -webkit-grid-template-rows: 50px;
+ grid-template-columns: minmax(10px, -webkit-max-content) minmax(10px, 1fr);
+ grid-template-rows: 50px;
}
.gridMinMinContent {
- -webkit-grid-template-columns: minmax(10px, 1fr) minmax(-webkit-min-content, 50px);
- -webkit-grid-template-rows: 50px;
+ grid-template-columns: minmax(10px, 1fr) minmax(-webkit-min-content, 50px);
+ grid-template-rows: 50px;
}
.gridWithIntrinsicSizeBiggerThanFlex {
- -webkit-grid-template-columns: minmax(-webkit-min-content, 0.5fr) minmax(18px, 2fr);
- -webkit-grid-template-rows: 50px;
+ grid-template-columns: minmax(-webkit-min-content, 0.5fr) minmax(18px, 2fr);
+ grid-template-rows: 50px;
}
.gridShrinkBelowItemsIntrinsicSize {
- -webkit-grid-template-columns: minmax(0px, 1fr) minmax(0px, 2fr);
- -webkit-grid-template-rows: 50px;
+ grid-template-columns: minmax(0px, 1fr) minmax(0px, 2fr);
+ grid-template-rows: 50px;
}
.gridWithNonFlexingItems {
- -webkit-grid-template-columns: 40px minmax(-webkit-min-content, 1fr) auto minmax(20px, 2fr);
- -webkit-grid-template-rows: 50px;
+ grid-template-columns: 40px minmax(-webkit-min-content, 1fr) auto minmax(20px, 2fr);
+ grid-template-rows: 50px;
}
.firstRowThirdColumn {
- -webkit-grid-column: 3;
- -webkit-grid-row: 1;
+ grid-column: 3;
+ grid-row: 1;
}
.firstRowFourthColumn {
- -webkit-grid-column: 4;
- -webkit-grid-row: 1;
+ grid-column: 4;
+ grid-row: 1;
}
</style>
<script src="../../resources/check-layout.js"></script>
diff --git a/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-rows.html b/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-rows.html
index f16ebd6..37ea06a 100644
--- a/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-rows.html
+++ b/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-rows.html
@@ -3,37 +3,37 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.gridMaxMaxContent {
- -webkit-grid-template-columns: 50px;
- -webkit-grid-template-rows: minmax(10px, -webkit-max-content) minmax(10px, 1fr);
+ grid-template-columns: 50px;
+ grid-template-rows: minmax(10px, -webkit-max-content) minmax(10px, 1fr);
}
.gridMinMinContent {
- -webkit-grid-template-columns: 50px;
- -webkit-grid-template-rows: minmax(10px, 1fr) minmax(-webkit-min-content, 50px);
+ grid-template-columns: 50px;
+ grid-template-rows: minmax(10px, 1fr) minmax(-webkit-min-content, 50px);
}
.gridWithIntrinsicSizeBiggerThanFlex {
- -webkit-grid-template-columns: 50px;
- -webkit-grid-template-rows: minmax(-webkit-min-content, 0.5fr) minmax(18px, 2fr);
+ grid-template-columns: 50px;
+ grid-template-rows: minmax(-webkit-min-content, 0.5fr) minmax(18px, 2fr);
}
.gridShrinkBelowItemsIntrinsicSize {
- -webkit-grid-template-columns: 50px;
- -webkit-grid-template-rows: minmax(0px, 1fr) minmax(0px, 2fr);
+ grid-template-columns: 50px;
+ grid-template-rows: minmax(0px, 1fr) minmax(0px, 2fr);
}
.gridWithNonFlexingItems {
- -webkit-grid-template-columns: 50px;
- -webkit-grid-template-rows: 40px minmax(-webkit-min-content, 1fr) auto minmax(20px, 2fr);
+ grid-template-columns: 50px;
+ grid-template-rows: 40px minmax(-webkit-min-content, 1fr) auto minmax(20px, 2fr);
}
.thirdRowFirstColumn {
- -webkit-grid-column: 1;
- -webkit-grid-row: 3;
+ grid-column: 1;
+ grid-row: 3;
}
.fourthRowFirstColumn {
- -webkit-grid-column: 1;
- -webkit-grid-row: 4;
+ grid-column: 1;
+ grid-row: 4;
}
</style>
<script src="../../resources/check-layout.js"></script>
diff --git a/LayoutTests/fast/css-grid-layout/flex-content-distribution.html b/LayoutTests/fast/css-grid-layout/flex-content-distribution.html
index fc432e8..4ee0513 100644
--- a/LayoutTests/fast/css-grid-layout/flex-content-distribution.html
+++ b/LayoutTests/fast/css-grid-layout/flex-content-distribution.html
@@ -4,13 +4,13 @@
<link href="resources/grid-alignment.css" rel="stylesheet">
<style>
.freeSpaceForColumnsGrid {
- -webkit-grid-template: 100% / minmax(20px, 0.7fr);
+ grid-template: 100% / minmax(20px, 0.7fr);
width: 50px;
height: 100px;
}
.freeSpaceForRowsGrid {
- -webkit-grid-template: minmax(20px, 0.7fr) / 100%;
+ grid-template: minmax(20px, 0.7fr) / 100%;
width: 50px;
height: 100px;
}
diff --git a/LayoutTests/fast/css-grid-layout/flex-content-resolution-columns.html b/LayoutTests/fast/css-grid-layout/flex-content-resolution-columns.html
index 54b5069..d586333 100644
--- a/LayoutTests/fast/css-grid-layout/flex-content-resolution-columns.html
+++ b/LayoutTests/fast/css-grid-layout/flex-content-resolution-columns.html
@@ -3,49 +3,49 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.gridMinFlexContent {
- -webkit-grid-template-columns: minmax(1fr, 50px);
- -webkit-grid-template-rows: 50px;
+ grid-template-columns: minmax(1fr, 50px);
+ grid-template-rows: 50px;
}
.gridZeroFlexContent {
- -webkit-grid-template-columns: minmax(1fr, 0px);
- -webkit-grid-template-rows: 50px;
+ grid-template-columns: minmax(1fr, 0px);
+ grid-template-rows: 50px;
}
.gridMaxFlexContent {
- -webkit-grid-template-columns: minmax(30px, 2fr);
- -webkit-grid-template-rows: 50px;
+ grid-template-columns: minmax(30px, 2fr);
+ grid-template-rows: 50px;
}
.gridTwoMaxFlexContent {
- -webkit-grid-template-columns: minmax(10px, 1fr) minmax(10px, 2fr);
- -webkit-grid-template-rows: 50px;
+ grid-template-columns: minmax(10px, 1fr) minmax(10px, 2fr);
+ grid-template-rows: 50px;
}
.gridTwoDoubleMaxFlexContent {
- -webkit-grid-template-columns: minmax(10px, 0.5fr) minmax(10px, 2fr);
- -webkit-grid-template-rows: 50px;
+ grid-template-columns: minmax(10px, 0.5fr) minmax(10px, 2fr);
+ grid-template-rows: 50px;
}
.gridIgnoreSecondGridItem {
- -webkit-grid-template-columns: minmax(300px, 3fr) minmax(150px, 1fr);
- -webkit-grid-template-rows: 50px;
+ grid-template-columns: minmax(300px, 3fr) minmax(150px, 1fr);
+ grid-template-rows: 50px;
}
.gridRespectBaseSize {
- -webkit-grid-template-columns: minmax(75px, 1fr) minmax(0px, 2fr);
- -webkit-grid-template-rows: 50px;
+ grid-template-columns: minmax(75px, 1fr) minmax(0px, 2fr);
+ grid-template-rows: 50px;
}
.gridRespectProportions {
- -webkit-grid-template-columns: minmax(0px, .25fr) minmax(0px, .5fr) minmax(0px, 2fr);
- -webkit-grid-template-rows: 50px;
+ grid-template-columns: minmax(0px, .25fr) minmax(0px, .5fr) minmax(0px, 2fr);
+ grid-template-rows: 50px;
}
.gridRespectBaseSizeProportions {
- -webkit-grid-template-columns: minmax(50px, .25fr) minmax(0px, .5fr) minmax(0px, 1fr);
- -webkit-grid-template-rows: 50px;
+ grid-template-columns: minmax(50px, .25fr) minmax(0px, .5fr) minmax(0px, 1fr);
+ grid-template-rows: 50px;
}
.gridRespectBaseSizeBeforeProportions {
- -webkit-grid-template-columns: minmax(50px, .25fr) minmax(0px, .5fr) minmax(0px, 1fr);
- -webkit-grid-template-rows: 50px;
+ grid-template-columns: minmax(50px, .25fr) minmax(0px, .5fr) minmax(0px, 1fr);
+ grid-template-rows: 50px;
}
.firstRowThirdColumn {
background-color: yellow;
- -webkit-grid-column: 3;
- -webkit-grid-row: 1;
+ grid-column: 3;
+ grid-row: 1;
}
</style>
<script src="../../resources/check-layout.js"></script>
diff --git a/LayoutTests/fast/css-grid-layout/flex-content-resolution-rows.html b/LayoutTests/fast/css-grid-layout/flex-content-resolution-rows.html
index e1d2559..b2a8a47 100644
--- a/LayoutTests/fast/css-grid-layout/flex-content-resolution-rows.html
+++ b/LayoutTests/fast/css-grid-layout/flex-content-resolution-rows.html
@@ -3,45 +3,45 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.gridMinFlexContent {
- -webkit-grid-template-columns: 50px;
- -webkit-grid-template-rows: minmax(1fr, 50px);
+ grid-template-columns: 50px;
+ grid-template-rows: minmax(1fr, 50px);
}
.gridZeroFlexContent {
- -webkit-grid-template-columns: 50px;
- -webkit-grid-template-rows: minmax(1fr, 0px);
+ grid-template-columns: 50px;
+ grid-template-rows: minmax(1fr, 0px);
}
.gridMaxFlexContent {
- -webkit-grid-template-columns: 50px;
- -webkit-grid-template-rows: minmax(30px, 2fr);
+ grid-template-columns: 50px;
+ grid-template-rows: minmax(30px, 2fr);
}
.gridTwoMaxFlexContent {
- -webkit-grid-template-columns: 50px;
- -webkit-grid-template-rows: minmax(10px, 1fr) minmax(10px, 2fr);
+ grid-template-columns: 50px;
+ grid-template-rows: minmax(10px, 1fr) minmax(10px, 2fr);
}
.gridTwoDoubleMaxFlexContent {
- -webkit-grid-template-columns: 50px;
- -webkit-grid-template-rows: minmax(10px, 0.5fr) minmax(10px, 2fr);
+ grid-template-columns: 50px;
+ grid-template-rows: minmax(10px, 0.5fr) minmax(10px, 2fr);
}
.gridRespectBaseSize {
- -webkit-grid-template-columns: 50px;
- -webkit-grid-template-rows: minmax(75px, 1fr) minmax(0px, 2fr);
+ grid-template-columns: 50px;
+ grid-template-rows: minmax(75px, 1fr) minmax(0px, 2fr);
}
.gridRespectProportions {
- -webkit-grid-template-columns: 50px;
- -webkit-grid-template-rows: minmax(25px, .25fr) minmax(0px, .5fr) minmax(0px, 2fr);
+ grid-template-columns: 50px;
+ grid-template-rows: minmax(25px, .25fr) minmax(0px, .5fr) minmax(0px, 2fr);
}
.gridRespectBaseSizeProportions {
- -webkit-grid-template-columns: 50px;
- -webkit-grid-template-rows: minmax(50px, .25fr) minmax(0px, .5fr) minmax(0px, 1fr);
+ grid-template-columns: 50px;
+ grid-template-rows: minmax(50px, .25fr) minmax(0px, .5fr) minmax(0px, 1fr);
}
.gridRespectBaseSizeBeforeProportions {
- -webkit-grid-template-columns: 50px;
- -webkit-grid-template-rows: minmax(50px, .25fr) minmax(0px, .5fr) minmax(0px, 1fr);
+ grid-template-columns: 50px;
+ grid-template-rows: minmax(50px, .25fr) minmax(0px, .5fr) minmax(0px, 1fr);
}
.thirdRowFirstColumn {
background-color: yellow;
- -webkit-grid-column: 1;
- -webkit-grid-row: 3;
+ grid-column: 1;
+ grid-row: 3;
}
</style>
<script src="../../resources/check-layout.js"></script>
diff --git a/LayoutTests/fast/css-grid-layout/flex-content-sized-column-use-available-width.html b/LayoutTests/fast/css-grid-layout/flex-content-sized-column-use-available-width.html
index b0e5edf..4133d46 100644
--- a/LayoutTests/fast/css-grid-layout/flex-content-sized-column-use-available-width.html
+++ b/LayoutTests/fast/css-grid-layout/flex-content-sized-column-use-available-width.html
@@ -4,11 +4,11 @@
<link href="resources/grid.css" rel="stylesheet">
<style type="text/css">
#grid-1 {
- -webkit-grid-template-columns: 1fr;
+ grid-template-columns: 1fr;
}
#grid-2 {
- -webkit-grid-template-columns: auto;
+ grid-template-columns: auto;
}
</style>
</head>
diff --git a/LayoutTests/fast/css-grid-layout/flex-content-sized-columns-resize.html b/LayoutTests/fast/css-grid-layout/flex-content-sized-columns-resize.html
index 3ae81b1..ec2db05 100644
--- a/LayoutTests/fast/css-grid-layout/flex-content-sized-columns-resize.html
+++ b/LayoutTests/fast/css-grid-layout/flex-content-sized-columns-resize.html
@@ -4,11 +4,11 @@
<link href="resources/grid.css" rel="stylesheet">
<style type="text/css">
#grid-1 {
- -webkit-grid-template-columns: 1fr 1fr;
+ grid-template-columns: 1fr 1fr;
}
#grid-2 {
- -webkit-grid-template-columns: auto;
+ grid-template-columns: auto;
}
</style>
<script>
diff --git a/LayoutTests/fast/css-grid-layout/flex-factor-sum-less-than-1.html b/LayoutTests/fast/css-grid-layout/flex-factor-sum-less-than-1.html
index e913a3b..d8cf2ed 100644
--- a/LayoutTests/fast/css-grid-layout/flex-factor-sum-less-than-1.html
+++ b/LayoutTests/fast/css-grid-layout/flex-factor-sum-less-than-1.html
@@ -3,41 +3,41 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.onlyColumnFractionFlexFactors {
- -webkit-grid-template-columns: minmax(0,0.1fr) minmax(0,0.2fr) minmax(0,0.3fr);
- -webkit-grid-template-rows: 50px;
+ grid-template-columns: minmax(0,0.1fr) minmax(0,0.2fr) minmax(0,0.3fr);
+ grid-template-rows: 50px;
width: 100px;
}
.onlyRowFractionFlexFactors {
- -webkit-grid-template-columns: 50px;
- -webkit-grid-template-rows: minmax(0,0.1fr) minmax(0,0.2fr) minmax(0,0.3fr);
+ grid-template-columns: 50px;
+ grid-template-rows: minmax(0,0.1fr) minmax(0,0.2fr) minmax(0,0.3fr);
width: 50px;
height: 100px;
}
.fixedAndfractionFlexFactors {
- -webkit-grid-template-columns: 50px minmax(0,0.2fr) 30px;
- -webkit-grid-template-rows: minmax(0,0.1fr) 50px minmax(0,0.3fr);
+ grid-template-columns: 50px minmax(0,0.2fr) 30px;
+ grid-template-rows: minmax(0,0.1fr) 50px minmax(0,0.3fr);
width: 100px;
height: 100px;
}
.firstRowThirdColumn {
background-color: yellow;
- -webkit-grid-column: 3;
- -webkit-grid-row: 1;
+ grid-column: 3;
+ grid-row: 1;
}
.secondRowThirdColumn {
background-color: yellow;
- -webkit-grid-column: 3;
- -webkit-grid-row: 2;
+ grid-column: 3;
+ grid-row: 2;
}
.thirdRowFirstColumn {
background-color: brown;
- -webkit-grid-column: 1;
- -webkit-grid-row: 3;
+ grid-column: 1;
+ grid-row: 3;
}
.thirdRowThirdColumn {
background-color: magenta;
- -webkit-grid-column: 3;
- -webkit-grid-row: 3;
+ grid-column: 3;
+ grid-row: 3;
}
</style>
<script src="../../resources/check-layout.js"></script>
diff --git a/LayoutTests/fast/css-grid-layout/float-not-protruding-into-next-grid-item.html b/LayoutTests/fast/css-grid-layout/float-not-protruding-into-next-grid-item.html
index 9051f67..82cb209 100644
--- a/LayoutTests/fast/css-grid-layout/float-not-protruding-into-next-grid-item.html
+++ b/LayoutTests/fast/css-grid-layout/float-not-protruding-into-next-grid-item.html
@@ -4,8 +4,8 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-auto-columns: 50px;
- -webkit-grid-auto-rows: minmax(50px, -webkit-max-content);
+ grid-auto-columns: 50px;
+ grid-auto-rows: minmax(50px, -webkit-max-content);
width: -webkit-fit-content;
}
diff --git a/LayoutTests/fast/css-grid-layout/floating-empty-grids.html b/LayoutTests/fast/css-grid-layout/floating-empty-grids.html
index 073439f..742639a 100644
--- a/LayoutTests/fast/css-grid-layout/floating-empty-grids.html
+++ b/LayoutTests/fast/css-grid-layout/floating-empty-grids.html
@@ -3,8 +3,8 @@
<head>
<style>
span { width: 100px; height: 100px; }
- .grid { display: -webkit-grid; background-color: green; }
- .inline-grid { display: -webkit-inline-grid; background-color: green; }
+ .grid { display: grid; background-color: green; }
+ .inline-grid { display: inline-grid; background-color: green; }
</style>
</head>
<body>
diff --git a/LayoutTests/fast/css-grid-layout/grid-align-content-distribution-vertical-lr.html b/LayoutTests/fast/css-grid-layout/grid-align-content-distribution-vertical-lr.html
index 4298d6e..cbd8610 100644
--- a/LayoutTests/fast/css-grid-layout/grid-align-content-distribution-vertical-lr.html
+++ b/LayoutTests/fast/css-grid-layout/grid-align-content-distribution-vertical-lr.html
@@ -9,15 +9,15 @@
}
.grid {
- -webkit-grid-auto-columns: 20px;
- -webkit-grid-auto-rows: 40px;
+ grid-auto-columns: 20px;
+ grid-auto-rows: 40px;
position: relative;
width: 400px;
height: 300px;
}
.stretchedGrid {
- -webkit-grid-auto-rows: auto;
+ grid-auto-rows: auto;
}
.alignContentSpaceBetween {
diff --git a/LayoutTests/fast/css-grid-layout/grid-align-content-distribution-vertical-rl.html b/LayoutTests/fast/css-grid-layout/grid-align-content-distribution-vertical-rl.html
index a19cc71..e8422e4 100644
--- a/LayoutTests/fast/css-grid-layout/grid-align-content-distribution-vertical-rl.html
+++ b/LayoutTests/fast/css-grid-layout/grid-align-content-distribution-vertical-rl.html
@@ -9,15 +9,15 @@
}
.grid {
- -webkit-grid-auto-columns: 20px;
- -webkit-grid-auto-rows: 40px;
+ grid-auto-columns: 20px;
+ grid-auto-rows: 40px;
position: relative;
width: 400px;
height: 300px;
}
.stretchedGrid {
- -webkit-grid-auto-rows: auto;
+ grid-auto-rows: auto;
}
.alignContentSpaceBetween {
diff --git a/LayoutTests/fast/css-grid-layout/grid-align-content-distribution.html b/LayoutTests/fast/css-grid-layout/grid-align-content-distribution.html
index 9b31850..d51f29c 100644
--- a/LayoutTests/fast/css-grid-layout/grid-align-content-distribution.html
+++ b/LayoutTests/fast/css-grid-layout/grid-align-content-distribution.html
@@ -9,15 +9,15 @@
}
.grid {
- -webkit-grid-auto-columns: 20px;
- -webkit-grid-auto-rows: 40px;
+ grid-auto-columns: 20px;
+ grid-auto-rows: 40px;
position: relative;
width: 200px;
height: 300px;
}
.stretchedGrid {
- -webkit-grid-auto-rows: auto;
+ grid-auto-rows: auto;
}
.alignContentSpaceBetween {
diff --git a/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-lr.html b/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-lr.html
index f5e2b64..c7c252e 100644
--- a/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-lr.html
+++ b/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-lr.html
@@ -9,7 +9,7 @@
}
.grid {
- -webkit-grid: 100px 100px / 50px 50px;
+ grid: 100px 100px / 50px 50px;
position: relative;
width: 300px;
height: 200px;
diff --git a/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-rl.html b/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-rl.html
index cf95fcc..8b58a46 100644
--- a/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-rl.html
+++ b/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-rl.html
@@ -9,7 +9,7 @@
}
.grid {
- -webkit-grid: 100px 100px / 50px 50px;
+ grid: 100px 100px / 50px 50px;
position: relative;
width: 300px;
height: 200px;
diff --git a/LayoutTests/fast/css-grid-layout/grid-align-content.html b/LayoutTests/fast/css-grid-layout/grid-align-content.html
index 804aa68..f697eae9 100644
--- a/LayoutTests/fast/css-grid-layout/grid-align-content.html
+++ b/LayoutTests/fast/css-grid-layout/grid-align-content.html
@@ -10,7 +10,7 @@
}
.grid {
- -webkit-grid: 100px 100px / 50px 50px;
+ grid: 100px 100px / 50px 50px;
position: relative;
width: 200px;
height: 300px;
diff --git a/LayoutTests/fast/css-grid-layout/grid-align-justify-margin-border-padding-vertical-lr.html b/LayoutTests/fast/css-grid-layout/grid-align-justify-margin-border-padding-vertical-lr.html
index a4639e0..24b301f 100644
--- a/LayoutTests/fast/css-grid-layout/grid-align-justify-margin-border-padding-vertical-lr.html
+++ b/LayoutTests/fast/css-grid-layout/grid-align-justify-margin-border-padding-vertical-lr.html
@@ -11,8 +11,8 @@
}
.grid {
- -webkit-grid-template-columns: 100px 200px;
- -webkit-grid-template-rows: 200px 200px;
+ grid-template-columns: 100px 200px;
+ grid-template-rows: 200px 200px;
padding: 10px 15px 20px 30px;
border-width: 5px 10px 15px 20px;
border-style: dotted;
diff --git a/LayoutTests/fast/css-grid-layout/grid-align-justify-margin-border-padding-vertical-rl.html b/LayoutTests/fast/css-grid-layout/grid-align-justify-margin-border-padding-vertical-rl.html
index c10b442..c1d26e0 100644
--- a/LayoutTests/fast/css-grid-layout/grid-align-justify-margin-border-padding-vertical-rl.html
+++ b/LayoutTests/fast/css-grid-layout/grid-align-justify-margin-border-padding-vertical-rl.html
@@ -11,8 +11,8 @@
}
.grid {
- -webkit-grid-template-columns: 100px 200px;
- -webkit-grid-template-rows: 200px 200px;
+ grid-template-columns: 100px 200px;
+ grid-template-rows: 200px 200px;
padding: 10px 15px 20px 30px;
border-width: 5px 10px 15px 20px;
border-style: dotted;
diff --git a/LayoutTests/fast/css-grid-layout/grid-align-justify-margin-border-padding.html b/LayoutTests/fast/css-grid-layout/grid-align-justify-margin-border-padding.html
index 7d3d4c5..8a2b37f 100644
--- a/LayoutTests/fast/css-grid-layout/grid-align-justify-margin-border-padding.html
+++ b/LayoutTests/fast/css-grid-layout/grid-align-justify-margin-border-padding.html
@@ -11,8 +11,8 @@
}
.grid {
- -webkit-grid-template-columns: 100px 200px;
- -webkit-grid-template-rows: 200px 200px;
+ grid-template-columns: 100px 200px;
+ grid-template-rows: 200px 200px;
padding: 10px 15px 20px 30px;
border-width: 5px 10px 15px 20px;
border-style: dotted;
diff --git a/LayoutTests/fast/css-grid-layout/grid-align-justify-overflow.html b/LayoutTests/fast/css-grid-layout/grid-align-justify-overflow.html
index 99693ac..b09531e 100644
--- a/LayoutTests/fast/css-grid-layout/grid-align-justify-overflow.html
+++ b/LayoutTests/fast/css-grid-layout/grid-align-justify-overflow.html
@@ -10,8 +10,8 @@
margin: 0;
}
.grid {
- -webkit-grid-template-columns: 150px 150px;
- -webkit-grid-template-rows: 120px 120px 120px;
+ grid-template-columns: 150px 150px;
+ grid-template-rows: 120px 120px 120px;
margin-bottom: 20px;
}
.cellOverflowWidth {
@@ -28,8 +28,8 @@
}
.thirdRowFirstColumn {
background-color: green;
- -webkit-grid-column: 1;
- -webkit-grid-row: 3;
+ grid-column: 1;
+ grid-row: 3;
}
</style>
</head>
diff --git a/LayoutTests/fast/css-grid-layout/grid-align-justify-stretch.html b/LayoutTests/fast/css-grid-layout/grid-align-justify-stretch.html
index 6401321..3a1d661 100644
--- a/LayoutTests/fast/css-grid-layout/grid-align-justify-stretch.html
+++ b/LayoutTests/fast/css-grid-layout/grid-align-justify-stretch.html
@@ -11,8 +11,8 @@
}
.grid {
- -webkit-grid-template-columns: 100px 100px;
- -webkit-grid-template-rows: 200px 200px;
+ grid-template-columns: 100px 100px;
+ grid-template-rows: 200px 200px;
margin-bottom: 20px;
}
diff --git a/LayoutTests/fast/css-grid-layout/grid-align-stretching-replaced-items.html b/LayoutTests/fast/css-grid-layout/grid-align-stretching-replaced-items.html
index 5fd750b..274de17 100644
--- a/LayoutTests/fast/css-grid-layout/grid-align-stretching-replaced-items.html
+++ b/LayoutTests/fast/css-grid-layout/grid-align-stretching-replaced-items.html
@@ -4,8 +4,8 @@
<script src="../../resources/check-layout.js"></script>
<style>
.grid {
- -webkit-grid-template-columns: 500px;
- -webkit-grid-template-rows: 500px;
+ grid-template-columns: 500px;
+ grid-template-rows: 500px;
}
.fixedSizes {
width: 150px;
diff --git a/LayoutTests/fast/css-grid-layout/grid-align.html b/LayoutTests/fast/css-grid-layout/grid-align.html
index 7455136..b628063 100644
--- a/LayoutTests/fast/css-grid-layout/grid-align.html
+++ b/LayoutTests/fast/css-grid-layout/grid-align.html
@@ -11,8 +11,8 @@
}
.grid {
- -webkit-grid-template-columns: 100px 100px;
- -webkit-grid-template-rows: 200px 200px;
+ grid-template-columns: 100px 100px;
+ grid-template-rows: 200px 200px;
margin-bottom: 20px;
}
diff --git a/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html b/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html
index e48f636..3581559 100644
--- a/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html
+++ b/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html
@@ -4,25 +4,25 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-rows: 5px;
- -webkit-grid-template-columns: 10px;
+ grid-template-rows: 5px;
+ grid-template-columns: 10px;
}
.gridAutoFixedFixed {
- -webkit-grid-auto-rows: 30px;
- -webkit-grid-auto-columns: 50px;
+ grid-auto-rows: 30px;
+ grid-auto-columns: 50px;
}
.gridAutoMinMax {
font: 10/1 Ahem;
width: 1000px;
- -webkit-grid-auto-rows: minmax(10em, 15px);
- -webkit-grid-auto-columns: minmax(30%, 100px);
+ grid-auto-rows: minmax(10em, 15px);
+ grid-auto-columns: minmax(30%, 100px);
}
.gridAutoMinMaxContent {
- -webkit-grid-auto-rows: -webkit-min-content;
- -webkit-grid-auto-columns: -webkit-max-content;
+ grid-auto-rows: -webkit-min-content;
+ grid-auto-columns: -webkit-max-content;
}
</style>
</head>
diff --git a/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set-expected.txt b/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set-expected.txt
index 2736cb3..5fd67fd 100644
--- a/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set-expected.txt
@@ -3,65 +3,65 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-Test getting -webkit-grid-auto-columns and -webkit-grid-auto-rows set through CSS
-PASS window.getComputedStyle(gridAutoFixedFixed, '').getPropertyValue('-webkit-grid-auto-rows') is "30px"
-PASS window.getComputedStyle(gridAutoFixedFixed, '').getPropertyValue('-webkit-grid-auto-columns') is "50px"
-PASS window.getComputedStyle(gridAutoMinMax, '').getPropertyValue('-webkit-grid-auto-rows') is "minmax(10%, 15px)"
-PASS window.getComputedStyle(gridAutoMinMax, '').getPropertyValue('-webkit-grid-auto-columns') is "minmax(30%, 100px)"
-PASS window.getComputedStyle(gridAutoMinMaxContent, '').getPropertyValue('-webkit-grid-auto-rows') is "-webkit-min-content"
-PASS window.getComputedStyle(gridAutoMinMaxContent, '').getPropertyValue('-webkit-grid-auto-columns') is "-webkit-max-content"
-PASS window.getComputedStyle(gridAutoAutoInMinMax, '').getPropertyValue('-webkit-grid-auto-rows') is "minmax(auto, 48px)"
-PASS window.getComputedStyle(gridAutoAutoInMinMax, '').getPropertyValue('-webkit-grid-auto-columns') is "minmax(80px, auto)"
+Test getting grid-auto-columns and grid-auto-rows set through CSS
+PASS window.getComputedStyle(gridAutoFixedFixed, '').getPropertyValue('grid-auto-rows') is "30px"
+PASS window.getComputedStyle(gridAutoFixedFixed, '').getPropertyValue('grid-auto-columns') is "50px"
+PASS window.getComputedStyle(gridAutoMinMax, '').getPropertyValue('grid-auto-rows') is "minmax(10%, 15px)"
+PASS window.getComputedStyle(gridAutoMinMax, '').getPropertyValue('grid-auto-columns') is "minmax(30%, 100px)"
+PASS window.getComputedStyle(gridAutoMinMaxContent, '').getPropertyValue('grid-auto-rows') is "-webkit-min-content"
+PASS window.getComputedStyle(gridAutoMinMaxContent, '').getPropertyValue('grid-auto-columns') is "-webkit-max-content"
+PASS window.getComputedStyle(gridAutoAutoInMinMax, '').getPropertyValue('grid-auto-rows') is "minmax(auto, 48px)"
+PASS window.getComputedStyle(gridAutoAutoInMinMax, '').getPropertyValue('grid-auto-columns') is "minmax(80px, auto)"
Test that getting grid-template-columns and grid-template-rows set through CSS lists every track listed whether implicitly or explicitly created
-PASS window.getComputedStyle(gridAutoFixedFixedWithChildren, '').getPropertyValue('-webkit-grid-auto-rows') is "30px"
-PASS window.getComputedStyle(gridAutoFixedFixedWithChildren, '').getPropertyValue('-webkit-grid-auto-columns') is "50px"
-PASS window.getComputedStyle(gridAutoFixedFixedWithChildren, '').getPropertyValue('-webkit-grid-template-columns') is "50px"
-PASS window.getComputedStyle(gridAutoFixedFixedWithChildren, '').getPropertyValue('-webkit-grid-template-rows') is "30px"
-PASS window.getComputedStyle(gridAutoFixedFixedWithFixedFixedWithChildren, '').getPropertyValue('-webkit-grid-auto-rows') is "30px"
-PASS window.getComputedStyle(gridAutoFixedFixedWithFixedFixedWithChildren, '').getPropertyValue('-webkit-grid-auto-columns') is "40px"
-PASS window.getComputedStyle(gridAutoFixedFixedWithFixedFixedWithChildren, '').getPropertyValue('-webkit-grid-template-columns') is "20px 40px 40px"
-PASS window.getComputedStyle(gridAutoFixedFixedWithFixedFixedWithChildren, '').getPropertyValue('-webkit-grid-template-rows') is "15px 30px 30px"
+PASS window.getComputedStyle(gridAutoFixedFixedWithChildren, '').getPropertyValue('grid-auto-rows') is "30px"
+PASS window.getComputedStyle(gridAutoFixedFixedWithChildren, '').getPropertyValue('grid-auto-columns') is "50px"
+PASS window.getComputedStyle(gridAutoFixedFixedWithChildren, '').getPropertyValue('grid-template-columns') is "50px"
+PASS window.getComputedStyle(gridAutoFixedFixedWithChildren, '').getPropertyValue('grid-template-rows') is "30px"
+PASS window.getComputedStyle(gridAutoFixedFixedWithFixedFixedWithChildren, '').getPropertyValue('grid-auto-rows') is "30px"
+PASS window.getComputedStyle(gridAutoFixedFixedWithFixedFixedWithChildren, '').getPropertyValue('grid-auto-columns') is "40px"
+PASS window.getComputedStyle(gridAutoFixedFixedWithFixedFixedWithChildren, '').getPropertyValue('grid-template-columns') is "20px 40px 40px"
+PASS window.getComputedStyle(gridAutoFixedFixedWithFixedFixedWithChildren, '').getPropertyValue('grid-template-rows') is "15px 30px 30px"
Test that grid-template-* definitions are not affected by grid-auto-* definitions
-PASS window.getComputedStyle(gridAutoFixedFixed, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridAutoFixedFixed, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridAutoMinMax, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridAutoMinMax, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridAutoMinMaxContent, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridAutoMinMaxContent, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(gridAutoFixedFixed, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridAutoFixedFixed, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridAutoMinMax, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridAutoMinMax, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridAutoMinMaxContent, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridAutoMinMaxContent, '').getPropertyValue('grid-template-rows') is "none"
Test the initial value
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns') is 'auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is 'auto'
-Test getting and setting -webkit-grid-auto-columns and -webkit-grid-auto-rows through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns') is '180px'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows') is '660px'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns') is 'minmax(-webkit-min-content, 48px)'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows') is 'minmax(80px, -webkit-min-content)'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns') is 'minmax(-webkit-min-content, -webkit-max-content)'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows') is 'minmax(-webkit-max-content, -webkit-min-content)'
+Test getting and setting grid-auto-columns and grid-auto-rows through JS
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is '180px'
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is '660px'
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is 'minmax(-webkit-min-content, 48px)'
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is 'minmax(80px, -webkit-min-content)'
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is 'minmax(-webkit-min-content, -webkit-max-content)'
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is 'minmax(-webkit-max-content, -webkit-min-content)'
Test setting grid-auto-columns and grid-auto-rows to bad minmax value through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns') is 'auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows') is 'auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns') is 'auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows') is 'auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns') is 'auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows') is 'auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns') is 'auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is 'auto'
Test setting grid-auto-columns and grid-auto-rows to 'inherit' through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns') is '50px'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows') is '101%'
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is '50px'
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is '101%'
Test setting grid-auto-columns and grid-auto-rows to 'initial' through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns') is '150%'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows') is '1fr'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns') is 'auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is '150%'
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is '1fr'
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is 'auto'
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html b/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html
index 73ba0a9..559b115 100644
--- a/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html
@@ -4,31 +4,31 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.gridAutoFixedFixed {
- -webkit-grid-auto-rows: 30px;
- -webkit-grid-auto-columns: 50px;
+ grid-auto-rows: 30px;
+ grid-auto-columns: 50px;
}
.gridAutoMinMax {
- -webkit-grid-auto-rows: minmax(10%, 15px);
- -webkit-grid-auto-columns: minmax(30%, 100px);
+ grid-auto-rows: minmax(10%, 15px);
+ grid-auto-columns: minmax(30%, 100px);
}
.gridAutoMinMaxContent {
- -webkit-grid-auto-rows: -webkit-min-content;
- -webkit-grid-auto-columns: -webkit-max-content;
+ grid-auto-rows: -webkit-min-content;
+ grid-auto-columns: -webkit-max-content;
}
.gridAutoFixedFixedWithFixedFixed {
- -webkit-grid-auto-rows: 30px;
- -webkit-grid-auto-columns: 40px;
- -webkit-grid-template-rows: 15px;
- -webkit-grid-template-columns: 20px;
+ grid-auto-rows: 30px;
+ grid-auto-columns: 40px;
+ grid-template-rows: 15px;
+ grid-template-columns: 20px;
}
.gridAutoAutoInMinMax {
- -webkit-grid-auto-rows: minmax(auto, 8vh);
- -webkit-grid-auto-columns: minmax(10vw, auto);
+ grid-auto-rows: minmax(auto, 8vh);
+ grid-auto-columns: minmax(10vw, auto);
}
</style>
@@ -50,7 +50,7 @@
<script>
description('Test that setting and getting grid-auto-columns and grid-auto-rows works as expected');
-debug("Test getting -webkit-grid-auto-columns and -webkit-grid-auto-rows set through CSS");
+debug("Test getting grid-auto-columns and grid-auto-rows set through CSS");
testGridAutoDefinitionsValues(document.getElementById("gridAutoFixedFixed"), "30px", "50px");
testGridAutoDefinitionsValues(document.getElementById("gridAutoMinMax"), "minmax(10%, 15px)", "minmax(30%, 100px)");
testGridAutoDefinitionsValues(document.getElementById("gridAutoMinMaxContent"), "-webkit-min-content", "-webkit-max-content");
@@ -73,81 +73,81 @@
debug("Test the initial value");
var element = document.createElement("div");
document.body.appendChild(element);
-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns')", "'auto'");
-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows')", "'auto'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-auto-columns')", "'auto'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-auto-rows')", "'auto'");
debug("");
-debug("Test getting and setting -webkit-grid-auto-columns and -webkit-grid-auto-rows through JS");
+debug("Test getting and setting grid-auto-columns and grid-auto-rows through JS");
element.style.font = "10px Ahem";
-element.style.webkitGridAutoColumns = "18em";
-element.style.webkitGridAutoRows = "66em";
-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns')", "'180px'");
-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows')", "'660px'");
+element.style.gridAutoColumns = "18em";
+element.style.gridAutoRows = "66em";
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-auto-columns')", "'180px'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-auto-rows')", "'660px'");
element = document.createElement("div");
document.body.appendChild(element);
-element.style.webkitGridAutoColumns = "minmax(-webkit-min-content, 8vh)";
-element.style.webkitGridAutoRows = "minmax(10vw, -webkit-min-content)";
-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns')", "'minmax(-webkit-min-content, 48px)'");
-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows')", "'minmax(80px, -webkit-min-content)'");
+element.style.gridAutoColumns = "minmax(-webkit-min-content, 8vh)";
+element.style.gridAutoRows = "minmax(10vw, -webkit-min-content)";
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-auto-columns')", "'minmax(-webkit-min-content, 48px)'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-auto-rows')", "'minmax(80px, -webkit-min-content)'");
element = document.createElement("div");
document.body.appendChild(element);
-element.style.webkitGridAutoColumns = "minmax(-webkit-min-content, -webkit-max-content)";
-element.style.webkitGridAutoRows = "minmax(-webkit-max-content, -webkit-min-content)";
-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns')", "'minmax(-webkit-min-content, -webkit-max-content)'");
-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows')", "'minmax(-webkit-max-content, -webkit-min-content)'");
+element.style.gridAutoColumns = "minmax(-webkit-min-content, -webkit-max-content)";
+element.style.gridAutoRows = "minmax(-webkit-max-content, -webkit-min-content)";
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-auto-columns')", "'minmax(-webkit-min-content, -webkit-max-content)'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-auto-rows')", "'minmax(-webkit-max-content, -webkit-min-content)'");
debug("");
debug("Test setting grid-auto-columns and grid-auto-rows to bad minmax value through JS");
element = document.createElement("div");
document.body.appendChild(element);
// No comma.
-element.style.webkitGridAutoColumns = "minmax(10px 20px)";
+element.style.gridAutoColumns = "minmax(10px 20px)";
// Only 1 argument provided.
-element.style.webkitGridAutoRows = "minmax(10px)";
-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns')", "'auto'");
-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows')", "'auto'");
+element.style.gridAutoRows = "minmax(10px)";
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-auto-columns')", "'auto'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-auto-rows')", "'auto'");
element = document.createElement("div");
document.body.appendChild(element);
// Nested minmax.
-element.style.webkitGridAutoColumns = "minmax(minmax(10px, 20px), 20px)";
+element.style.gridAutoColumns = "minmax(minmax(10px, 20px), 20px)";
// Only 2 arguments are allowed.
-element.style.webkitGridAutoRows = "minmax(10px, 20px, 30px)";
-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns')", "'auto'");
-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows')", "'auto'");
+element.style.gridAutoRows = "minmax(10px, 20px, 30px)";
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-auto-columns')", "'auto'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-auto-rows')", "'auto'");
element = document.createElement("div");
document.body.appendChild(element);
// No breadth value.
-element.style.webkitGridAutoColumns = "minmax()";
+element.style.gridAutoColumns = "minmax()";
// No comma.
-element.style.webkitGridAutoRows = "minmax(30px 30% 30em)";
-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns')", "'auto'");
-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows')", "'auto'");
+element.style.gridAutoRows = "minmax(30px 30% 30em)";
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-auto-columns')", "'auto'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-auto-rows')", "'auto'");
element = document.createElement("div");
document.body.appendChild(element);
// None is not allowed for grid-auto-{rows|columns}.
-element.style.webkitGridAutoColumns = "none";
-element.style.webkitGridAutoRows = "none";
-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns')", "'auto'");
-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows')", "'auto'");
+element.style.gridAutoColumns = "none";
+element.style.gridAutoRows = "none";
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-auto-columns')", "'auto'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-auto-rows')", "'auto'");
function testInherit()
{
var parentElement = document.createElement("div");
document.body.appendChild(parentElement);
- parentElement.style.webkitGridAutoColumns = "50px";
- parentElement.style.webkitGridAutoRows = "101%";
+ parentElement.style.gridAutoColumns = "50px";
+ parentElement.style.gridAutoRows = "101%";
element = document.createElement("div");
parentElement.appendChild(element);
- element.style.webkitGridAutoColumns = "inherit";
- element.style.webkitGridAutoRows = "inherit";
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns')", "'50px'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows')", "'101%'");
+ element.style.gridAutoColumns = "inherit";
+ element.style.gridAutoRows = "inherit";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-auto-columns')", "'50px'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-auto-rows')", "'101%'");
document.body.removeChild(parentElement);
}
@@ -159,15 +159,15 @@
{
element = document.createElement("div");
document.body.appendChild(element);
- element.style.webkitGridAutoColumns = "150%";
- element.style.webkitGridAutoRows = "1fr";
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns')", "'150%'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows')", "'1fr'");
+ element.style.gridAutoColumns = "150%";
+ element.style.gridAutoRows = "1fr";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-auto-columns')", "'150%'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-auto-rows')", "'1fr'");
- element.style.webkitGridAutoColumns = "initial";
- element.style.webkitGridAutoRows = "initial";
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns')", "'auto'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows')", "'auto'");
+ element.style.gridAutoColumns = "initial";
+ element.style.gridAutoRows = "initial";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-auto-columns')", "'auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-auto-rows')", "'auto'");
document.body.removeChild(element);
}
diff --git a/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-resolution.html b/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-resolution.html
index a5c6122..1167940 100644
--- a/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-resolution.html
+++ b/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-resolution.html
@@ -4,25 +4,25 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-rows: 20px;
- -webkit-grid-template-columns: 10px;
+ grid-template-rows: 20px;
+ grid-template-columns: 10px;
}
.gridAutoFixedFixed {
- -webkit-grid-auto-rows: 30px;
- -webkit-grid-auto-columns: 50px;
+ grid-auto-rows: 30px;
+ grid-auto-columns: 50px;
}
.gridAutoMinMax {
width: 1000px;
height: 1000px;
- -webkit-grid-auto-rows: minmax(10%, 15px);
- -webkit-grid-auto-columns: minmax(30%, 100px);
+ grid-auto-rows: minmax(10%, 15px);
+ grid-auto-columns: minmax(30%, 100px);
}
.gridAutoMinMaxContent {
- -webkit-grid-auto-rows: -webkit-min-content;
- -webkit-grid-auto-columns: -webkit-max-content;
+ grid-auto-rows: -webkit-min-content;
+ grid-auto-columns: -webkit-max-content;
}
</style>
</head>
diff --git a/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-update.html b/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-update.html
index 055e19e..5d84f87 100644
--- a/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-update.html
+++ b/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-update.html
@@ -5,10 +5,10 @@
<link href="resources/grid-alignment.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-rows: 20px;
- -webkit-grid-template-columns: 10px;
- -webkit-grid-auto-rows: 30px;
- -webkit-grid-auto-columns: 50px;
+ grid-template-rows: 20px;
+ grid-template-columns: 10px;
+ grid-auto-rows: 30px;
+ grid-auto-columns: 50px;
font: 10px/1 Ahem;
}
</style>
@@ -18,8 +18,8 @@
function updateAndCheck(gridElementID, defaultSizing, gridItemSize)
{
var gridElement = document.getElementById(gridElementID);
- gridElement.style.webkitGridAutoRows = defaultSizing.rows;
- gridElement.style.webkitGridAutoColumns = defaultSizing.columns;
+ gridElement.style.gridAutoRows = defaultSizing.rows;
+ gridElement.style.gridAutoColumns = defaultSizing.columns;
var gridItem = gridElement.firstChild.nextSibling;
gridItem.setAttribute("data-expected-width", gridItemSize.width);
diff --git a/LayoutTests/fast/css-grid-layout/grid-auto-flow-get-set-expected.txt b/LayoutTests/fast/css-grid-layout/grid-auto-flow-get-set-expected.txt
index 49c0cbd..17bdd60 100644
--- a/LayoutTests/fast/css-grid-layout/grid-auto-flow-get-set-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/grid-auto-flow-get-set-expected.txt
@@ -1,58 +1,58 @@
-Test that setting and getting -webkit-grid-auto-flow works as expected
+Test that setting and getting grid-auto-flow works as expected
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-Test getting -webkit-grid-auto-flow set through CSS
-PASS window.getComputedStyle(gridAutoFlowColumnSparse, '').getPropertyValue('-webkit-grid-auto-flow') is 'column'
-PASS window.getComputedStyle(gridAutoFlowRowSparse, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
-PASS window.getComputedStyle(gridAutoFlowDense, '').getPropertyValue('-webkit-grid-auto-flow') is 'row dense'
-PASS window.getComputedStyle(gridAutoFlowColumnDense, '').getPropertyValue('-webkit-grid-auto-flow') is 'column dense'
-PASS window.getComputedStyle(gridAutoFlowRowDense, '').getPropertyValue('-webkit-grid-auto-flow') is 'row dense'
-PASS window.getComputedStyle(gridAutoFlowDenseColumn, '').getPropertyValue('-webkit-grid-auto-flow') is 'column dense'
-PASS window.getComputedStyle(gridAutoFlowDenseRow, '').getPropertyValue('-webkit-grid-auto-flow') is 'row dense'
-PASS window.getComputedStyle(gridAutoFlowInherit, '').getPropertyValue('-webkit-grid-auto-flow') is 'column'
-PASS window.getComputedStyle(gridAutoFlowNoInherit, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
+Test getting grid-auto-flow set through CSS
+PASS window.getComputedStyle(gridAutoFlowColumnSparse, '').getPropertyValue('grid-auto-flow') is 'column'
+PASS window.getComputedStyle(gridAutoFlowRowSparse, '').getPropertyValue('grid-auto-flow') is 'row'
+PASS window.getComputedStyle(gridAutoFlowDense, '').getPropertyValue('grid-auto-flow') is 'row dense'
+PASS window.getComputedStyle(gridAutoFlowColumnDense, '').getPropertyValue('grid-auto-flow') is 'column dense'
+PASS window.getComputedStyle(gridAutoFlowRowDense, '').getPropertyValue('grid-auto-flow') is 'row dense'
+PASS window.getComputedStyle(gridAutoFlowDenseColumn, '').getPropertyValue('grid-auto-flow') is 'column dense'
+PASS window.getComputedStyle(gridAutoFlowDenseRow, '').getPropertyValue('grid-auto-flow') is 'row dense'
+PASS window.getComputedStyle(gridAutoFlowInherit, '').getPropertyValue('grid-auto-flow') is 'column'
+PASS window.getComputedStyle(gridAutoFlowNoInherit, '').getPropertyValue('grid-auto-flow') is 'row'
-Test getting -webkit-grid-auto-flow bad values set through CSS
-PASS window.getComputedStyle(gridAutoFlowNone, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
-PASS window.getComputedStyle(gridAutoFlowColumns, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
-PASS window.getComputedStyle(gridAutoFlowRows, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
-PASS window.getComputedStyle(gridAutoFlowColumnFoo, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
-PASS window.getComputedStyle(gridAutoFlowColumnColumn, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
-PASS window.getComputedStyle(gridAutoFlowDenseRowRow, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
+Test getting grid-auto-flow bad values set through CSS
+PASS window.getComputedStyle(gridAutoFlowNone, '').getPropertyValue('grid-auto-flow') is 'row'
+PASS window.getComputedStyle(gridAutoFlowColumns, '').getPropertyValue('grid-auto-flow') is 'row'
+PASS window.getComputedStyle(gridAutoFlowRows, '').getPropertyValue('grid-auto-flow') is 'row'
+PASS window.getComputedStyle(gridAutoFlowColumnFoo, '').getPropertyValue('grid-auto-flow') is 'row'
+PASS window.getComputedStyle(gridAutoFlowColumnColumn, '').getPropertyValue('grid-auto-flow') is 'row'
+PASS window.getComputedStyle(gridAutoFlowDenseRowRow, '').getPropertyValue('grid-auto-flow') is 'row'
Test the initial value
-PASS element.style.webkitGridAutoFlow is ''
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
+PASS element.style.gridAutoFlow is ''
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is 'row'
-Test getting and setting -webkit-grid-auto-flow through JS
-PASS element.style.webkitGridAutoFlow is 'column'
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'column'
-PASS element.style.webkitGridAutoFlow is 'column dense'
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'column dense'
-PASS element.style.webkitGridAutoFlow is 'row dense'
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row dense'
-PASS element.style.webkitGridAutoFlow is 'row dense'
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row dense'
-PASS element.style.webkitGridAutoFlow is 'column dense'
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'column dense'
-PASS element.style.webkitGridAutoFlow is 'row dense'
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row dense'
-PASS element.style.webkitGridAutoFlow is 'row'
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
+Test getting and setting grid-auto-flow through JS
+PASS element.style.gridAutoFlow is 'column'
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is 'column'
+PASS element.style.gridAutoFlow is 'column dense'
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is 'column dense'
+PASS element.style.gridAutoFlow is 'row dense'
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is 'row dense'
+PASS element.style.gridAutoFlow is 'row dense'
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is 'row dense'
+PASS element.style.gridAutoFlow is 'column dense'
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is 'column dense'
+PASS element.style.gridAutoFlow is 'row dense'
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is 'row dense'
+PASS element.style.gridAutoFlow is 'row'
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is 'row'
-Test getting and setting bad values for -webkit-grid-auto-flow through JS
-PASS element.style.webkitGridAutoFlow is ''
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
-PASS element.style.webkitGridAutoFlow is ''
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
-PASS element.style.webkitGridAutoFlow is ''
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
+Test getting and setting bad values for grid-auto-flow through JS
+PASS element.style.gridAutoFlow is ''
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is 'row'
+PASS element.style.gridAutoFlow is ''
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is 'row'
+PASS element.style.gridAutoFlow is ''
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is 'row'
-Test setting -webkit-grid-auto-flow to 'initial' through JS
-PASS element.style.webkitGridAutoFlow is 'initial'
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
+Test setting grid-auto-flow to 'initial' through JS
+PASS element.style.gridAutoFlow is 'initial'
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is 'row'
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/grid-auto-flow-get-set.html b/LayoutTests/fast/css-grid-layout/grid-auto-flow-get-set.html
index 9355d0c..cb02484 100644
--- a/LayoutTests/fast/css-grid-layout/grid-auto-flow-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/grid-auto-flow-get-set.html
@@ -4,41 +4,41 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.gridAutoFlowDense {
- -webkit-grid-auto-flow: dense;
+ grid-auto-flow: dense;
}
.gridAutoFlowColumnDense {
- -webkit-grid-auto-flow: column dense;
+ grid-auto-flow: column dense;
}
.gridAutoFlowRowDense {
- -webkit-grid-auto-flow: row dense;
+ grid-auto-flow: row dense;
}
.gridAutoFlowDenseColumn {
- -webkit-grid-auto-flow: dense column;
+ grid-auto-flow: dense column;
}
.gridAutoFlowDenseRow {
- -webkit-grid-auto-flow: dense row;
+ grid-auto-flow: dense row;
}
.gridAutoFlowInherit {
- -webkit-grid-auto-flow: inherit;
+ grid-auto-flow: inherit;
}
/* Bad values. */
.gridAutoFlowNone {
- -webkit-grid-auto-flow: none;
+ grid-auto-flow: none;
}
.gridAutoFlowRows {
- -webkit-grid-auto-flow: rows;
+ grid-auto-flow: rows;
}
.gridAutoFlowColumns {
- -webkit-grid-auto-flow: columns;
+ grid-auto-flow: columns;
}
.gridAutoFlowColumnFoo {
- -webkit-grid-auto-flow: column foo;
+ grid-auto-flow: column foo;
}
.gridAutoFlowColumnColumn {
- -webkit-grid-auto-flow: column column;
+ grid-auto-flow: column column;
}
.gridAutoFlowDenseRowRow {
- -webkit-grid-auto-flow: dense row row;
+ grid-auto-flow: dense row row;
}
</style>
<script src="../../resources/js-test-pre.js"></script>
@@ -66,9 +66,9 @@
<div class="grid gridAutoFlowDenseRowRow" id="gridAutoFlowDenseRowRow"></div>
<script src="resources/grid-definitions-parsing-utils.js"></script>
<script>
- description('Test that setting and getting -webkit-grid-auto-flow works as expected');
+ description('Test that setting and getting grid-auto-flow works as expected');
- debug("Test getting -webkit-grid-auto-flow set through CSS");
+ debug("Test getting grid-auto-flow set through CSS");
checkGridAutoFlowSetCSSValue("gridAutoFlowColumnSparse", "column");
checkGridAutoFlowSetCSSValue("gridAutoFlowRowSparse", "row");
checkGridAutoFlowSetCSSValue("gridAutoFlowDense", "row dense");
@@ -80,7 +80,7 @@
checkGridAutoFlowSetCSSValue("gridAutoFlowNoInherit", "row");
debug("");
- debug("Test getting -webkit-grid-auto-flow bad values set through CSS");
+ debug("Test getting grid-auto-flow bad values set through CSS");
checkGridAutoFlowSetCSSValue("gridAutoFlowNone", "row");
checkGridAutoFlowSetCSSValue("gridAutoFlowColumns", "row");
checkGridAutoFlowSetCSSValue("gridAutoFlowRows", "row");
@@ -93,7 +93,7 @@
checkGridAutoFlowSetJSValue("", "", "row");
debug("");
- debug("Test getting and setting -webkit-grid-auto-flow through JS");
+ debug("Test getting and setting grid-auto-flow through JS");
checkGridAutoFlowSetJSValue("column", "column", "column");
checkGridAutoFlowSetJSValue("column dense", "column dense", "column dense");
checkGridAutoFlowSetJSValue("dense", "row dense", "row dense");
@@ -103,13 +103,13 @@
checkGridAutoFlowSetJSValue("row", "row", "row");
debug("");
- debug("Test getting and setting bad values for -webkit-grid-auto-flow through JS");
+ debug("Test getting and setting bad values for grid-auto-flow through JS");
checkGridAutoFlowSetJSValue("noone", "", "row");
checkGridAutoFlowSetJSValue("column column", "", "row");
checkGridAutoFlowSetJSValue("dense row row", "", "row");
debug("");
- debug("Test setting -webkit-grid-auto-flow to 'initial' through JS");
+ debug("Test setting grid-auto-flow to 'initial' through JS");
// Reusing the value so that we can check that it is set back to its initial value.
checkGridAutoFlowSetJSValue("initial", "initial", "row");
</script>
diff --git a/LayoutTests/fast/css-grid-layout/grid-auto-flow-resolution.html b/LayoutTests/fast/css-grid-layout/grid-auto-flow-resolution.html
index 9f76c4f..4aa31dd 100644
--- a/LayoutTests/fast/css-grid-layout/grid-auto-flow-resolution.html
+++ b/LayoutTests/fast/css-grid-layout/grid-auto-flow-resolution.html
@@ -4,33 +4,33 @@
<link href="resources/grid-alignment.css" rel="stylesheet">
<style>
.smallGrid {
- -webkit-grid-template-columns: 50px 100px;
- -webkit-grid-template-rows: 50px 100px;
+ grid-template-columns: 50px 100px;
+ grid-template-rows: 50px 100px;
}
.bigGrid {
- -webkit-grid-template-columns: 50px 100px 150px 200px;
- -webkit-grid-template-rows: 50px 100px 150px 200px;
+ grid-template-columns: 50px 100px 150px 200px;
+ grid-template-rows: 50px 100px 150px 200px;
}
.overflowingRowFirstColumn {
- -webkit-grid-row: auto / 10;
- -webkit-grid-column: 1;
+ grid-row: auto / 10;
+ grid-column: 1;
}
.secondRowOverflowingColumn {
- -webkit-grid-row: 2;
- -webkit-grid-column: auto / 8;
+ grid-row: 2;
+ grid-column: auto / 8;
}
.negativeOverflowingRowFirstColumn {
- -webkit-grid-row: auto / -10;
- -webkit-grid-column: 1;
+ grid-row: auto / -10;
+ grid-column: 1;
}
.secondRowNegativeOverflowingColumn {
- -webkit-grid-row: 2;
- -webkit-grid-column: auto / -8;
+ grid-row: 2;
+ grid-column: auto / -8;
}
.unconstrainedContainer {
diff --git a/LayoutTests/fast/css-grid-layout/grid-auto-flow-sparse.html b/LayoutTests/fast/css-grid-layout/grid-auto-flow-sparse.html
index dbba0c8..dea7643 100644
--- a/LayoutTests/fast/css-grid-layout/grid-auto-flow-sparse.html
+++ b/LayoutTests/fast/css-grid-layout/grid-auto-flow-sparse.html
@@ -3,8 +3,8 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-columns: 50px 100px 150px 200px;
- -webkit-grid-template-rows: 50px 100px 150px 200px;
+ grid-template-columns: 50px 100px 150px 200px;
+ grid-template-rows: 50px 100px 150px 200px;
}
.unconstrainedContainer {
diff --git a/LayoutTests/fast/css-grid-layout/grid-auto-flow-update.html b/LayoutTests/fast/css-grid-layout/grid-auto-flow-update.html
index b453eb4..8aab95c 100644
--- a/LayoutTests/fast/css-grid-layout/grid-auto-flow-update.html
+++ b/LayoutTests/fast/css-grid-layout/grid-auto-flow-update.html
@@ -4,15 +4,15 @@
<script src="../../resources/check-layout.js"></script>
<style>
.grid {
- -webkit-grid-template-columns: 50px 100px;
- -webkit-grid-template-rows: 50px 100px;
+ grid-template-columns: 50px 100px;
+ grid-template-rows: 50px 100px;
}
</style>
<script>
function testGrid(flow, positionAndSize)
{
var gridElement = document.getElementsByClassName("grid")[0];
- gridElement.style.webkitGridAutoFlow = flow;
+ gridElement.style.gridAutoFlow = flow;
var gridItem = document.getElementById("autoItem");
gridItem.setAttribute("data-offset-x", positionAndSize.offsetX);
gridItem.setAttribute("data-offset-y", positionAndSize.offsetY);
diff --git a/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-columns-expected.txt b/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-columns-expected.txt
index 5bab828..f115277 100644
--- a/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-columns-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-columns-expected.txt
@@ -1,40 +1,40 @@
Check that min-width is honored when sizing auto columns.
-PASS window.getComputedStyle(gridAuto, '').getPropertyValue('-webkit-grid-template-columns') is "40px"
-PASS window.getComputedStyle(gridAutoItemSmallerThanMinSize, '').getPropertyValue('-webkit-grid-template-columns') is "40px"
-PASS window.getComputedStyle(gridMinMaxAutoAuto, '').getPropertyValue('-webkit-grid-template-columns') is "40px"
-PASS window.getComputedStyle(gridMinMaxAutoMaxContent, '').getPropertyValue('-webkit-grid-template-columns') is "40px"
-PASS window.getComputedStyle(gridMinMaxMinContentAuto, '').getPropertyValue('-webkit-grid-template-columns') is "40px"
-PASS window.getComputedStyle(gridAutoMultipleItems, '').getPropertyValue('-webkit-grid-template-columns') is "30px"
-PASS window.getComputedStyle(gridMinMaxAutoAutoMultipleItemsOneWithoutMinWidth, '').getPropertyValue('-webkit-grid-template-columns') is "60px"
-PASS window.getComputedStyle(gridMinMaxAutoMaxContentMultipleItemsOneWithAutoMinWidth, '').getPropertyValue('-webkit-grid-template-columns') is "80px"
-PASS window.getComputedStyle(gridAutoAndAutoFixedWidthChildren, '').getPropertyValue('-webkit-grid-template-columns') is "200px 50px"
+PASS window.getComputedStyle(gridAuto, '').getPropertyValue('grid-template-columns') is "40px"
+PASS window.getComputedStyle(gridAutoItemSmallerThanMinSize, '').getPropertyValue('grid-template-columns') is "40px"
+PASS window.getComputedStyle(gridMinMaxAutoAuto, '').getPropertyValue('grid-template-columns') is "40px"
+PASS window.getComputedStyle(gridMinMaxAutoMaxContent, '').getPropertyValue('grid-template-columns') is "40px"
+PASS window.getComputedStyle(gridMinMaxMinContentAuto, '').getPropertyValue('grid-template-columns') is "40px"
+PASS window.getComputedStyle(gridAutoMultipleItems, '').getPropertyValue('grid-template-columns') is "30px"
+PASS window.getComputedStyle(gridMinMaxAutoAutoMultipleItemsOneWithoutMinWidth, '').getPropertyValue('grid-template-columns') is "60px"
+PASS window.getComputedStyle(gridMinMaxAutoMaxContentMultipleItemsOneWithAutoMinWidth, '').getPropertyValue('grid-template-columns') is "80px"
+PASS window.getComputedStyle(gridAutoAndAutoFixedWidthChildren, '').getPropertyValue('grid-template-columns') is "200px 50px"
Check that min-width is honored when sizing auto columns and spanning grid items.
-PASS window.getComputedStyle(gridAutoAndAutoOneSpanningOneNonSpannig, '').getPropertyValue('-webkit-grid-template-columns') is "35px 15px"
-PASS window.getComputedStyle(gridAutoAndAutoOneSpanningMultipleNonSpanning, '').getPropertyValue('-webkit-grid-template-columns') is "20px 40px"
-PASS window.getComputedStyle(gridAutoAndMinMaxAutoAutoOneSpanningOneNonSpanning, '').getPropertyValue('-webkit-grid-template-columns') is "20px 50px"
-PASS window.getComputedStyle(gridAutoAndMinMaxAutoAutoMultipleSpanning, '').getPropertyValue('-webkit-grid-template-columns') is "35px 35px"
-PASS window.getComputedStyle(gridMinMaxAutoMaxContentAndAutoOneSpanningMultipleNonSpanning, '').getPropertyValue('-webkit-grid-template-columns') is "25px 65px"
-PASS window.getComputedStyle(gridMinMaxAutoMaxContentAndAutoMultipleSpanningMultipleNonSpanning, '').getPropertyValue('-webkit-grid-template-columns') is "40px 50px"
+PASS window.getComputedStyle(gridAutoAndAutoOneSpanningOneNonSpannig, '').getPropertyValue('grid-template-columns') is "35px 15px"
+PASS window.getComputedStyle(gridAutoAndAutoOneSpanningMultipleNonSpanning, '').getPropertyValue('grid-template-columns') is "20px 40px"
+PASS window.getComputedStyle(gridAutoAndMinMaxAutoAutoOneSpanningOneNonSpanning, '').getPropertyValue('grid-template-columns') is "20px 50px"
+PASS window.getComputedStyle(gridAutoAndMinMaxAutoAutoMultipleSpanning, '').getPropertyValue('grid-template-columns') is "35px 35px"
+PASS window.getComputedStyle(gridMinMaxAutoMaxContentAndAutoOneSpanningMultipleNonSpanning, '').getPropertyValue('grid-template-columns') is "25px 65px"
+PASS window.getComputedStyle(gridMinMaxAutoMaxContentAndAutoMultipleSpanningMultipleNonSpanning, '').getPropertyValue('grid-template-columns') is "40px 50px"
Check the interactions between width and min-width and auto tracks.
-PASS window.getComputedStyle(gridAutoWithFixedWidthChild, '').getPropertyValue('-webkit-grid-template-columns') is "60px"
-PASS window.getComputedStyle(gridAutoWithFixedWidthChildAndMinWidth, '').getPropertyValue('-webkit-grid-template-columns') is "60px"
-PASS window.getComputedStyle(gridAutoWithFixedWidthChildAndHigherMinWidth, '').getPropertyValue('-webkit-grid-template-columns') is "90px"
-PASS window.getComputedStyle(gridAutoAndAutoOneSpanningFixedWidth, '').getPropertyValue('-webkit-grid-template-columns') is "25px 25px"
-PASS window.getComputedStyle(gridAutoAndAutoOneSpanningFixedWidthAndMinWidth, '').getPropertyValue('-webkit-grid-template-columns') is "30px 30px"
-PASS window.getComputedStyle(gridAutoAndAutoOneSpanningFixedWidthAndHigherMinWidth, '').getPropertyValue('-webkit-grid-template-columns') is "35px 35px"
+PASS window.getComputedStyle(gridAutoWithFixedWidthChild, '').getPropertyValue('grid-template-columns') is "60px"
+PASS window.getComputedStyle(gridAutoWithFixedWidthChildAndMinWidth, '').getPropertyValue('grid-template-columns') is "60px"
+PASS window.getComputedStyle(gridAutoWithFixedWidthChildAndHigherMinWidth, '').getPropertyValue('grid-template-columns') is "90px"
+PASS window.getComputedStyle(gridAutoAndAutoOneSpanningFixedWidth, '').getPropertyValue('grid-template-columns') is "25px 25px"
+PASS window.getComputedStyle(gridAutoAndAutoOneSpanningFixedWidthAndMinWidth, '').getPropertyValue('grid-template-columns') is "30px 30px"
+PASS window.getComputedStyle(gridAutoAndAutoOneSpanningFixedWidthAndHigherMinWidth, '').getPropertyValue('grid-template-columns') is "35px 35px"
Check that borders and paddings are considering when computing min sizes.
-PASS window.getComputedStyle(gridAutoFixedMinWidthWithBorder, '').getPropertyValue('-webkit-grid-template-columns') is "50px"
-PASS window.getComputedStyle(gridAutoFixedMinWidthWithPadding, '').getPropertyValue('-webkit-grid-template-columns') is "56px"
-PASS window.getComputedStyle(gridAutoFixedMinWidthWithBorderAndPadding, '').getPropertyValue('-webkit-grid-template-columns') is "66px"
-PASS window.getComputedStyle(gridAutoAutoMinWidthWithBorder, '').getPropertyValue('-webkit-grid-template-columns') is "40px"
-PASS window.getComputedStyle(gridAutoAutoMinWidthWithPadding, '').getPropertyValue('-webkit-grid-template-columns') is "46px"
-PASS window.getComputedStyle(gridAutoAutoMinWidthWithBorderAndPadding, '').getPropertyValue('-webkit-grid-template-columns') is "56px"
-PASS window.getComputedStyle(gridAutoMaxContentMinWidthWithBorder, '').getPropertyValue('-webkit-grid-template-columns') is "90px"
-PASS window.getComputedStyle(gridAutoMaxContentMinWidthWithPadding, '').getPropertyValue('-webkit-grid-template-columns') is "96px"
-PASS window.getComputedStyle(gridAutoMaxContentMinWidthWithBorderAndPadding, '').getPropertyValue('-webkit-grid-template-columns') is "106px"
+PASS window.getComputedStyle(gridAutoFixedMinWidthWithBorder, '').getPropertyValue('grid-template-columns') is "50px"
+PASS window.getComputedStyle(gridAutoFixedMinWidthWithPadding, '').getPropertyValue('grid-template-columns') is "56px"
+PASS window.getComputedStyle(gridAutoFixedMinWidthWithBorderAndPadding, '').getPropertyValue('grid-template-columns') is "66px"
+PASS window.getComputedStyle(gridAutoAutoMinWidthWithBorder, '').getPropertyValue('grid-template-columns') is "40px"
+PASS window.getComputedStyle(gridAutoAutoMinWidthWithPadding, '').getPropertyValue('grid-template-columns') is "46px"
+PASS window.getComputedStyle(gridAutoAutoMinWidthWithBorderAndPadding, '').getPropertyValue('grid-template-columns') is "56px"
+PASS window.getComputedStyle(gridAutoMaxContentMinWidthWithBorder, '').getPropertyValue('grid-template-columns') is "90px"
+PASS window.getComputedStyle(gridAutoMaxContentMinWidthWithPadding, '').getPropertyValue('grid-template-columns') is "96px"
+PASS window.getComputedStyle(gridAutoMaxContentMinWidthWithBorderAndPadding, '').getPropertyValue('grid-template-columns') is "106px"
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-columns.html b/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-columns.html
index 29f2627..e4f2daa 100644
--- a/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-columns.html
+++ b/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-columns.html
@@ -21,15 +21,15 @@
.padding8 { padding: 0px 8px 0px; }
/* All these 4 cases are equivalent. We use them interchangeably. */
-.gridAuto { -webkit-grid-template-columns: auto; }
-.gridMinMaxAutoAuto { -webkit-grid-template-columns: minmax(auto, auto); }
-.gridMinMaxAutoMaxContent { -webkit-grid-template-columns: minmax(auto, -webkit-max-content); }
-.gridMinMaxMinContentAuto { -webkit-grid-template-columns: minmax(-webkit-min-content, auto); }
+.gridAuto { grid-template-columns: auto; }
+.gridMinMaxAutoAuto { grid-template-columns: minmax(auto, auto); }
+.gridMinMaxAutoMaxContent { grid-template-columns: minmax(auto, -webkit-max-content); }
+.gridMinMaxMinContentAuto { grid-template-columns: minmax(-webkit-min-content, auto); }
/* All these 3 cases are equivalent. We use them interchangeably. */
-.gridAutoAndAuto { -webkit-grid-template-columns: auto auto; }
-.gridAutoAndMinMaxAutoAuto { -webkit-grid-template-columns: auto minmax(auto, auto); }
-.gridMinMaxAutoMaxContentAndAuto { -webkit-grid-template-columns: minmax(auto, -webkit-max-content) auto; }
+.gridAutoAndAuto { grid-template-columns: auto auto; }
+.gridAutoAndMinMaxAutoAuto { grid-template-columns: auto minmax(auto, auto); }
+.gridMinMaxAutoMaxContentAndAuto { grid-template-columns: minmax(auto, -webkit-max-content) auto; }
</style>
<script src="../../resources/js-test.js"></script>
@@ -237,7 +237,7 @@
<script>
function testGridColumnsValues(id, computedColumnValue)
{
- shouldBeEqualToString("window.getComputedStyle(" + id + ", '').getPropertyValue('-webkit-grid-template-columns')", computedColumnValue);
+ shouldBeEqualToString("window.getComputedStyle(" + id + ", '').getPropertyValue('grid-template-columns')", computedColumnValue);
}
debug("Check that min-width is honored when sizing auto columns.");
diff --git a/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-rows-expected.txt b/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-rows-expected.txt
index eb9d6f2..b4cd04b 100644
--- a/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-rows-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-rows-expected.txt
@@ -1,41 +1,41 @@
Check that min-height is honored when sizing auto rows.
-PASS window.getComputedStyle(gridAuto, '').getPropertyValue('-webkit-grid-template-rows') is "40px"
-PASS window.getComputedStyle(gridAutoItemSmallerThanMinSize, '').getPropertyValue('-webkit-grid-template-rows') is "40px"
-PASS window.getComputedStyle(gridMinMaxAutoAuto, '').getPropertyValue('-webkit-grid-template-rows') is "40px"
-PASS window.getComputedStyle(gridMinMaxAutoMaxContent, '').getPropertyValue('-webkit-grid-template-rows') is "30px"
-PASS window.getComputedStyle(gridMinMaxMinContentAuto, '').getPropertyValue('-webkit-grid-template-rows') is "60px"
-PASS window.getComputedStyle(gridAutoMultipleItems, '').getPropertyValue('-webkit-grid-template-rows') is "60px"
-PASS window.getComputedStyle(gridMinMaxAutoAutoMultipleItemsOneWithoutMinHeight, '').getPropertyValue('-webkit-grid-template-rows') is "50px"
-PASS window.getComputedStyle(gridMinMaxAutoMaxContentMultipleItemsOneWithAutoMinHeight, '').getPropertyValue('-webkit-grid-template-rows') is "60px"
-PASS window.getComputedStyle(gridAutoAndAutoFixedHeightChildren, '').getPropertyValue('-webkit-grid-template-rows') is "200px 50px"
+PASS window.getComputedStyle(gridAuto, '').getPropertyValue('grid-template-rows') is "40px"
+PASS window.getComputedStyle(gridAutoItemSmallerThanMinSize, '').getPropertyValue('grid-template-rows') is "40px"
+PASS window.getComputedStyle(gridMinMaxAutoAuto, '').getPropertyValue('grid-template-rows') is "40px"
+PASS window.getComputedStyle(gridMinMaxAutoMaxContent, '').getPropertyValue('grid-template-rows') is "30px"
+PASS window.getComputedStyle(gridMinMaxMinContentAuto, '').getPropertyValue('grid-template-rows') is "60px"
+PASS window.getComputedStyle(gridAutoMultipleItems, '').getPropertyValue('grid-template-rows') is "60px"
+PASS window.getComputedStyle(gridMinMaxAutoAutoMultipleItemsOneWithoutMinHeight, '').getPropertyValue('grid-template-rows') is "50px"
+PASS window.getComputedStyle(gridMinMaxAutoMaxContentMultipleItemsOneWithAutoMinHeight, '').getPropertyValue('grid-template-rows') is "60px"
+PASS window.getComputedStyle(gridAutoAndAutoFixedHeightChildren, '').getPropertyValue('grid-template-rows') is "200px 50px"
Check that min-height is honored when sizing auto rows and spanning grid items.
-PASS window.getComputedStyle(gridAutoAndAutoOneSpanningOneNonSpannig, '').getPropertyValue('-webkit-grid-template-rows') is "10px 40px"
-PASS window.getComputedStyle(gridAutoAndAutoOneSpanningMultipleNonSpanning, '').getPropertyValue('-webkit-grid-template-rows') is "40px 20px"
-PASS window.getComputedStyle(gridAutoAndMinMaxAutoAutoOneSpanningOneNonSpanning, '').getPropertyValue('-webkit-grid-template-rows') is "40px 30px"
-PASS window.getComputedStyle(gridAutoAndMinMaxAutoAutoMultipleSpanning, '').getPropertyValue('-webkit-grid-template-rows') is "35px 35px"
-PASS window.getComputedStyle(gridMinMaxAutoMaxContentAndAutoOneSpanningMultipleNonSpanning, '').getPropertyValue('-webkit-grid-template-rows') is "25px 65px"
-PASS window.getComputedStyle(gridMinMaxAutoMaxContentAndAutoMultipleSpanningMultipleNonSpanning, '').getPropertyValue('-webkit-grid-template-rows') is "50px 40px"
+PASS window.getComputedStyle(gridAutoAndAutoOneSpanningOneNonSpannig, '').getPropertyValue('grid-template-rows') is "10px 40px"
+PASS window.getComputedStyle(gridAutoAndAutoOneSpanningMultipleNonSpanning, '').getPropertyValue('grid-template-rows') is "40px 20px"
+PASS window.getComputedStyle(gridAutoAndMinMaxAutoAutoOneSpanningOneNonSpanning, '').getPropertyValue('grid-template-rows') is "40px 30px"
+PASS window.getComputedStyle(gridAutoAndMinMaxAutoAutoMultipleSpanning, '').getPropertyValue('grid-template-rows') is "35px 35px"
+PASS window.getComputedStyle(gridMinMaxAutoMaxContentAndAutoOneSpanningMultipleNonSpanning, '').getPropertyValue('grid-template-rows') is "25px 65px"
+PASS window.getComputedStyle(gridMinMaxAutoMaxContentAndAutoMultipleSpanningMultipleNonSpanning, '').getPropertyValue('grid-template-rows') is "50px 40px"
Check the interactions between height and min-height and auto tracks.
-PASS window.getComputedStyle(gridAutoWithFixedHeightChild, '').getPropertyValue('-webkit-grid-template-rows') is "60px"
-PASS window.getComputedStyle(gridAutoWithFixedHeightChildAndMinHeight, '').getPropertyValue('-webkit-grid-template-rows') is "60px"
-PASS window.getComputedStyle(gridAutoWithFixedHeightChildAndHigherMinHeight, '').getPropertyValue('-webkit-grid-template-rows') is "90px"
-PASS window.getComputedStyle(gridAutoAndAutoOneSpanningFixedHeight, '').getPropertyValue('-webkit-grid-template-rows') is "25px 25px"
-PASS window.getComputedStyle(gridAutoAndAutoOneSpanningFixedHeightAndMinHeight, '').getPropertyValue('-webkit-grid-template-rows') is "30px 30px"
-PASS window.getComputedStyle(gridAutoAndAutoOneSpanningFixedHeightAndHigherMinHeight, '').getPropertyValue('-webkit-grid-template-rows') is "35px 35px"
+PASS window.getComputedStyle(gridAutoWithFixedHeightChild, '').getPropertyValue('grid-template-rows') is "60px"
+PASS window.getComputedStyle(gridAutoWithFixedHeightChildAndMinHeight, '').getPropertyValue('grid-template-rows') is "60px"
+PASS window.getComputedStyle(gridAutoWithFixedHeightChildAndHigherMinHeight, '').getPropertyValue('grid-template-rows') is "90px"
+PASS window.getComputedStyle(gridAutoAndAutoOneSpanningFixedHeight, '').getPropertyValue('grid-template-rows') is "25px 25px"
+PASS window.getComputedStyle(gridAutoAndAutoOneSpanningFixedHeightAndMinHeight, '').getPropertyValue('grid-template-rows') is "30px 30px"
+PASS window.getComputedStyle(gridAutoAndAutoOneSpanningFixedHeightAndHigherMinHeight, '').getPropertyValue('grid-template-rows') is "35px 35px"
Check that borders and paddings are considering when computing min sizes.
-PASS window.getComputedStyle(gridAutoFixedMinHeightWithBorder, '').getPropertyValue('-webkit-grid-template-rows') is "50px"
-PASS window.getComputedStyle(gridAutoFixedMinHeightWithPadding, '').getPropertyValue('-webkit-grid-template-rows') is "56px"
-PASS window.getComputedStyle(gridAutoFixedMinHeightWithBorderAndPadding, '').getPropertyValue('-webkit-grid-template-rows') is "66px"
-PASS window.getComputedStyle(gridAutoAutoMinHeightWithBorder, '').getPropertyValue('-webkit-grid-template-rows') is "40px"
-PASS window.getComputedStyle(gridAutoAutoMinHeightWithPadding, '').getPropertyValue('-webkit-grid-template-rows') is "46px"
-PASS window.getComputedStyle(gridAutoAutoMinHeightWithBorderAndPadding, '').getPropertyValue('-webkit-grid-template-rows') is "56px"
-PASS window.getComputedStyle(gridAutoMaxContentMinHeightWithBorder, '').getPropertyValue('-webkit-grid-template-rows') is "30px"
-PASS window.getComputedStyle(gridAutoMaxContentMinHeightWithPadding, '').getPropertyValue('-webkit-grid-template-rows') is "36px"
-PASS window.getComputedStyle(gridAutoMaxContentMinHeightWithBorderAndPadding, '').getPropertyValue('-webkit-grid-template-rows') is "46px"
+PASS window.getComputedStyle(gridAutoFixedMinHeightWithBorder, '').getPropertyValue('grid-template-rows') is "50px"
+PASS window.getComputedStyle(gridAutoFixedMinHeightWithPadding, '').getPropertyValue('grid-template-rows') is "56px"
+PASS window.getComputedStyle(gridAutoFixedMinHeightWithBorderAndPadding, '').getPropertyValue('grid-template-rows') is "66px"
+PASS window.getComputedStyle(gridAutoAutoMinHeightWithBorder, '').getPropertyValue('grid-template-rows') is "40px"
+PASS window.getComputedStyle(gridAutoAutoMinHeightWithPadding, '').getPropertyValue('grid-template-rows') is "46px"
+PASS window.getComputedStyle(gridAutoAutoMinHeightWithBorderAndPadding, '').getPropertyValue('grid-template-rows') is "56px"
+PASS window.getComputedStyle(gridAutoMaxContentMinHeightWithBorder, '').getPropertyValue('grid-template-rows') is "30px"
+PASS window.getComputedStyle(gridAutoMaxContentMinHeightWithPadding, '').getPropertyValue('grid-template-rows') is "36px"
+PASS window.getComputedStyle(gridAutoMaxContentMinHeightWithBorderAndPadding, '').getPropertyValue('grid-template-rows') is "46px"
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-rows.html b/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-rows.html
index 9857458..6f8d94b 100644
--- a/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-rows.html
+++ b/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-rows.html
@@ -22,15 +22,15 @@
.padding8 { padding: 8px 0px; }
/* All these 4 cases are equivalent. We use them interchangeably. */
-.gridAuto { -webkit-grid-template-rows: auto; }
-.gridMinMaxAutoAuto { -webkit-grid-template-rows: minmax(auto, auto); }
-.gridMinMaxAutoMaxContent { -webkit-grid-template-rows: minmax(auto, -webkit-max-content); }
-.gridMinMaxMinContentAuto { -webkit-grid-template-rows: minmax(-webkit-min-content, auto); }
+.gridAuto { grid-template-rows: auto; }
+.gridMinMaxAutoAuto { grid-template-rows: minmax(auto, auto); }
+.gridMinMaxAutoMaxContent { grid-template-rows: minmax(auto, -webkit-max-content); }
+.gridMinMaxMinContentAuto { grid-template-rows: minmax(-webkit-min-content, auto); }
/* All these 3 cases are equivalent. We use them interchangeably. */
-.gridAutoAndAuto { -webkit-grid-template-rows: auto auto; }
-.gridAutoAndMinMaxAutoAuto { -webkit-grid-template-rows: auto minmax(auto, auto); }
-.gridMinMaxAutoMaxContentAndAuto { -webkit-grid-template-rows: minmax(auto, -webkit-max-content) auto; }
+.gridAutoAndAuto { grid-template-rows: auto auto; }
+.gridAutoAndMinMaxAutoAuto { grid-template-rows: auto minmax(auto, auto); }
+.gridMinMaxAutoMaxContentAndAuto { grid-template-rows: minmax(auto, -webkit-max-content) auto; }
</style>
<script src="../../resources/js-test.js"></script>
@@ -220,7 +220,7 @@
<script>
function testGridRowsValues(id, computedRowValue)
{
- shouldBeEqualToString("window.getComputedStyle(" + id + ", '').getPropertyValue('-webkit-grid-template-rows')", computedRowValue);
+ shouldBeEqualToString("window.getComputedStyle(" + id + ", '').getPropertyValue('grid-template-rows')", computedRowValue);
}
debug("");
diff --git a/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt b/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt
index 30d8687..8413244 100644
--- a/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt
@@ -3,185 +3,185 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-Test getting -webkit-grid-template-columns and -webkit-grid-template-rows set through CSS
-PASS window.getComputedStyle(gridWithNoneElement, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithNoneElement, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-template-columns') is "10px"
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-template-rows') is "15px"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-template-columns') is "424px"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-template-rows') is "162px"
-PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('-webkit-grid-template-columns') is "0px"
-PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('-webkit-grid-template-rows') is "0px"
-PASS window.getComputedStyle(gridWithPercentWithoutSizeWithChildren, '').getPropertyValue('-webkit-grid-template-columns') is "7px"
-PASS window.getComputedStyle(gridWithPercentWithoutSizeWithChildren, '').getPropertyValue('-webkit-grid-template-rows') is "11px"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-template-columns') is "0px"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-template-rows') is "0px"
-PASS window.getComputedStyle(gridWithAutoWithChildrenElement, '').getPropertyValue('-webkit-grid-template-columns') is "7px"
-PASS window.getComputedStyle(gridWithAutoWithChildrenElement, '').getPropertyValue('-webkit-grid-template-rows') is "11px"
-PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-template-columns') is "100px"
-PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-template-rows') is "150px"
-PASS window.getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('-webkit-grid-template-columns') is "64px"
-PASS window.getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('-webkit-grid-template-rows') is "60px"
-PASS window.getComputedStyle(gridWithMinMaxElement, '').getPropertyValue('-webkit-grid-template-columns') is "80px"
-PASS window.getComputedStyle(gridWithMinMaxElement, '').getPropertyValue('-webkit-grid-template-rows') is "300px"
-PASS window.getComputedStyle(gridWithMinContentElement, '').getPropertyValue('-webkit-grid-template-columns') is "0px"
-PASS window.getComputedStyle(gridWithMinContentElement, '').getPropertyValue('-webkit-grid-template-rows') is "0px"
-PASS window.getComputedStyle(gridWithMinContentWithChildrenElement, '').getPropertyValue('-webkit-grid-template-columns') is "17px"
-PASS window.getComputedStyle(gridWithMinContentWithChildrenElement, '').getPropertyValue('-webkit-grid-template-rows') is "11px"
-PASS window.getComputedStyle(gridWithMaxContentElement, '').getPropertyValue('-webkit-grid-template-columns') is "0px"
-PASS window.getComputedStyle(gridWithMaxContentElement, '').getPropertyValue('-webkit-grid-template-rows') is "0px"
-PASS window.getComputedStyle(gridWithMaxContentWithChildrenElement, '').getPropertyValue('-webkit-grid-template-columns') is "17px"
-PASS window.getComputedStyle(gridWithMaxContentWithChildrenElement, '').getPropertyValue('-webkit-grid-template-rows') is "11px"
-PASS window.getComputedStyle(gridWithFractionElement, '').getPropertyValue('-webkit-grid-template-columns') is "800px"
-PASS window.getComputedStyle(gridWithFractionElement, '').getPropertyValue('-webkit-grid-template-rows') is "600px"
-PASS window.getComputedStyle(gridWithCalcElement, '').getPropertyValue('-webkit-grid-template-columns') is "150px"
-PASS window.getComputedStyle(gridWithCalcElement, '').getPropertyValue('-webkit-grid-template-rows') is "75px"
-PASS window.getComputedStyle(gridWithCalcComplexElement, '').getPropertyValue('-webkit-grid-template-columns') is "550px"
-PASS window.getComputedStyle(gridWithCalcComplexElement, '').getPropertyValue('-webkit-grid-template-rows') is "465px"
-PASS window.getComputedStyle(gridWithCalcInsideMinMaxElement, '').getPropertyValue('-webkit-grid-template-columns') is "80px"
-PASS window.getComputedStyle(gridWithCalcInsideMinMaxElement, '').getPropertyValue('-webkit-grid-template-rows') is "300px"
-PASS window.getComputedStyle(gridWithCalcComplexInsideMinMaxElement, '').getPropertyValue('-webkit-grid-template-columns') is "415px"
-PASS window.getComputedStyle(gridWithCalcComplexInsideMinMaxElement, '').getPropertyValue('-webkit-grid-template-rows') is "300px"
-PASS window.getComputedStyle(gridWithAutoInsideMinMaxElement, '').getPropertyValue('-webkit-grid-template-columns') is "20px"
-PASS window.getComputedStyle(gridWithAutoInsideMinMaxElement, '').getPropertyValue('-webkit-grid-template-rows') is "11px"
+Test getting grid-template-columns and grid-template-rows set through CSS
+PASS window.getComputedStyle(gridWithNoneElement, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithNoneElement, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-columns') is "10px"
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-rows') is "15px"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-columns') is "424px"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-rows') is "162px"
+PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('grid-template-columns') is "0px"
+PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('grid-template-rows') is "0px"
+PASS window.getComputedStyle(gridWithPercentWithoutSizeWithChildren, '').getPropertyValue('grid-template-columns') is "7px"
+PASS window.getComputedStyle(gridWithPercentWithoutSizeWithChildren, '').getPropertyValue('grid-template-rows') is "11px"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-columns') is "0px"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-rows') is "0px"
+PASS window.getComputedStyle(gridWithAutoWithChildrenElement, '').getPropertyValue('grid-template-columns') is "7px"
+PASS window.getComputedStyle(gridWithAutoWithChildrenElement, '').getPropertyValue('grid-template-rows') is "11px"
+PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('grid-template-columns') is "100px"
+PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('grid-template-rows') is "150px"
+PASS window.getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('grid-template-columns') is "64px"
+PASS window.getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('grid-template-rows') is "60px"
+PASS window.getComputedStyle(gridWithMinMaxElement, '').getPropertyValue('grid-template-columns') is "80px"
+PASS window.getComputedStyle(gridWithMinMaxElement, '').getPropertyValue('grid-template-rows') is "300px"
+PASS window.getComputedStyle(gridWithMinContentElement, '').getPropertyValue('grid-template-columns') is "0px"
+PASS window.getComputedStyle(gridWithMinContentElement, '').getPropertyValue('grid-template-rows') is "0px"
+PASS window.getComputedStyle(gridWithMinContentWithChildrenElement, '').getPropertyValue('grid-template-columns') is "17px"
+PASS window.getComputedStyle(gridWithMinContentWithChildrenElement, '').getPropertyValue('grid-template-rows') is "11px"
+PASS window.getComputedStyle(gridWithMaxContentElement, '').getPropertyValue('grid-template-columns') is "0px"
+PASS window.getComputedStyle(gridWithMaxContentElement, '').getPropertyValue('grid-template-rows') is "0px"
+PASS window.getComputedStyle(gridWithMaxContentWithChildrenElement, '').getPropertyValue('grid-template-columns') is "17px"
+PASS window.getComputedStyle(gridWithMaxContentWithChildrenElement, '').getPropertyValue('grid-template-rows') is "11px"
+PASS window.getComputedStyle(gridWithFractionElement, '').getPropertyValue('grid-template-columns') is "800px"
+PASS window.getComputedStyle(gridWithFractionElement, '').getPropertyValue('grid-template-rows') is "600px"
+PASS window.getComputedStyle(gridWithCalcElement, '').getPropertyValue('grid-template-columns') is "150px"
+PASS window.getComputedStyle(gridWithCalcElement, '').getPropertyValue('grid-template-rows') is "75px"
+PASS window.getComputedStyle(gridWithCalcComplexElement, '').getPropertyValue('grid-template-columns') is "550px"
+PASS window.getComputedStyle(gridWithCalcComplexElement, '').getPropertyValue('grid-template-rows') is "465px"
+PASS window.getComputedStyle(gridWithCalcInsideMinMaxElement, '').getPropertyValue('grid-template-columns') is "80px"
+PASS window.getComputedStyle(gridWithCalcInsideMinMaxElement, '').getPropertyValue('grid-template-rows') is "300px"
+PASS window.getComputedStyle(gridWithCalcComplexInsideMinMaxElement, '').getPropertyValue('grid-template-columns') is "415px"
+PASS window.getComputedStyle(gridWithCalcComplexInsideMinMaxElement, '').getPropertyValue('grid-template-rows') is "300px"
+PASS window.getComputedStyle(gridWithAutoInsideMinMaxElement, '').getPropertyValue('grid-template-columns') is "20px"
+PASS window.getComputedStyle(gridWithAutoInsideMinMaxElement, '').getPropertyValue('grid-template-rows') is "11px"
-Test getting wrong values for -webkit-grid-template-columns and -webkit-grid-template-rows through CSS (they should resolve to the default: 'none')
-PASS window.getComputedStyle(gridWithFitContentElement, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithFitContentElement, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+Test getting wrong values for grid-template-columns and grid-template-rows through CSS (they should resolve to the default: 'none')
+PASS window.getComputedStyle(gridWithFitContentElement, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithFitContentElement, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('grid-template-rows') is "none"
Test the initial value
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
-Test getting and setting -webkit-grid-template-columns and -webkit-grid-template-rows through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "18px"
-PASS element.style.webkitGridTemplateColumns is "18px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "66px"
-PASS element.style.webkitGridTemplateRows is "66px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "440px"
-PASS element.style.webkitGridTemplateColumns is "55%"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "240px"
-PASS element.style.webkitGridTemplateRows is "40%"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "0px"
-PASS element.style.webkitGridTemplateColumns is "auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "0px"
-PASS element.style.webkitGridTemplateRows is "auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "80px"
-PASS element.style.webkitGridTemplateColumns is "10vw"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "150px"
-PASS element.style.webkitGridTemplateRows is "25vh"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "0px"
-PASS element.style.webkitGridTemplateColumns is "-webkit-min-content"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "0px"
-PASS element.style.webkitGridTemplateRows is "-webkit-min-content"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "0px"
-PASS element.style.webkitGridTemplateColumns is "-webkit-max-content"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "0px"
-PASS element.style.webkitGridTemplateRows is "-webkit-max-content"
+Test getting and setting grid-template-columns and grid-template-rows through JS
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "18px"
+PASS element.style.gridTemplateColumns is "18px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "66px"
+PASS element.style.gridTemplateRows is "66px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "440px"
+PASS element.style.gridTemplateColumns is "55%"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "240px"
+PASS element.style.gridTemplateRows is "40%"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "0px"
+PASS element.style.gridTemplateColumns is "auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px"
+PASS element.style.gridTemplateRows is "auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "80px"
+PASS element.style.gridTemplateColumns is "10vw"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "150px"
+PASS element.style.gridTemplateRows is "25vh"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "0px"
+PASS element.style.gridTemplateColumns is "-webkit-min-content"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px"
+PASS element.style.gridTemplateRows is "-webkit-min-content"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "0px"
+PASS element.style.gridTemplateColumns is "-webkit-max-content"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px"
+PASS element.style.gridTemplateRows is "-webkit-max-content"
-Test getting and setting -webkit-grid-template-columns and -webkit-grid-template-rows to minmax() values through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "440px"
-PASS element.style.webkitGridTemplateColumns is "minmax(55%, 45px)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "240px"
-PASS element.style.webkitGridTemplateRows is "minmax(30px, 40%)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "220px"
-PASS element.style.webkitGridTemplateColumns is "minmax(22em, 8vh)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "80px"
-PASS element.style.webkitGridTemplateRows is "minmax(10vw, 5em)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "48px"
-PASS element.style.webkitGridTemplateColumns is "minmax(-webkit-min-content, 8vh)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "80px"
-PASS element.style.webkitGridTemplateRows is "minmax(10vw, -webkit-min-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "220px"
-PASS element.style.webkitGridTemplateColumns is "minmax(22em, -webkit-max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "50px"
-PASS element.style.webkitGridTemplateRows is "minmax(-webkit-max-content, 5em)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "0px"
-PASS element.style.webkitGridTemplateColumns is "minmax(-webkit-min-content, -webkit-max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "0px"
-PASS element.style.webkitGridTemplateRows is "minmax(-webkit-max-content, -webkit-min-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "0px"
-PASS element.style.webkitGridTemplateColumns is "minmax(auto, -webkit-max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "80px"
-PASS element.style.webkitGridTemplateRows is "minmax(10vw, auto)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "800px"
-PASS element.style.webkitGridTemplateColumns is "3600fr"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "600px"
-PASS element.style.webkitGridTemplateRows is "154fr"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "800px"
-PASS element.style.webkitGridTemplateColumns is "3.1459fr"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "600px"
-PASS element.style.webkitGridTemplateRows is "2.718fr"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "800px"
-PASS element.style.webkitGridTemplateColumns is "3fr"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "600px"
-PASS element.style.webkitGridTemplateRows is "4fr"
+Test getting and setting grid-template-columns and grid-template-rows to minmax() values through JS
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "440px"
+PASS element.style.gridTemplateColumns is "minmax(55%, 45px)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "240px"
+PASS element.style.gridTemplateRows is "minmax(30px, 40%)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "220px"
+PASS element.style.gridTemplateColumns is "minmax(22em, 8vh)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "80px"
+PASS element.style.gridTemplateRows is "minmax(10vw, 5em)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "48px"
+PASS element.style.gridTemplateColumns is "minmax(-webkit-min-content, 8vh)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "80px"
+PASS element.style.gridTemplateRows is "minmax(10vw, -webkit-min-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "220px"
+PASS element.style.gridTemplateColumns is "minmax(22em, -webkit-max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "50px"
+PASS element.style.gridTemplateRows is "minmax(-webkit-max-content, 5em)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "0px"
+PASS element.style.gridTemplateColumns is "minmax(-webkit-min-content, -webkit-max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px"
+PASS element.style.gridTemplateRows is "minmax(-webkit-max-content, -webkit-min-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "0px"
+PASS element.style.gridTemplateColumns is "minmax(auto, -webkit-max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "80px"
+PASS element.style.gridTemplateRows is "minmax(10vw, auto)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "800px"
+PASS element.style.gridTemplateColumns is "3600fr"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "600px"
+PASS element.style.gridTemplateRows is "154fr"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "800px"
+PASS element.style.gridTemplateColumns is "3.1459fr"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "600px"
+PASS element.style.gridTemplateRows is "2.718fr"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "800px"
+PASS element.style.gridTemplateColumns is "3fr"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "600px"
+PASS element.style.gridTemplateRows is "4fr"
Test getting and setting grid-template-columns and grid-template-rows to calc() values through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "150px"
-PASS element.style.webkitGridTemplateColumns is "calc(150px)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "75px"
-PASS element.style.webkitGridTemplateRows is "calc(75px)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "370px"
-PASS element.style.webkitGridTemplateColumns is "calc(50% - 30px)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "135px"
-PASS element.style.webkitGridTemplateRows is "calc(75px + 10%)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "200px"
-PASS element.style.webkitGridTemplateColumns is "minmax(25%, calc(30px))"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "450px"
-PASS element.style.webkitGridTemplateRows is "minmax(calc(75%), 40px)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "110px"
-PASS element.style.webkitGridTemplateColumns is "minmax(10%, calc(30px + 10%))"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "200px"
-PASS element.style.webkitGridTemplateRows is "minmax(calc(25% - 50px), 200px)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "150px"
+PASS element.style.gridTemplateColumns is "calc(150px)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "75px"
+PASS element.style.gridTemplateRows is "calc(75px)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "370px"
+PASS element.style.gridTemplateColumns is "calc(50% - 30px)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "135px"
+PASS element.style.gridTemplateRows is "calc(75px + 10%)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "200px"
+PASS element.style.gridTemplateColumns is "minmax(25%, calc(30px))"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "450px"
+PASS element.style.gridTemplateRows is "minmax(calc(75%), 40px)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "110px"
+PASS element.style.gridTemplateColumns is "minmax(10%, calc(30px + 10%))"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "200px"
+PASS element.style.gridTemplateRows is "minmax(calc(25% - 50px), 200px)"
Test setting grid-template-columns and grid-template-rows to bad values through JS
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
Test setting grid-template-columns and grid-template-rows back to 'none' through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "18px"
-PASS element.style.webkitGridTemplateColumns is "18px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "66px"
-PASS element.style.webkitGridTemplateRows is "66px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS element.style.webkitGridTemplateColumns is "none"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS element.style.webkitGridTemplateRows is "none"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "18px"
+PASS element.style.gridTemplateColumns is "18px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "66px"
+PASS element.style.gridTemplateRows is "66px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS element.style.gridTemplateColumns is "none"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS element.style.gridTemplateRows is "none"
Test setting grid-template-columns and grid-template-rows to 'inherit' through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is '50px [last]'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is '[first] 20px'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is '50px [last]'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is '[first] 20px'
Test setting grid-template-columns and grid-template-rows to 'initial' through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is '450px [last]'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is '[first] 150px'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is 'none'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is '450px [last]'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is '[first] 150px'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is 'none'
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt b/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt
index 4385132..07a029e 100644
--- a/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt
@@ -4,124 +4,124 @@
Test getting |grid-template-columns| and |grid-template-rows| set through CSS
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-template-columns') is "7px 11px"
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-template-rows') is "17px 2px"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-template-columns') is "424px 792px"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-template-rows') is "162px 312px"
-PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('-webkit-grid-template-columns') is "7px 0px"
-PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('-webkit-grid-template-rows') is "11px 0px"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-template-columns') is "0px 17px"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-template-rows') is "0px 3px"
-PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-template-columns') is "100px 120px"
-PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-template-rows') is "150px 170px"
-PASS window.getComputedStyle(gridWithThreeItems, '').getPropertyValue('-webkit-grid-template-columns') is "15px 0px 100px"
-PASS window.getComputedStyle(gridWithThreeItems, '').getPropertyValue('-webkit-grid-template-rows') is "120px 18px 0px"
-PASS window.getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('-webkit-grid-template-columns') is "400px 120px"
-PASS window.getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('-webkit-grid-template-rows') is "210px 168px"
-PASS window.getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('-webkit-grid-template-columns') is "0px 0px"
-PASS window.getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('-webkit-grid-template-rows') is "0px 0px"
-PASS window.getComputedStyle(gridWithMinMaxContentWithChildrenElement, '').getPropertyValue('-webkit-grid-template-columns') is "7px 17px"
-PASS window.getComputedStyle(gridWithMinMaxContentWithChildrenElement, '').getPropertyValue('-webkit-grid-template-rows') is "11px 3px"
-PASS window.getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('-webkit-grid-template-columns') is "240px 15px"
-PASS window.getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('-webkit-grid-template-rows') is "120px 210px"
-PASS window.getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('-webkit-grid-template-columns') is "240px 15px"
-PASS window.getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('-webkit-grid-template-rows') is "120px 210px"
-PASS window.getComputedStyle(gridWithFractionFraction, '').getPropertyValue('-webkit-grid-template-columns') is "320px 480px"
-PASS window.getComputedStyle(gridWithFractionFraction, '').getPropertyValue('-webkit-grid-template-rows') is "225px 375px"
-PASS window.getComputedStyle(gridWithFractionMinMax, '').getPropertyValue('-webkit-grid-template-columns') is "45px 755px"
-PASS window.getComputedStyle(gridWithFractionMinMax, '').getPropertyValue('-webkit-grid-template-rows') is "586px 14px"
-PASS window.getComputedStyle(gridWithCalcCalc, '').getPropertyValue('-webkit-grid-template-columns') is "200px 100px"
-PASS window.getComputedStyle(gridWithCalcCalc, '').getPropertyValue('-webkit-grid-template-rows') is "150px 75px"
-PASS window.getComputedStyle(gridWithCalcAndFixed, '').getPropertyValue('-webkit-grid-template-columns') is "400px 80px"
-PASS window.getComputedStyle(gridWithCalcAndFixed, '').getPropertyValue('-webkit-grid-template-rows') is "88px 150px"
-PASS window.getComputedStyle(gridWithCalcAndMinMax, '').getPropertyValue('-webkit-grid-template-columns') is "190px 80px"
-PASS window.getComputedStyle(gridWithCalcAndMinMax, '').getPropertyValue('-webkit-grid-template-rows') is "150px 53px"
-PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('-webkit-grid-template-columns') is "400px 120px"
-PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('-webkit-grid-template-rows') is "150px 175px"
-PASS window.getComputedStyle(gridWithAutoInsideMinMax, '').getPropertyValue('-webkit-grid-template-columns') is "0px 30px"
-PASS window.getComputedStyle(gridWithAutoInsideMinMax, '').getPropertyValue('-webkit-grid-template-rows') is "132px 60px"
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-columns') is "7px 11px"
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-rows') is "17px 2px"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-columns') is "424px 792px"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-rows') is "162px 312px"
+PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('grid-template-columns') is "7px 0px"
+PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('grid-template-rows') is "11px 0px"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-columns') is "0px 17px"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-rows') is "0px 3px"
+PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('grid-template-columns') is "100px 120px"
+PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('grid-template-rows') is "150px 170px"
+PASS window.getComputedStyle(gridWithThreeItems, '').getPropertyValue('grid-template-columns') is "15px 0px 100px"
+PASS window.getComputedStyle(gridWithThreeItems, '').getPropertyValue('grid-template-rows') is "120px 18px 0px"
+PASS window.getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('grid-template-columns') is "400px 120px"
+PASS window.getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('grid-template-rows') is "210px 168px"
+PASS window.getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('grid-template-columns') is "0px 0px"
+PASS window.getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('grid-template-rows') is "0px 0px"
+PASS window.getComputedStyle(gridWithMinMaxContentWithChildrenElement, '').getPropertyValue('grid-template-columns') is "7px 17px"
+PASS window.getComputedStyle(gridWithMinMaxContentWithChildrenElement, '').getPropertyValue('grid-template-rows') is "11px 3px"
+PASS window.getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('grid-template-columns') is "240px 15px"
+PASS window.getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('grid-template-rows') is "120px 210px"
+PASS window.getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('grid-template-columns') is "240px 15px"
+PASS window.getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('grid-template-rows') is "120px 210px"
+PASS window.getComputedStyle(gridWithFractionFraction, '').getPropertyValue('grid-template-columns') is "320px 480px"
+PASS window.getComputedStyle(gridWithFractionFraction, '').getPropertyValue('grid-template-rows') is "225px 375px"
+PASS window.getComputedStyle(gridWithFractionMinMax, '').getPropertyValue('grid-template-columns') is "45px 755px"
+PASS window.getComputedStyle(gridWithFractionMinMax, '').getPropertyValue('grid-template-rows') is "586px 14px"
+PASS window.getComputedStyle(gridWithCalcCalc, '').getPropertyValue('grid-template-columns') is "200px 100px"
+PASS window.getComputedStyle(gridWithCalcCalc, '').getPropertyValue('grid-template-rows') is "150px 75px"
+PASS window.getComputedStyle(gridWithCalcAndFixed, '').getPropertyValue('grid-template-columns') is "400px 80px"
+PASS window.getComputedStyle(gridWithCalcAndFixed, '').getPropertyValue('grid-template-rows') is "88px 150px"
+PASS window.getComputedStyle(gridWithCalcAndMinMax, '').getPropertyValue('grid-template-columns') is "190px 80px"
+PASS window.getComputedStyle(gridWithCalcAndMinMax, '').getPropertyValue('grid-template-rows') is "150px 53px"
+PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('grid-template-columns') is "400px 120px"
+PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('grid-template-rows') is "150px 175px"
+PASS window.getComputedStyle(gridWithAutoInsideMinMax, '').getPropertyValue('grid-template-columns') is "0px 30px"
+PASS window.getComputedStyle(gridWithAutoInsideMinMax, '').getPropertyValue('grid-template-rows') is "132px 60px"
Test the initial value
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is 'none'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is 'none'
Test getting and setting grid-template-rows and grid-template-columns through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "18px 22px"
-PASS element.style.webkitGridTemplateColumns is "18px 22px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "66px 70px"
-PASS element.style.webkitGridTemplateRows is "66px 70px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "440px 640px"
-PASS element.style.webkitGridTemplateColumns is "55% 80%"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "240px 378px"
-PASS element.style.webkitGridTemplateRows is "40% 63%"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "0px 0px"
-PASS element.style.webkitGridTemplateColumns is "auto auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "0px 0px"
-PASS element.style.webkitGridTemplateRows is "auto auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "0px 160px 22px"
-PASS element.style.webkitGridTemplateColumns is "auto 16em 22px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "336px 100px 0px"
-PASS element.style.webkitGridTemplateRows is "56% 10em auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "160px 20px"
-PASS element.style.webkitGridTemplateColumns is "16em minmax(16px, 20px)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "90px 0px"
-PASS element.style.webkitGridTemplateRows is "minmax(10%, 15%) auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "160px 640px"
-PASS element.style.webkitGridTemplateColumns is "16em 2fr"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "600px 0px"
-PASS element.style.webkitGridTemplateRows is "14fr auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "25px 20px"
-PASS element.style.webkitGridTemplateColumns is "calc(25px) calc(2em)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "0px 60px"
-PASS element.style.webkitGridTemplateRows is "auto calc(10%)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "345px 92px"
-PASS element.style.webkitGridTemplateColumns is "calc(25px + 40%) minmax(-webkit-min-content, calc(10% + 12px))"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "100px 0px"
-PASS element.style.webkitGridTemplateRows is "minmax(calc(75% - 350px), -webkit-max-content) auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "0px 16px"
-PASS element.style.webkitGridTemplateColumns is "auto minmax(16px, auto)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "90px 80px"
-PASS element.style.webkitGridTemplateRows is "minmax(auto, 15%) 10vw"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "18px 22px"
+PASS element.style.gridTemplateColumns is "18px 22px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "66px 70px"
+PASS element.style.gridTemplateRows is "66px 70px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "440px 640px"
+PASS element.style.gridTemplateColumns is "55% 80%"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "240px 378px"
+PASS element.style.gridTemplateRows is "40% 63%"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "0px 0px"
+PASS element.style.gridTemplateColumns is "auto auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px 0px"
+PASS element.style.gridTemplateRows is "auto auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "0px 160px 22px"
+PASS element.style.gridTemplateColumns is "auto 16em 22px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "336px 100px 0px"
+PASS element.style.gridTemplateRows is "56% 10em auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "160px 20px"
+PASS element.style.gridTemplateColumns is "16em minmax(16px, 20px)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "90px 0px"
+PASS element.style.gridTemplateRows is "minmax(10%, 15%) auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "160px 640px"
+PASS element.style.gridTemplateColumns is "16em 2fr"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "600px 0px"
+PASS element.style.gridTemplateRows is "14fr auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "25px 20px"
+PASS element.style.gridTemplateColumns is "calc(25px) calc(2em)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px 60px"
+PASS element.style.gridTemplateRows is "auto calc(10%)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "345px 92px"
+PASS element.style.gridTemplateColumns is "calc(25px + 40%) minmax(-webkit-min-content, calc(10% + 12px))"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "100px 0px"
+PASS element.style.gridTemplateRows is "minmax(calc(75% - 350px), -webkit-max-content) auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "0px 16px"
+PASS element.style.gridTemplateColumns is "auto minmax(16px, auto)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "90px 80px"
+PASS element.style.gridTemplateRows is "minmax(auto, 15%) 10vw"
Test getting wrong values set from CSS
-PASS window.getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('grid-template-rows') is "none"
Test setting and getting wrong values from JS
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
Test setting grid-template-columns and grid-template-rows to 'inherit' through JS
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "50px 750px [last]"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "20px [middle] 45px"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "50px 750px [last]"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "20px [middle] 45px"
Test setting grid-template-columns and grid-template-rows to 'initial' through JS
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "1200px [middle] 55px"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "200px [line] 400px [line]"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "1200px [middle] 55px"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "200px [line] 400px [line]"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html b/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html
index 7803507..2718dea 100644
--- a/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html
+++ b/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html
@@ -11,99 +11,99 @@
height: 600px;
}
.gridItem {
- -webkit-grid-column: 1;
- -webkit-grid-row: 1;
+ grid-column: 1;
+ grid-row: 1;
width: 7px;
height: 11px;
}
.gridItem2 {
- -webkit-grid-column: 2;
- -webkit-grid-row: 2;
+ grid-column: 2;
+ grid-row: 2;
width: 17px;
height: 3px;
}
.gridWithFixed {
- -webkit-grid-template-columns: 7px 11px;
- -webkit-grid-template-rows: 17px 2px;
+ grid-template-columns: 7px 11px;
+ grid-template-rows: 17px 2px;
}
.gridWithPercent {
- -webkit-grid-template-columns: 53% 99%;
- -webkit-grid-template-rows: 27% 52%;
+ grid-template-columns: 53% 99%;
+ grid-template-rows: 27% 52%;
}
.gridWithAuto {
- -webkit-grid-template-columns: auto auto;
- -webkit-grid-template-rows: auto auto;
+ grid-template-columns: auto auto;
+ grid-template-rows: auto auto;
}
.gridWithEM {
- -webkit-grid-template-columns: 10em 12em;
- -webkit-grid-template-rows: 15em 17em;
+ grid-template-columns: 10em 12em;
+ grid-template-rows: 15em 17em;
font: 10px Ahem;
}
.gridWithNoneAndAuto {
- -webkit-grid-template-columns: none auto;
- -webkit-grid-template-rows: none auto;
+ grid-template-columns: none auto;
+ grid-template-rows: none auto;
}
.gridNoneWithAndFixed {
- -webkit-grid-template-columns: none 15px;
- -webkit-grid-template-rows: none 22px;
+ grid-template-columns: none 15px;
+ grid-template-rows: none 22px;
}
.gridWithThreeItems {
- -webkit-grid-template-columns: 15px auto 10em;
- -webkit-grid-template-rows: 12em 18px auto;
+ grid-template-columns: 15px auto 10em;
+ grid-template-rows: 12em 18px auto;
font: 10px Ahem;
}
.gridWithPercentAndViewportPercent {
- -webkit-grid-template-columns: 50% 15vw;
- -webkit-grid-template-rows: 35% 28vh;
+ grid-template-columns: 50% 15vw;
+ grid-template-rows: 35% 28vh;
}
.gridWithFitContentAndFitAvailable {
- -webkit-grid-template-columns: -webkit-content-available;
- -webkit-grid-template-rows: -webkit-fitcontent -webkit-fit-available;
+ grid-template-columns: -webkit-content-available;
+ grid-template-rows: -webkit-fitcontent -webkit-fit-available;
}
.gridWithMinMaxContent {
- -webkit-grid-template-columns: -webkit-min-content -webkit-max-content;
- -webkit-grid-template-rows: -webkit-max-content -webkit-min-content;
+ grid-template-columns: -webkit-min-content -webkit-max-content;
+ grid-template-rows: -webkit-max-content -webkit-min-content;
}
.gridWithMinMaxAndFixed {
- -webkit-grid-template-columns: minmax(45px, 30%) 15px;
- -webkit-grid-template-rows: 12em minmax(35%, 10px);
+ grid-template-columns: minmax(45px, 30%) 15px;
+ grid-template-rows: 12em minmax(35%, 10px);
font: 10px Ahem;
}
.gridWithMinMaxAndMinMaxContent {
- -webkit-grid-template-columns: minmax(-webkit-min-content, 30%) 15px;
- -webkit-grid-template-rows: 12em minmax(35%, -webkit-max-content);
+ grid-template-columns: minmax(-webkit-min-content, 30%) 15px;
+ grid-template-rows: 12em minmax(35%, -webkit-max-content);
font: 10px Ahem;
}
.gridWithFractionFraction {
- -webkit-grid-template-columns: 2fr 3fr;
- -webkit-grid-template-rows: 3fr 5fr;
+ grid-template-columns: 2fr 3fr;
+ grid-template-rows: 3fr 5fr;
}
.gridWithFractionMinMax {
- -webkit-grid-template-columns: minmax(-webkit-min-content, 45px) 2fr;
- -webkit-grid-template-rows: 3fr minmax(14px, -webkit-max-content);
+ grid-template-columns: minmax(-webkit-min-content, 45px) 2fr;
+ grid-template-rows: 3fr minmax(14px, -webkit-max-content);
}
.gridWithCalcCalc {
- -webkit-grid-template-columns: calc(200px) calc(10em);
- -webkit-grid-template-rows: calc(15em) calc(75px);
+ grid-template-columns: calc(200px) calc(10em);
+ grid-template-rows: calc(15em) calc(75px);
font: 10px Ahem;
}
.gridWithCalcAndFixed {
- -webkit-grid-template-columns: calc(50%) 8em;
- -webkit-grid-template-rows: 88px calc(25%);
+ grid-template-columns: calc(50%) 8em;
+ grid-template-rows: 88px calc(25%);
font: 10px Ahem;
}
.gridWithCalcAndMinMax {
- -webkit-grid-template-columns: calc(30px + 20%) minmax(-webkit-min-content, 80px);
- -webkit-grid-template-rows: minmax(25%, -webkit-max-content) calc(10% - 7px);
+ grid-template-columns: calc(30px + 20%) minmax(-webkit-min-content, 80px);
+ grid-template-rows: minmax(25%, -webkit-max-content) calc(10% - 7px);
}
.gridWithCalcInsideMinMax {
- -webkit-grid-template-columns: minmax(calc(23px + 10%), 400px) 12em;
- -webkit-grid-template-rows: calc(150px) minmax(5%, calc(50% - 125px));
+ grid-template-columns: minmax(calc(23px + 10%), 400px) 12em;
+ grid-template-rows: calc(150px) minmax(5%, calc(50% - 125px));
font: 10px Ahem;
}
.gridWithAutoInsideMinMax {
- -webkit-grid-template-columns: minmax(auto, -webkit-min-content) 30px;
- -webkit-grid-template-rows: calc(100px + 2em) minmax(10%, auto);
+ grid-template-columns: minmax(auto, -webkit-min-content) 30px;
+ grid-template-rows: calc(100px + 2em) minmax(10%, auto);
}
</style>
<script src="../../resources/js-test-pre.js"></script>
diff --git a/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html b/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html
index 1f67187..b101eeb 100644
--- a/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html
@@ -11,85 +11,85 @@
height: 600px;
}
.gridItem {
- -webkit-grid-column: 1;
- -webkit-grid-row: 1;
+ grid-column: 1;
+ grid-row: 1;
width: 7px;
height: 11px;
}
.gridItem2 {
- -webkit-grid-column: 1;
- -webkit-grid-row: 1;
+ grid-column: 1;
+ grid-row: 1;
width: 17px;
height: 3px;
}
.gridWithNone {
- -webkit-grid-template-columns: none;
- -webkit-grid-template-rows: none;
+ grid-template-columns: none;
+ grid-template-rows: none;
}
.gridWithFixed {
- -webkit-grid-template-columns: 10px;
- -webkit-grid-template-rows: 15px;
+ grid-template-columns: 10px;
+ grid-template-rows: 15px;
}
.gridWithPercent {
- -webkit-grid-template-columns: 53%;
- -webkit-grid-template-rows: 27%;
+ grid-template-columns: 53%;
+ grid-template-rows: 27%;
}
.gridWithAuto {
- -webkit-grid-template-columns: auto;
- -webkit-grid-template-rows: auto;
+ grid-template-columns: auto;
+ grid-template-rows: auto;
}
.gridWithEM {
- -webkit-grid-template-columns: 10em;
- -webkit-grid-template-rows: 15em;
+ grid-template-columns: 10em;
+ grid-template-rows: 15em;
font: 10px Ahem;
}
.gridWithViewPortPercentage {
- -webkit-grid-template-columns: 8vw;
- -webkit-grid-template-rows: 10vh;
+ grid-template-columns: 8vw;
+ grid-template-rows: 10vh;
}
.gridWithFitContent {
- -webkit-grid-template-columns: -webkit-fit-content;
- -webkit-grid-template-rows: -webkit-fit-content;
+ grid-template-columns: -webkit-fit-content;
+ grid-template-rows: -webkit-fit-content;
}
.gridWithFitAvailable {
- -webkit-grid-template-columns: -webkit-fit-available;
- -webkit-grid-template-rows: -webkit-fit-available;
+ grid-template-columns: -webkit-fit-available;
+ grid-template-rows: -webkit-fit-available;
}
.gridWithMinMax {
- -webkit-grid-template-columns: minmax(10%, 15px);
- -webkit-grid-template-rows: minmax(20px, 50%);
+ grid-template-columns: minmax(10%, 15px);
+ grid-template-rows: minmax(20px, 50%);
}
.gridWithMinContent {
- -webkit-grid-template-columns: -webkit-min-content;
- -webkit-grid-template-rows: -webkit-min-content;
+ grid-template-columns: -webkit-min-content;
+ grid-template-rows: -webkit-min-content;
}
.gridWithMaxContent {
- -webkit-grid-template-columns: -webkit-max-content;
- -webkit-grid-template-rows: -webkit-max-content;
+ grid-template-columns: -webkit-max-content;
+ grid-template-rows: -webkit-max-content;
}
.gridWithFraction {
- -webkit-grid-template-columns: 1fr;
- -webkit-grid-template-rows: 2fr;
+ grid-template-columns: 1fr;
+ grid-template-rows: 2fr;
}
.gridWithCalc {
- -webkit-grid-template-columns: calc(150px);
- -webkit-grid-template-rows: calc(75px);
+ grid-template-columns: calc(150px);
+ grid-template-rows: calc(75px);
}
.gridWithCalcComplex {
- -webkit-grid-template-columns: calc(50% + 150px);
- -webkit-grid-template-rows: calc(65% + 75px);
+ grid-template-columns: calc(50% + 150px);
+ grid-template-rows: calc(65% + 75px);
}
.gridWithCalcInsideMinMax {
- -webkit-grid-template-columns: minmax(10%, calc(15px));
- -webkit-grid-template-rows: minmax(calc(20px), 50%);
+ grid-template-columns: minmax(10%, calc(15px));
+ grid-template-rows: minmax(calc(20px), 50%);
}
.gridWithCalcComplexInsideMinMax {
- -webkit-grid-template-columns: minmax(10%, calc(50% + 15px));
- -webkit-grid-template-rows: minmax(calc(20px + 10%), 50%);
+ grid-template-columns: minmax(10%, calc(50% + 15px));
+ grid-template-rows: minmax(calc(20px + 10%), 50%);
}
.gridWithAutoInsideMinMax {
- -webkit-grid-template-columns: minmax(auto, 20px);
- -webkit-grid-template-rows: minmax(max-content, auto);
+ grid-template-columns: minmax(auto, 20px);
+ grid-template-rows: minmax(max-content, auto);
}
</style>
<script src="../../resources/js-test-pre.js"></script>
diff --git a/LayoutTests/fast/css-grid-layout/grid-container-change-named-grid-lines-recompute-child.html b/LayoutTests/fast/css-grid-layout/grid-container-change-named-grid-lines-recompute-child.html
index a2da8d0..72fd4f9 100644
--- a/LayoutTests/fast/css-grid-layout/grid-container-change-named-grid-lines-recompute-child.html
+++ b/LayoutTests/fast/css-grid-layout/grid-container-change-named-grid-lines-recompute-child.html
@@ -6,30 +6,30 @@
<script src="../../resources/check-layout.js"></script>
<style type="text/css">
.grid {
- -webkit-grid-auto-flow: row dense;
+ grid-auto-flow: row dense;
}
#firstGridItem {
- -webkit-grid-row: auto;
- -webkit-grid-column: column;
+ grid-row: auto;
+ grid-column: column;
}
#secondGridItem {
- -webkit-grid-row: row;
- -webkit-grid-column: auto;
+ grid-row: row;
+ grid-column: auto;
}
#thirdGridItem {
- -webkit-grid-row: auto;
- -webkit-grid-column: auto;
+ grid-row: auto;
+ grid-column: auto;
}
</style>
<script>
function testGridDefinitions(gridTemplateRows, gridTemplateColumns, firstGridItemData, secondGridItemData, thirdGridItemData)
{
var gridElement = document.getElementsByClassName("grid")[0];
- gridElement.style.webkitGridTemplateRows = gridTemplateRows;
- gridElement.style.webkitGridTemplateColumns = gridTemplateColumns;
+ gridElement.style.gridTemplateRows = gridTemplateRows;
+ gridElement.style.gridTemplateColumns = gridTemplateColumns;
var firstGridItem = document.getElementById("firstGridItem");
firstGridItem.setAttribute("data-expected-width", firstGridItemData.width);
diff --git a/LayoutTests/fast/css-grid-layout/grid-container-ignore-first-letter.html b/LayoutTests/fast/css-grid-layout/grid-container-ignore-first-letter.html
index 4e06f4e..d1786d5 100644
--- a/LayoutTests/fast/css-grid-layout/grid-container-ignore-first-letter.html
+++ b/LayoutTests/fast/css-grid-layout/grid-container-ignore-first-letter.html
@@ -22,22 +22,22 @@
.grid-before::before {
content: "Anonymous item.";
- display: -webkit-grid;
+ display: grid;
}
.grid-after::before {
content: "Anonymous item.";
- display: -webkit-grid;
+ display: grid;
}
.inline-grid-before::before {
content: "Anonymous item.";
- display: -webkit-inline-grid;
+ display: inline-grid;
}
.inline-grid-after::before {
content: "Anonymous item.";
- display: -webkit-inline-grid;
+ display: inline-grid;
}
.before-after-first-letter::first-letter {
diff --git a/LayoutTests/fast/css-grid-layout/grid-content-alignment-and-self-alignment-spanning.html b/LayoutTests/fast/css-grid-layout/grid-content-alignment-and-self-alignment-spanning.html
index 8329837..f87f8da 100644
--- a/LayoutTests/fast/css-grid-layout/grid-content-alignment-and-self-alignment-spanning.html
+++ b/LayoutTests/fast/css-grid-layout/grid-content-alignment-and-self-alignment-spanning.html
@@ -10,33 +10,33 @@
}
.grid {
- -webkit-grid-auto-columns: 20px;
- -webkit-grid-auto-rows: 40px;
- -webkit-grid-template-areas: "a a b"
+ grid-auto-columns: 20px;
+ grid-auto-rows: 40px;
+ grid-template-areas: "a a b"
"c d b";
position: relative;
width: 300px;
height: 200px;
}
.a {
- -webkit-grid-area: a;
+ grid-area: a;
background-color: blue;
}
.b {
- -webkit-grid-area: b;
+ grid-area: b;
background-color: lime;
}
.c {
- -webkit-grid-area: c;
+ grid-area: c;
background-color: purple;
}
.d {
- -webkit-grid-area: d;
+ grid-area: d;
background-color: orange;
}
.stretchedGrid {
- -webkit-grid-auto-columns: minmax(20px, auto);
- -webkit-grid-auto-rows: minmax(40px, auto);
+ grid-auto-columns: minmax(20px, auto);
+ grid-auto-rows: minmax(40px, auto);
}
diff --git a/LayoutTests/fast/css-grid-layout/grid-content-alignment-and-self-alignment.html b/LayoutTests/fast/css-grid-layout/grid-content-alignment-and-self-alignment.html
index 8580a58..a04bb5b 100644
--- a/LayoutTests/fast/css-grid-layout/grid-content-alignment-and-self-alignment.html
+++ b/LayoutTests/fast/css-grid-layout/grid-content-alignment-and-self-alignment.html
@@ -4,8 +4,8 @@
<style>
.grid {
- -webkit-grid-template-columns: 200px 100px;
- -webkit-grid-template-rows: 100px 50px;
+ grid-template-columns: 200px 100px;
+ grid-template-rows: 100px 50px;
width: 500px;
height: 350px;
position: relative;
@@ -13,7 +13,7 @@
}
.gridGaps {
- -webkit-grid-gap: 10px 20px;
+ grid-gap: 10px 20px;
}
</style>
diff --git a/LayoutTests/fast/css-grid-layout/grid-content-alignment-overflow.html b/LayoutTests/fast/css-grid-layout/grid-content-alignment-overflow.html
index 1064f60..cd4b791 100644
--- a/LayoutTests/fast/css-grid-layout/grid-content-alignment-overflow.html
+++ b/LayoutTests/fast/css-grid-layout/grid-content-alignment-overflow.html
@@ -10,8 +10,8 @@
}
.grid {
- -webkit-grid-template-columns: 50px 50px;
- -webkit-grid-template-rows: 100px 100px;
+ grid-template-columns: 50px 50px;
+ grid-template-rows: 100px 100px;
}
.overflowWidth {
diff --git a/LayoutTests/fast/css-grid-layout/grid-content-alignment-stretch-only-valid-for-auto-sized-tracks.html b/LayoutTests/fast/css-grid-layout/grid-content-alignment-stretch-only-valid-for-auto-sized-tracks.html
index 849d7db..f488309 100644
--- a/LayoutTests/fast/css-grid-layout/grid-content-alignment-stretch-only-valid-for-auto-sized-tracks.html
+++ b/LayoutTests/fast/css-grid-layout/grid-content-alignment-stretch-only-valid-for-auto-sized-tracks.html
@@ -33,15 +33,15 @@
}
/* track sizes allowed to be stetched */
-.autoTracks { -webkit-grid: auto auto / auto auto; }
-.autoMaxTracks { -webkit-grid: minmax(20px, auto) minmax(20px, auto) / minmax(40px, auto) minmax(40px, auto); }
+.autoTracks { grid: auto auto / auto auto; }
+.autoMaxTracks { grid: minmax(20px, auto) minmax(20px, auto) / minmax(40px, auto) minmax(40px, auto); }
/* content-sized tracks disallowed to be stetched */
-.minContentTracks { -webkit-grid: -webkit-min-content -webkit-min-content / -webkit-min-content -webkit-min-content; }
-.maxContentTracks { -webkit-grid: -webkit-max-content -webkit-max-content / -webkit-max-content -webkit-max-content; }
-.minMaxWithMaxContentTracks { -webkit-grid: minmax(20px, -webkit-max-content) minmax(20px, -webkit-max-content) / minmax(20px, -webkit-max-content) minmax(20px, -webkit-max-content); }
-.minMaxWithMinContentTracks { -webkit-grid: minmax(20px, -webkit-min-content) minmax(20px, -webkit-min-content) / minmax(20px, -webkit-min-content) minmax(20px, -webkit-min-content); }
-.minMaxWithMinAutoTracks { -webkit-grid: minmax(auto, -webkit-max-content) minmax(auto, -webkit-max-content) / minmax(auto, -webkit-max-content) minmax(auto, -webkit-max-content); }
+.minContentTracks { grid: -webkit-min-content -webkit-min-content / -webkit-min-content -webkit-min-content; }
+.maxContentTracks { grid: -webkit-max-content -webkit-max-content / -webkit-max-content -webkit-max-content; }
+.minMaxWithMaxContentTracks { grid: minmax(20px, -webkit-max-content) minmax(20px, -webkit-max-content) / minmax(20px, -webkit-max-content) minmax(20px, -webkit-max-content); }
+.minMaxWithMinContentTracks { grid: minmax(20px, -webkit-min-content) minmax(20px, -webkit-min-content) / minmax(20px, -webkit-min-content) minmax(20px, -webkit-min-content); }
+.minMaxWithMinAutoTracks { grid: minmax(auto, -webkit-max-content) minmax(auto, -webkit-max-content) / minmax(auto, -webkit-max-content) minmax(auto, -webkit-max-content); }
</style>
</head>
diff --git a/LayoutTests/fast/css-grid-layout/grid-content-alignment-stretch-with-different-sized-tracks.html b/LayoutTests/fast/css-grid-layout/grid-content-alignment-stretch-with-different-sized-tracks.html
index aacf194..d42cede 100644
--- a/LayoutTests/fast/css-grid-layout/grid-content-alignment-stretch-with-different-sized-tracks.html
+++ b/LayoutTests/fast/css-grid-layout/grid-content-alignment-stretch-with-different-sized-tracks.html
@@ -16,12 +16,12 @@
align-content: stretch;
}
.fixedAndAutoTracks {
- -webkit-grid-template-columns: 80px auto 100px;
- -webkit-grid-template-rows: auto 100px auto;
+ grid-template-columns: 80px auto 100px;
+ grid-template-rows: auto 100px auto;
}
.flexibleAndAutoTracks {
- -webkit-grid-template-columns: .5fr auto .5fr;
- -webkit-grid-template-rows: auto 1fr auto;
+ grid-template-columns: .5fr auto .5fr;
+ grid-template-rows: auto 1fr auto;
}
</style>
</head>
diff --git a/LayoutTests/fast/css-grid-layout/grid-content-alignment-with-span-vertical-lr.html b/LayoutTests/fast/css-grid-layout/grid-content-alignment-with-span-vertical-lr.html
index e03333e..ae1564a 100644
--- a/LayoutTests/fast/css-grid-layout/grid-content-alignment-with-span-vertical-lr.html
+++ b/LayoutTests/fast/css-grid-layout/grid-content-alignment-with-span-vertical-lr.html
@@ -10,33 +10,33 @@
}
.grid {
- -webkit-grid-auto-columns: 20px;
- -webkit-grid-auto-rows: 40px;
- -webkit-grid-template-areas: "a a b"
+ grid-auto-columns: 20px;
+ grid-auto-rows: 40px;
+ grid-template-areas: "a a b"
"c d b";
position: relative;
width: 200px;
height: 300px;
}
.a {
- -webkit-grid-area: a;
+ grid-area: a;
background-color: blue;
}
.b {
- -webkit-grid-area: b;
+ grid-area: b;
background-color: lime;
}
.c {
- -webkit-grid-area: c;
+ grid-area: c;
background-color: purple;
}
.d {
- -webkit-grid-area: d;
+ grid-area: d;
background-color: orange;
}
.stretchedGrid {
- -webkit-grid-auto-columns: auto;
- -webkit-grid-auto-rows: auto;
+ grid-auto-columns: auto;
+ grid-auto-rows: auto;
}
</style>
</head>
diff --git a/LayoutTests/fast/css-grid-layout/grid-content-alignment-with-span-vertical-rl.html b/LayoutTests/fast/css-grid-layout/grid-content-alignment-with-span-vertical-rl.html
index 14b4ebb..e160c0c 100644
--- a/LayoutTests/fast/css-grid-layout/grid-content-alignment-with-span-vertical-rl.html
+++ b/LayoutTests/fast/css-grid-layout/grid-content-alignment-with-span-vertical-rl.html
@@ -10,33 +10,33 @@
}
.grid {
- -webkit-grid-auto-columns: 20px;
- -webkit-grid-auto-rows: 40px;
- -webkit-grid-template-areas: "a a b"
+ grid-auto-columns: 20px;
+ grid-auto-rows: 40px;
+ grid-template-areas: "a a b"
"c d b";
position: relative;
width: 200px;
height: 300px;
}
.a {
- -webkit-grid-area: a;
+ grid-area: a;
background-color: blue;
}
.b {
- -webkit-grid-area: b;
+ grid-area: b;
background-color: lime;
}
.c {
- -webkit-grid-area: c;
+ grid-area: c;
background-color: purple;
}
.d {
- -webkit-grid-area: d;
+ grid-area: d;
background-color: orange;
}
.stretchedGrid {
- -webkit-grid-auto-columns: auto;
- -webkit-grid-auto-rows: auto;
+ grid-auto-columns: auto;
+ grid-auto-rows: auto;
}
</style>
</head>
diff --git a/LayoutTests/fast/css-grid-layout/grid-content-alignment-with-span.html b/LayoutTests/fast/css-grid-layout/grid-content-alignment-with-span.html
index c559c69..5c66455 100644
--- a/LayoutTests/fast/css-grid-layout/grid-content-alignment-with-span.html
+++ b/LayoutTests/fast/css-grid-layout/grid-content-alignment-with-span.html
@@ -10,33 +10,33 @@
}
.grid {
- -webkit-grid-auto-columns: 20px;
- -webkit-grid-auto-rows: 40px;
- -webkit-grid-template-areas: "a a b"
+ grid-auto-columns: 20px;
+ grid-auto-rows: 40px;
+ grid-template-areas: "a a b"
"c d b";
position: relative;
width: 300px;
height: 200px;
}
.a {
- -webkit-grid-area: a;
+ grid-area: a;
background-color: blue;
}
.b {
- -webkit-grid-area: b;
+ grid-area: b;
background-color: lime;
}
.c {
- -webkit-grid-area: c;
+ grid-area: c;
background-color: purple;
}
.d {
- -webkit-grid-area: d;
+ grid-area: d;
background-color: orange;
}
.stretchedGrid {
- -webkit-grid-auto-columns: auto;
- -webkit-grid-auto-rows: auto;
+ grid-auto-columns: auto;
+ grid-auto-rows: auto;
}
</style>
</head>
diff --git a/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution-expected.txt b/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution-expected.txt
index 5127415..bc4aac3 100644
--- a/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution-expected.txt
@@ -1,49 +1,49 @@
-PASS window.getComputedStyle(gridMinContentFixedAndAuto, '').getPropertyValue('-webkit-grid-template-columns') is "15px 75px"
-PASS window.getComputedStyle(gridAutoAndAuto, '').getPropertyValue('-webkit-grid-template-columns') is "45px 45px"
-PASS window.getComputedStyle(gridMinContentAndMinContentFixed, '').getPropertyValue('-webkit-grid-template-columns') is "20px 30px"
-PASS window.getComputedStyle(gridMaxContentAndMinContent, '').getPropertyValue('-webkit-grid-template-columns') is "70px 20px"
-PASS window.getComputedStyle(gridFixedMinContentAndMaxContent, '').getPropertyValue('-webkit-grid-template-columns') is "10px 80px"
-PASS window.getComputedStyle(gridFixedMaxContentAndMinContent, '').getPropertyValue('-webkit-grid-template-columns') is "60px 30px"
-PASS window.getComputedStyle(gridMinContentAndMaxContentFixed, '').getPropertyValue('-webkit-grid-template-columns') is "20px 70px"
-PASS window.getComputedStyle(gridMaxContentFixedAndAuto, '').getPropertyValue('-webkit-grid-template-columns') is "65px 25px"
-PASS window.getComputedStyle(gridAutoMinContent, '').getPropertyValue('-webkit-grid-template-columns') is "70px 20px"
-PASS window.getComputedStyle(gridAutoMaxContent, '').getPropertyValue('-webkit-grid-template-columns') is "20px 70px"
-PASS window.getComputedStyle(gridMaxContentAndMinContentFixed, '').getPropertyValue('-webkit-grid-template-columns') is "70px 20px"
-PASS window.getComputedStyle(gridMaxContentAndMaxContentFixed, '').getPropertyValue('-webkit-grid-template-columns') is "55px 35px"
+PASS window.getComputedStyle(gridMinContentFixedAndAuto, '').getPropertyValue('grid-template-columns') is "15px 75px"
+PASS window.getComputedStyle(gridAutoAndAuto, '').getPropertyValue('grid-template-columns') is "45px 45px"
+PASS window.getComputedStyle(gridMinContentAndMinContentFixed, '').getPropertyValue('grid-template-columns') is "20px 30px"
+PASS window.getComputedStyle(gridMaxContentAndMinContent, '').getPropertyValue('grid-template-columns') is "70px 20px"
+PASS window.getComputedStyle(gridFixedMinContentAndMaxContent, '').getPropertyValue('grid-template-columns') is "10px 80px"
+PASS window.getComputedStyle(gridFixedMaxContentAndMinContent, '').getPropertyValue('grid-template-columns') is "60px 30px"
+PASS window.getComputedStyle(gridMinContentAndMaxContentFixed, '').getPropertyValue('grid-template-columns') is "20px 70px"
+PASS window.getComputedStyle(gridMaxContentFixedAndAuto, '').getPropertyValue('grid-template-columns') is "65px 25px"
+PASS window.getComputedStyle(gridAutoMinContent, '').getPropertyValue('grid-template-columns') is "70px 20px"
+PASS window.getComputedStyle(gridAutoMaxContent, '').getPropertyValue('grid-template-columns') is "20px 70px"
+PASS window.getComputedStyle(gridMaxContentAndMinContentFixed, '').getPropertyValue('grid-template-columns') is "70px 20px"
+PASS window.getComputedStyle(gridMaxContentAndMaxContentFixed, '').getPropertyValue('grid-template-columns') is "55px 35px"
Check that items are processed by ascending span to compute track breadths forbidding extra space distribution.
-PASS window.getComputedStyle(gridMinContentFixedAndAutoUnsortedConstrained, '').getPropertyValue('-webkit-grid-template-columns') is "0px 40px"
-PASS window.getComputedStyle(gridAutoAndAutoUnsortedConstrained, '').getPropertyValue('-webkit-grid-template-columns') is "10px 30px"
-PASS window.getComputedStyle(gridMinContentAndMinContentFixedUnsortedConstrained, '').getPropertyValue('-webkit-grid-template-columns') is "0px 40px"
-PASS window.getComputedStyle(gridMaxContentAndMinContentUnsortedConstrained, '').getPropertyValue('-webkit-grid-template-columns') is "0px 70px"
-PASS window.getComputedStyle(gridFixedMinContentAndMaxContentUnsortedConstrained, '').getPropertyValue('-webkit-grid-template-columns') is "10px 70px"
-PASS window.getComputedStyle(gridFixedMaxContentAndMinContentUnsortedConstrained, '').getPropertyValue('-webkit-grid-template-columns') is "10px 40px"
-PASS window.getComputedStyle(gridMinContentAndMaxContentFixedUnsortedConstrained, '').getPropertyValue('-webkit-grid-template-columns') is "0px 90px"
-PASS window.getComputedStyle(gridMaxContentFixedAndAutoUnsortedConstrained, '').getPropertyValue('-webkit-grid-template-columns') is "10px 40px"
-PASS window.getComputedStyle(gridAutoMinContentUnsortedConstrained, '').getPropertyValue('-webkit-grid-template-columns') is "0px 60px"
-PASS window.getComputedStyle(gridAutoMaxContentUnsortedConstrained, '').getPropertyValue('-webkit-grid-template-columns') is "0px 90px"
-PASS window.getComputedStyle(gridMaxContentAndMinContentFixedUnsortedConstrained, '').getPropertyValue('-webkit-grid-template-columns') is "50px 40px"
-PASS window.getComputedStyle(gridMaxContentAndMaxContentFixedUnsortedConstrained, '').getPropertyValue('-webkit-grid-template-columns') is "40px 70px"
+PASS window.getComputedStyle(gridMinContentFixedAndAutoUnsortedConstrained, '').getPropertyValue('grid-template-columns') is "0px 40px"
+PASS window.getComputedStyle(gridAutoAndAutoUnsortedConstrained, '').getPropertyValue('grid-template-columns') is "10px 30px"
+PASS window.getComputedStyle(gridMinContentAndMinContentFixedUnsortedConstrained, '').getPropertyValue('grid-template-columns') is "0px 40px"
+PASS window.getComputedStyle(gridMaxContentAndMinContentUnsortedConstrained, '').getPropertyValue('grid-template-columns') is "0px 70px"
+PASS window.getComputedStyle(gridFixedMinContentAndMaxContentUnsortedConstrained, '').getPropertyValue('grid-template-columns') is "10px 70px"
+PASS window.getComputedStyle(gridFixedMaxContentAndMinContentUnsortedConstrained, '').getPropertyValue('grid-template-columns') is "10px 40px"
+PASS window.getComputedStyle(gridMinContentAndMaxContentFixedUnsortedConstrained, '').getPropertyValue('grid-template-columns') is "0px 90px"
+PASS window.getComputedStyle(gridMaxContentFixedAndAutoUnsortedConstrained, '').getPropertyValue('grid-template-columns') is "10px 40px"
+PASS window.getComputedStyle(gridAutoMinContentUnsortedConstrained, '').getPropertyValue('grid-template-columns') is "0px 60px"
+PASS window.getComputedStyle(gridAutoMaxContentUnsortedConstrained, '').getPropertyValue('grid-template-columns') is "0px 90px"
+PASS window.getComputedStyle(gridMaxContentAndMinContentFixedUnsortedConstrained, '').getPropertyValue('grid-template-columns') is "50px 40px"
+PASS window.getComputedStyle(gridMaxContentAndMaxContentFixedUnsortedConstrained, '').getPropertyValue('grid-template-columns') is "40px 70px"
Check that items are processed by ascending span to compute track breadths allowing extra space distribution.
-PASS window.getComputedStyle(gridMinContentFixedAndAutoUnsorted, '').getPropertyValue('-webkit-grid-template-columns') is "15px 90px"
-PASS window.getComputedStyle(gridAutoAndAutoUnsorted, '').getPropertyValue('-webkit-grid-template-columns') is "60px 30px"
-PASS window.getComputedStyle(gridMinContentAndMinContentFixedUnsorted, '').getPropertyValue('-webkit-grid-template-columns') is "0px 40px"
-PASS window.getComputedStyle(gridMaxContentAndMinContentUnsorted, '').getPropertyValue('-webkit-grid-template-columns') is "0px 70px"
-PASS window.getComputedStyle(gridFixedMinContentAndMaxContentUnsorted, '').getPropertyValue('-webkit-grid-template-columns') is "10px 70px"
-PASS window.getComputedStyle(gridFixedMaxContentAndMinContentUnsorted, '').getPropertyValue('-webkit-grid-template-columns') is "50px 40px"
-PASS window.getComputedStyle(gridMinContentAndMaxContentFixedUnsorted, '').getPropertyValue('-webkit-grid-template-columns') is "0px 90px"
-PASS window.getComputedStyle(gridMaxContentFixedAndAutoUnsorted, '').getPropertyValue('-webkit-grid-template-columns') is "15px 70px"
-PASS window.getComputedStyle(gridAutoMinContentUnsorted, '').getPropertyValue('-webkit-grid-template-columns') is "50px 60px"
-PASS window.getComputedStyle(gridAutoMaxContentUnsorted, '').getPropertyValue('-webkit-grid-template-columns') is "0px 90px"
-PASS window.getComputedStyle(gridMaxContentAndMinContentFixedUnsorted, '').getPropertyValue('-webkit-grid-template-columns') is "50px 40px"
-PASS window.getComputedStyle(gridMaxContentAndMaxContentFixedUnsorted, '').getPropertyValue('-webkit-grid-template-columns') is "40px 70px"
-PASS window.getComputedStyle(gridMinContentFixedAndAutoAboveLimits, '').getPropertyValue('-webkit-grid-template-columns') is "15px 95px"
-PASS window.getComputedStyle(gridMaxContentFixedAndAutoAboveLimits, '').getPropertyValue('-webkit-grid-template-columns') is "15px 135px"
-PASS window.getComputedStyle(gridMinContentFixedAndFixedFixedAndAuto, '').getPropertyValue('-webkit-grid-template-columns') is "20px 20px 60px"
-PASS window.getComputedStyle(gridAutoAndFixedFixedAndMaxContentFixed, '').getPropertyValue('-webkit-grid-template-columns') is "110px 20px 20px"
-PASS window.getComputedStyle(gridMaxContentAndMaxContentFixedAndMaxContent, '').getPropertyValue('-webkit-grid-template-columns') is "70px 20px 50px"
-PASS window.getComputedStyle(gridAutoAndMinContentFixedAndMinContent, '').getPropertyValue('-webkit-grid-template-columns') is "55px 30px 65px"
+PASS window.getComputedStyle(gridMinContentFixedAndAutoUnsorted, '').getPropertyValue('grid-template-columns') is "15px 90px"
+PASS window.getComputedStyle(gridAutoAndAutoUnsorted, '').getPropertyValue('grid-template-columns') is "60px 30px"
+PASS window.getComputedStyle(gridMinContentAndMinContentFixedUnsorted, '').getPropertyValue('grid-template-columns') is "0px 40px"
+PASS window.getComputedStyle(gridMaxContentAndMinContentUnsorted, '').getPropertyValue('grid-template-columns') is "0px 70px"
+PASS window.getComputedStyle(gridFixedMinContentAndMaxContentUnsorted, '').getPropertyValue('grid-template-columns') is "10px 70px"
+PASS window.getComputedStyle(gridFixedMaxContentAndMinContentUnsorted, '').getPropertyValue('grid-template-columns') is "50px 40px"
+PASS window.getComputedStyle(gridMinContentAndMaxContentFixedUnsorted, '').getPropertyValue('grid-template-columns') is "0px 90px"
+PASS window.getComputedStyle(gridMaxContentFixedAndAutoUnsorted, '').getPropertyValue('grid-template-columns') is "15px 70px"
+PASS window.getComputedStyle(gridAutoMinContentUnsorted, '').getPropertyValue('grid-template-columns') is "50px 60px"
+PASS window.getComputedStyle(gridAutoMaxContentUnsorted, '').getPropertyValue('grid-template-columns') is "0px 90px"
+PASS window.getComputedStyle(gridMaxContentAndMinContentFixedUnsorted, '').getPropertyValue('grid-template-columns') is "50px 40px"
+PASS window.getComputedStyle(gridMaxContentAndMaxContentFixedUnsorted, '').getPropertyValue('grid-template-columns') is "40px 70px"
+PASS window.getComputedStyle(gridMinContentFixedAndAutoAboveLimits, '').getPropertyValue('grid-template-columns') is "15px 95px"
+PASS window.getComputedStyle(gridMaxContentFixedAndAutoAboveLimits, '').getPropertyValue('grid-template-columns') is "15px 135px"
+PASS window.getComputedStyle(gridMinContentFixedAndFixedFixedAndAuto, '').getPropertyValue('grid-template-columns') is "20px 20px 60px"
+PASS window.getComputedStyle(gridAutoAndFixedFixedAndMaxContentFixed, '').getPropertyValue('grid-template-columns') is "110px 20px 20px"
+PASS window.getComputedStyle(gridMaxContentAndMaxContentFixedAndMaxContent, '').getPropertyValue('grid-template-columns') is "70px 20px 50px"
+PASS window.getComputedStyle(gridAutoAndMinContentFixedAndMinContent, '').getPropertyValue('grid-template-columns') is "55px 30px 65px"
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution.html b/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution.html
index 62b62ea..1c2a165 100644
--- a/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution.html
+++ b/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution.html
@@ -7,52 +7,52 @@
font: 10px/1 Ahem;
}
.gridMinContentFixedAndAuto {
- -webkit-grid-template-columns: minmax(-webkit-min-content, 15px) auto;
+ grid-template-columns: minmax(-webkit-min-content, 15px) auto;
}
.gridMaxContentFixedAndAuto {
- -webkit-grid-template-columns: minmax(-webkit-max-content, 15px) auto;
+ grid-template-columns: minmax(-webkit-max-content, 15px) auto;
}
.gridAutoAndAuto {
- -webkit-grid-template-columns: auto auto;
+ grid-template-columns: auto auto;
}
.gridMinContentAndMinContentFixed {
- -webkit-grid-template-columns: -webkit-min-content minmax(-webkit-min-content, 30px);
+ grid-template-columns: -webkit-min-content minmax(-webkit-min-content, 30px);
}
.gridMinContentAndMaxContentFixed {
- -webkit-grid-template-columns: -webkit-min-content minmax(-webkit-max-content, 30px);
+ grid-template-columns: -webkit-min-content minmax(-webkit-max-content, 30px);
}
.gridMaxContentAndMinContent {
- -webkit-grid-template-columns: -webkit-max-content -webkit-min-content;
+ grid-template-columns: -webkit-max-content -webkit-min-content;
}
.gridFixedMinContentAndMaxContent {
- -webkit-grid-template-columns: minmax(10px, -webkit-min-content) -webkit-max-content;
+ grid-template-columns: minmax(10px, -webkit-min-content) -webkit-max-content;
}
.gridFixedMaxContentAndMinContent {
- -webkit-grid-template-columns: minmax(10px, -webkit-max-content) -webkit-min-content;
+ grid-template-columns: minmax(10px, -webkit-max-content) -webkit-min-content;
}
.gridAutoMinContent {
- -webkit-grid-template-columns: auto -webkit-min-content;
+ grid-template-columns: auto -webkit-min-content;
}
.gridAutoMaxContent {
- -webkit-grid-template-columns: auto -webkit-max-content;
+ grid-template-columns: auto -webkit-max-content;
}
.gridMaxContentAndMinContentFixed {
- -webkit-grid-template-columns: -webkit-max-content minmax(-webkit-min-content, 35px);
+ grid-template-columns: -webkit-max-content minmax(-webkit-min-content, 35px);
}
.gridMaxContentAndMaxContentFixed {
- -webkit-grid-template-columns: -webkit-max-content minmax(-webkit-max-content, 35px);
+ grid-template-columns: -webkit-max-content minmax(-webkit-max-content, 35px);
}
.gridMinContentFixedAndFixedFixedAndAuto {
- -webkit-grid-template-columns: minmax(-webkit-min-content, 20px) minmax(20px, 30px) auto;
+ grid-template-columns: minmax(-webkit-min-content, 20px) minmax(20px, 30px) auto;
}
.gridAutoAndFixedFixedAndMaxContentFixed {
- -webkit-grid-template-columns: auto minmax(20px, 30px) minmax(-webkit-max-content, 20px);
+ grid-template-columns: auto minmax(20px, 30px) minmax(-webkit-max-content, 20px);
}
.gridMaxContentAndMaxContentFixedAndMaxContent {
- -webkit-grid-template-columns: -webkit-max-content minmax(-webkit-max-content, 20px) -webkit-max-content;
+ grid-template-columns: -webkit-max-content minmax(-webkit-max-content, 20px) -webkit-max-content;
}
.gridAutoAndMinContentFixedAndMinContent {
- -webkit-grid-template-columns: auto minmax(-webkit-min-content, 30px) -webkit-min-content;
+ grid-template-columns: auto minmax(-webkit-min-content, 30px) -webkit-min-content;
}
</style>
@@ -304,20 +304,20 @@
<div class="grid gridMaxContentAndMaxContentFixedAndMaxContent" id="gridMaxContentAndMaxContentFixedAndMaxContent">
<div class="firstRowFirstColumn">X X X</div>
- <div style="-webkit-grid-row: 1; -webkit-grid-column: 3;">X X</div>
+ <div style="grid-row: 1; grid-column: 3;">X X</div>
<div class="firstRowBothColumn">XX XX XX XX XX</div>
</div>
<div class="grid gridAutoAndMinContentFixedAndMinContent justifyContentStart" id="gridAutoAndMinContentFixedAndMinContent">
<div class="firstRowFirstColumn">XX</div>
<div class="firstRowBothColumn">XXXXXXXXXXXXXXX</div>
- <div style="-webkit-grid-row: 1; -webkit-grid-column: 3;">XXX XXX</div>
+ <div style="grid-row: 1; grid-column: 3;">XXX XXX</div>
</div>
<script>
function testGridColumnsValues(id, computedColumnValue)
{
- shouldBeEqualToString("window.getComputedStyle(" + id + ", '').getPropertyValue('-webkit-grid-template-columns')", computedColumnValue);
+ shouldBeEqualToString("window.getComputedStyle(" + id + ", '').getPropertyValue('grid-template-columns')", computedColumnValue);
}
testGridColumnsValues("gridMinContentFixedAndAuto", "15px 75px");
diff --git a/LayoutTests/fast/css-grid-layout/grid-disable.html b/LayoutTests/fast/css-grid-layout/grid-disable.html
index be51d4a..8ce12f0 100644
--- a/LayoutTests/fast/css-grid-layout/grid-disable.html
+++ b/LayoutTests/fast/css-grid-layout/grid-disable.html
@@ -4,8 +4,8 @@
window.internals.setCSSGridLayoutEnabled(false);
</script>
-<div id="grid" style="display: -webkit-grid"></div>
-<div id="inlinegrid" style="display: -webkit-inline-grid"></div>
+<div id="grid" style="display: grid"></div>
+<div id="inlinegrid" style="display: inline-grid"></div>
<script src="../../resources/js-test-pre.js"></script>
<script>
diff --git a/LayoutTests/fast/css-grid-layout/grid-dynamic-updates-relayout.html b/LayoutTests/fast/css-grid-layout/grid-dynamic-updates-relayout.html
index 65950dc..2804105 100644
--- a/LayoutTests/fast/css-grid-layout/grid-dynamic-updates-relayout.html
+++ b/LayoutTests/fast/css-grid-layout/grid-dynamic-updates-relayout.html
@@ -7,8 +7,8 @@
function testLayout(gridElementID, gridTracks, size)
{
var gridElement = document.getElementById(gridElementID);
- gridElement.style.webkitGridTemplateColumns = gridTracks.columns;
- gridElement.style.webkitGridTemplateRows = gridTracks.rows;
+ gridElement.style.gridTemplateColumns = gridTracks.columns;
+ gridElement.style.gridTemplateRows = gridTracks.rows;
var gridItem = gridElement.firstChild.nextSibling;
gridItem.setAttribute("data-expected-width", size.width);
gridItem.setAttribute("data-expected-height", size.height);
diff --git a/LayoutTests/fast/css-grid-layout/grid-element-auto-repeat-get-set-expected.txt b/LayoutTests/fast/css-grid-layout/grid-element-auto-repeat-get-set-expected.txt
index 14c5697..4792a91 100644
--- a/LayoutTests/fast/css-grid-layout/grid-element-auto-repeat-get-set-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/grid-element-auto-repeat-get-set-expected.txt
@@ -1,59 +1,59 @@
-Test that setting/getting -webkit-grid-template-{columns|rows} with repeat(auto-fill|auto-fit,) works as expected
+Test that setting/getting grid-template-{columns|rows} with repeat(auto-fill|auto-fit,) works as expected
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
Test auto-repeat syntax.
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[foo bar] 10px"
-PASS element.style.webkitGridTemplateColumns is "[foo bar] 10px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "20px [foo bar]"
-PASS element.style.webkitGridTemplateRows is "2em [foo bar]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[foo bar] 800px"
-PASS element.style.webkitGridTemplateColumns is "[foo bar] minmax(10px, 1fr)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "[foo] 20px [bar]"
-PASS element.style.webkitGridTemplateRows is "[foo] minmax(2em, -webkit-max-content) [bar]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "100px 20px 20px"
-PASS element.style.webkitGridTemplateColumns is "minmax(10px, 100px) 20px 20px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "70px 20px [bar foo] 10px [foo] 10px"
-PASS element.style.webkitGridTemplateRows is "70px minmax(2em, -webkit-max-content) [bar] [foo] 1em [foo] 1em"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[foo bar] 10px"
-PASS element.style.webkitGridTemplateColumns is "[foo bar] 10px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "20px [foo bar]"
-PASS element.style.webkitGridTemplateRows is "2em [foo bar]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[foo bar] 800px"
-PASS element.style.webkitGridTemplateColumns is "[foo bar] minmax(10px, 1fr)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "[foo] 20px [bar]"
-PASS element.style.webkitGridTemplateRows is "[foo] minmax(2em, -webkit-max-content) [bar]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "10px 20px 20px"
-PASS element.style.webkitGridTemplateColumns is "minmax(10px, -webkit-min-content) 20px 20px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "60px 20px [bar foo] 10px [foo] 10px"
-PASS element.style.webkitGridTemplateRows is "10% minmax(2em, -webkit-max-content) [bar] [foo] 1em [foo] 1em"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[foo bar] 10px"
+PASS element.style.gridTemplateColumns is "[foo bar] 10px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "20px [foo bar]"
+PASS element.style.gridTemplateRows is "2em [foo bar]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[foo bar] 800px"
+PASS element.style.gridTemplateColumns is "[foo bar] minmax(10px, 1fr)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "[foo] 20px [bar]"
+PASS element.style.gridTemplateRows is "[foo] minmax(2em, -webkit-max-content) [bar]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "100px 20px 20px"
+PASS element.style.gridTemplateColumns is "minmax(10px, 100px) 20px 20px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "70px 20px [bar foo] 10px [foo] 10px"
+PASS element.style.gridTemplateRows is "70px minmax(2em, -webkit-max-content) [bar] [foo] 1em [foo] 1em"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[foo bar] 10px"
+PASS element.style.gridTemplateColumns is "[foo bar] 10px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "20px [foo bar]"
+PASS element.style.gridTemplateRows is "2em [foo bar]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[foo bar] 800px"
+PASS element.style.gridTemplateColumns is "[foo bar] minmax(10px, 1fr)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "[foo] 20px [bar]"
+PASS element.style.gridTemplateRows is "[foo] minmax(2em, -webkit-max-content) [bar]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "10px 20px 20px"
+PASS element.style.gridTemplateColumns is "minmax(10px, -webkit-min-content) 20px 20px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "60px 20px [bar foo] 10px [foo] 10px"
+PASS element.style.gridTemplateRows is "10% minmax(2em, -webkit-max-content) [bar] [foo] 1em [foo] 1em"
Test invalid repeat syntax.
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/grid-element-auto-repeat-get-set.html b/LayoutTests/fast/css-grid-layout/grid-element-auto-repeat-get-set.html
index f7defed..0d22c84 100644
--- a/LayoutTests/fast/css-grid-layout/grid-element-auto-repeat-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/grid-element-auto-repeat-get-set.html
@@ -6,7 +6,7 @@
<body>
</body>
<script>
- description('Test that setting/getting -webkit-grid-template-{columns|rows} with repeat(auto-fill|auto-fit,) works as expected');
+ description('Test that setting/getting grid-template-{columns|rows} with repeat(auto-fill|auto-fit,) works as expected');
debug("Test auto-repeat syntax.");
testGridTemplatesSetJSValues("repeat(auto-fill, [foo bar] 10px)", "repeat(auto-fill, 2em [foo bar])", "[foo bar] 10px", "20px [foo bar]", "[foo bar] 10px", "2em [foo bar]");
@@ -21,8 +21,8 @@
function testInvalidSyntax(gridColumn) {
element = document.createElement("div");
document.body.appendChild(element);
- element.style.webkitGridTemplateColumns = gridColumn;
- shouldBeEqualToString("window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "none");
+ element.style.gridTemplateColumns = gridColumn;
+ shouldBeEqualToString("window.getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "none");
document.body.removeChild(element);
}
diff --git a/LayoutTests/fast/css-grid-layout/grid-element-border-grid-item.html b/LayoutTests/fast/css-grid-layout/grid-element-border-grid-item.html
index 6c49c54..29202e9 100644
--- a/LayoutTests/fast/css-grid-layout/grid-element-border-grid-item.html
+++ b/LayoutTests/fast/css-grid-layout/grid-element-border-grid-item.html
@@ -8,8 +8,8 @@
border-right: 30px dotted blue;
border-bottom: 40px dotted blue;
border-left: 50px dotted blue;
- -webkit-grid-template-rows: 100px 100px;
- -webkit-grid-template-columns: 100px 100px;
+ grid-template-rows: 100px 100px;
+ grid-template-columns: 100px 100px;
width: 200px;
}
</style>
diff --git a/LayoutTests/fast/css-grid-layout/grid-element-border-padding-grid-item.html b/LayoutTests/fast/css-grid-layout/grid-element-border-padding-grid-item.html
index 2ab3452..52824c8 100644
--- a/LayoutTests/fast/css-grid-layout/grid-element-border-padding-grid-item.html
+++ b/LayoutTests/fast/css-grid-layout/grid-element-border-padding-grid-item.html
@@ -9,8 +9,8 @@
border-right: 20px dotted blue;
border-bottom: 30px dotted blue;
border-left: 40px dotted blue;
- -webkit-grid-template-rows: 100px 100px;
- -webkit-grid-template-columns: 100px 100px;
+ grid-template-rows: 100px 100px;
+ grid-template-columns: 100px 100px;
width: 200px;
}
</style>
diff --git a/LayoutTests/fast/css-grid-layout/grid-element-change-columns-repaint.html b/LayoutTests/fast/css-grid-layout/grid-element-change-columns-repaint.html
index a8c799c..00e57f1 100644
--- a/LayoutTests/fast/css-grid-layout/grid-element-change-columns-repaint.html
+++ b/LayoutTests/fast/css-grid-layout/grid-element-change-columns-repaint.html
@@ -5,7 +5,7 @@
function repaintTest()
{
var gridElement = document.getElementsByClassName("grid")[0];
- gridElement.style.webkitGridTemplateColumns = "minmax(50px, 180px) 100px 100px";
+ gridElement.style.gridTemplateColumns = "minmax(50px, 180px) 100px 100px";
}
window.addEventListener("load", runRepaintTest, false);
</script>
@@ -17,8 +17,8 @@
}
.grid {
- -webkit-grid-template-rows: 50px;
- -webkit-grid-template-columns: minmax(100px, 180px) 100px minmax(50px, 100px);
+ grid-template-rows: 50px;
+ grid-template-columns: minmax(100px, 180px) 100px minmax(50px, 100px);
}
.sizedToGridArea {
background-color: purple;
diff --git a/LayoutTests/fast/css-grid-layout/grid-element-change-rows-repaint.html b/LayoutTests/fast/css-grid-layout/grid-element-change-rows-repaint.html
index 495829f..c3345ce 100644
--- a/LayoutTests/fast/css-grid-layout/grid-element-change-rows-repaint.html
+++ b/LayoutTests/fast/css-grid-layout/grid-element-change-rows-repaint.html
@@ -5,7 +5,7 @@
function repaintTest()
{
var gridElement = document.getElementsByClassName("grid")[0];
- gridElement.style.webkitGridTemplateRows = "100px 50px";
+ gridElement.style.gridTemplateRows = "100px 50px";
}
window.addEventListener("load", runRepaintTest, false);
</script>
@@ -17,8 +17,8 @@
}
.grid {
- -webkit-grid-template-rows: 50px 100px;
- -webkit-grid-template-columns: 100px;
+ grid-template-rows: 50px 100px;
+ grid-template-columns: 100px;
}
.sizedToGridArea {
background-color: purple;
diff --git a/LayoutTests/fast/css-grid-layout/grid-element-empty-row-column.html b/LayoutTests/fast/css-grid-layout/grid-element-empty-row-column.html
index 79d4680..89008e2 100644
--- a/LayoutTests/fast/css-grid-layout/grid-element-empty-row-column.html
+++ b/LayoutTests/fast/css-grid-layout/grid-element-empty-row-column.html
@@ -3,12 +3,12 @@
<link href=resources/grid.css rel=stylesheet>
<style>
.gridNoRow {
- -webkit-grid-template-columns: 50px;
+ grid-template-columns: 50px;
/* Make the grid shrink-to-fit. */
position: absolute;
}
.gridNoColumn {
- -webkit-grid-template-rows: 50px 80px;
+ grid-template-rows: 50px 80px;
/* Make the grid shrink-to-fit. */
position: absolute;
}
diff --git a/LayoutTests/fast/css-grid-layout/grid-element-min-max-height.html b/LayoutTests/fast/css-grid-layout/grid-element-min-max-height.html
index 33afcc3..c00c339 100644
--- a/LayoutTests/fast/css-grid-layout/grid-element-min-max-height.html
+++ b/LayoutTests/fast/css-grid-layout/grid-element-min-max-height.html
@@ -6,13 +6,13 @@
<style>
.minHeightGrid {
min-height: 100px;
- -webkit-grid-template-columns: 40px;
- -webkit-grid-template-rows: 50px;
+ grid-template-columns: 40px;
+ grid-template-rows: 50px;
}
.maxHeightGrid {
max-height: 100px;
- -webkit-grid-template-columns: 40px;
- -webkit-grid-template-rows: 150px 50px;
+ grid-template-columns: 40px;
+ grid-template-rows: 150px 50px;
}
.minHeightAutoGrid {
diff --git a/LayoutTests/fast/css-grid-layout/grid-element-min-max-width.html b/LayoutTests/fast/css-grid-layout/grid-element-min-max-width.html
index 3f3288a..88ef528 100644
--- a/LayoutTests/fast/css-grid-layout/grid-element-min-max-width.html
+++ b/LayoutTests/fast/css-grid-layout/grid-element-min-max-width.html
@@ -6,13 +6,13 @@
<style>
.minWidthGrid {
min-width: 100px;
- -webkit-grid-template-columns: 50px;
- -webkit-grid-template-rows: 40px;
+ grid-template-columns: 50px;
+ grid-template-rows: 40px;
}
.maxWidthGrid {
max-width: 100px;
- -webkit-grid-template-columns: 150px 50px;
- -webkit-grid-template-rows: 40px;
+ grid-template-columns: 150px 50px;
+ grid-template-rows: 40px;
}
.minWidthAutoGrid {
diff --git a/LayoutTests/fast/css-grid-layout/grid-element-padding-grid-item.html b/LayoutTests/fast/css-grid-layout/grid-element-padding-grid-item.html
index 50e7a07..a243aa9 100644
--- a/LayoutTests/fast/css-grid-layout/grid-element-padding-grid-item.html
+++ b/LayoutTests/fast/css-grid-layout/grid-element-padding-grid-item.html
@@ -5,8 +5,8 @@
<style>
.grid {
padding: 20px 30px 40px 50px;
- -webkit-grid-template-rows: 100px 100px;
- -webkit-grid-template-columns: 100px 100px;
+ grid-template-rows: 100px 100px;
+ grid-template-columns: 100px 100px;
width: 200px;
}
</style>
diff --git a/LayoutTests/fast/css-grid-layout/grid-element-padding-margin.html b/LayoutTests/fast/css-grid-layout/grid-element-padding-margin.html
index a4da3e6..84da5aa 100644
--- a/LayoutTests/fast/css-grid-layout/grid-element-padding-margin.html
+++ b/LayoutTests/fast/css-grid-layout/grid-element-padding-margin.html
@@ -3,8 +3,8 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-columns: 100px;
- -webkit-grid-template-rows: 50px;
+ grid-template-columns: 100px;
+ grid-template-rows: 50px;
/* Force the grid element to be shrink-to-fit. */
position: absolute;
}
diff --git a/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set-expected.txt b/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set-expected.txt
index 7e3b7ec..deb7d26 100644
--- a/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set-expected.txt
@@ -4,40 +4,40 @@
Test getting grid-template-columns and grid-template-rows set through CSS
-PASS window.getComputedStyle(singleSingleTrackRepeatWithSize, '').getPropertyValue('-webkit-grid-template-columns') is "120px"
-PASS window.getComputedStyle(singleSingleTrackRepeatWithSize, '').getPropertyValue('-webkit-grid-template-rows') is "18px"
-PASS window.getComputedStyle(singleSingleTrackRepeatWithoutSize, '').getPropertyValue('-webkit-grid-template-columns') is "0px"
-PASS window.getComputedStyle(singleSingleTrackRepeatWithoutSize, '').getPropertyValue('-webkit-grid-template-rows') is "18px"
-PASS window.getComputedStyle(twoSingleTrackRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "400px 400px"
-PASS window.getComputedStyle(twoSingleTrackRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "0px 0px"
-PASS window.getComputedStyle(twoSingleTrackRepeatWithChildren, '').getPropertyValue('-webkit-grid-template-columns') is "400px 400px"
-PASS window.getComputedStyle(twoSingleTrackRepeatWithChildren, '').getPropertyValue('-webkit-grid-template-rows') is "44px 77px"
-PASS window.getComputedStyle(twoDoubleTrackRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "33px 120px 0px 120px"
-PASS window.getComputedStyle(twoDoubleTrackRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "10px 77px 10px 0px"
-PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "33px [middle] 250px [end] 0px [middle] 250px [end]"
-PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "10px [start] 77px [end] 10px [start] 0px [end]"
-PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "[before] 0px [before] 0px"
-PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "[before] 10px [before] 10px"
-PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "250px [end]"
-PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "10px [end]"
-PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "[start] 250px 250px"
-PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "[start] 10px 10px"
-PASS window.getComputedStyle(mixRepeatAfterNonRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "[start] 140px 250px 250px"
-PASS window.getComputedStyle(mixRepeatAfterNonRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "44px 10px 10px"
-PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "250px 250px 120px [last]"
-PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "10px 10px [end] 0px"
+PASS window.getComputedStyle(singleSingleTrackRepeatWithSize, '').getPropertyValue('grid-template-columns') is "120px"
+PASS window.getComputedStyle(singleSingleTrackRepeatWithSize, '').getPropertyValue('grid-template-rows') is "18px"
+PASS window.getComputedStyle(singleSingleTrackRepeatWithoutSize, '').getPropertyValue('grid-template-columns') is "0px"
+PASS window.getComputedStyle(singleSingleTrackRepeatWithoutSize, '').getPropertyValue('grid-template-rows') is "18px"
+PASS window.getComputedStyle(twoSingleTrackRepeat, '').getPropertyValue('grid-template-columns') is "400px 400px"
+PASS window.getComputedStyle(twoSingleTrackRepeat, '').getPropertyValue('grid-template-rows') is "0px 0px"
+PASS window.getComputedStyle(twoSingleTrackRepeatWithChildren, '').getPropertyValue('grid-template-columns') is "400px 400px"
+PASS window.getComputedStyle(twoSingleTrackRepeatWithChildren, '').getPropertyValue('grid-template-rows') is "44px 77px"
+PASS window.getComputedStyle(twoDoubleTrackRepeat, '').getPropertyValue('grid-template-columns') is "33px 120px 0px 120px"
+PASS window.getComputedStyle(twoDoubleTrackRepeat, '').getPropertyValue('grid-template-rows') is "10px 77px 10px 0px"
+PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineRepeat, '').getPropertyValue('grid-template-columns') is "33px [middle] 250px [end] 0px [middle] 250px [end]"
+PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineRepeat, '').getPropertyValue('grid-template-rows') is "10px [start] 77px [end] 10px [start] 0px [end]"
+PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepeat, '').getPropertyValue('grid-template-columns') is "[before] 0px [before] 0px"
+PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepeat, '').getPropertyValue('grid-template-rows') is "[before] 10px [before] 10px"
+PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropertyValue('grid-template-columns') is "250px [end]"
+PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropertyValue('grid-template-rows') is "10px [end]"
+PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getPropertyValue('grid-template-columns') is "[start] 250px 250px"
+PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getPropertyValue('grid-template-rows') is "[start] 10px 10px"
+PASS window.getComputedStyle(mixRepeatAfterNonRepeat, '').getPropertyValue('grid-template-columns') is "[start] 140px 250px 250px"
+PASS window.getComputedStyle(mixRepeatAfterNonRepeat, '').getPropertyValue('grid-template-rows') is "44px 10px 10px"
+PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').getPropertyValue('grid-template-columns') is "250px 250px 120px [last]"
+PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').getPropertyValue('grid-template-rows') is "10px 10px [end] 0px"
Test invalid repeat syntax.
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set.html b/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set.html
index 9fbe010..fade1f7 100644
--- a/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set.html
@@ -11,62 +11,62 @@
height: 600px;
}
.gridItem {
- -webkit-grid-column: 1;
- -webkit-grid-row: 1;
+ grid-column: 1;
+ grid-row: 1;
width: 33px;
height: 44px;
}
.gridItem2 {
- -webkit-grid-column: 2;
- -webkit-grid-row: 2;
+ grid-column: 2;
+ grid-row: 2;
width: 66px;
height: 77px;
}
.singleSingleTrackRepeat {
- -webkit-grid-template-rows: repeat(1, 18px);
- -webkit-grid-template-columns: repeat(1, 15%);
+ grid-template-rows: repeat(1, 18px);
+ grid-template-columns: repeat(1, 15%);
}
.twoSingleTrackRepeat {
- -webkit-grid-template-rows: repeat(2, auto);
- -webkit-grid-template-columns: repeat(2, minmax(15px, 50%));
+ grid-template-rows: repeat(2, auto);
+ grid-template-columns: repeat(2, minmax(15px, 50%));
}
.twoDoubleTrackRepeat {
- -webkit-grid-template-rows: repeat(2, minmax(5px, 10px) auto);
- -webkit-grid-template-columns: repeat(2, auto minmax(100px, 120px));
+ grid-template-rows: repeat(2, minmax(5px, 10px) auto);
+ grid-template-columns: repeat(2, auto minmax(100px, 120px));
}
.twoDoubleTrackWithNamedGridLineRepeat {
- -webkit-grid-template-rows: repeat(2, 10px [start] auto [end]);
- -webkit-grid-template-columns: repeat(2, auto [middle] 250px [end]);
+ grid-template-rows: repeat(2, 10px [start] auto [end]);
+ grid-template-columns: repeat(2, auto [middle] 250px [end]);
}
.twoDoubleTrackWithTrailingNamedGridLineRepeat {
- -webkit-grid-template-rows: repeat(2, [before] 10px);
- -webkit-grid-template-columns: repeat(2, [before] auto);
+ grid-template-rows: repeat(2, [before] 10px);
+ grid-template-columns: repeat(2, [before] auto);
}
.trailingNamedGridLineRepeat {
- -webkit-grid-template-rows: repeat(1, 10px) [end];
- -webkit-grid-template-columns: repeat(1, 250px) [end];
+ grid-template-rows: repeat(1, 10px) [end];
+ grid-template-columns: repeat(1, 250px) [end];
}
.leadingNamedGridLineRepeat {
- -webkit-grid-template-rows: [start] repeat(2, 10px);
- -webkit-grid-template-columns: [start] repeat(2, 250px);
+ grid-template-rows: [start] repeat(2, 10px);
+ grid-template-columns: [start] repeat(2, 250px);
}
.mixRepeatAfterNonRepeat {
- -webkit-grid-template-rows: auto repeat(2, 10px);
- -webkit-grid-template-columns: [start] 140px repeat(2, 250px);
+ grid-template-rows: auto repeat(2, 10px);
+ grid-template-columns: [start] 140px repeat(2, 250px);
}
.mixNonRepeatAfterRepeat {
- -webkit-grid-template-rows: repeat(2, 10px) [end] auto;
- -webkit-grid-template-columns: repeat(2, 250px) 15% [last];
+ grid-template-rows: repeat(2, 10px) [end] auto;
+ grid-template-columns: repeat(2, 250px) 15% [last];
}
</style>
<script src="../../resources/js-test-pre.js"></script>
@@ -117,8 +117,8 @@
function testInvalidSyntax(gridColumns) {
element = document.createElement("div");
document.body.appendChild(element);
- element.style.webkitGridTemplateColumns = gridColumns;
- shouldBeEqualToString("window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "none");
+ element.style.gridTemplateColumns = gridColumns;
+ shouldBeEqualToString("window.getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "none");
document.body.removeChild(element);
}
testInvalidSyntax("repeat(");
diff --git a/LayoutTests/fast/css-grid-layout/grid-element-shrink-to-fit.html b/LayoutTests/fast/css-grid-layout/grid-element-shrink-to-fit.html
index f2ed52d..1b0f564 100644
--- a/LayoutTests/fast/css-grid-layout/grid-element-shrink-to-fit.html
+++ b/LayoutTests/fast/css-grid-layout/grid-element-shrink-to-fit.html
@@ -3,8 +3,8 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-rows: 50px 50px;
- -webkit-grid-template-columns: 1fr 1fr;
+ grid-template-rows: 50px 50px;
+ grid-template-columns: 1fr 1fr;
}
.floatPos {
diff --git a/LayoutTests/fast/css-grid-layout/grid-grow-tracks-to-their-max-expected.txt b/LayoutTests/fast/css-grid-layout/grid-grow-tracks-to-their-max-expected.txt
index 660423a..b0bcfb7 100644
--- a/LayoutTests/fast/css-grid-layout/grid-grow-tracks-to-their-max-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/grid-grow-tracks-to-their-max-expected.txt
@@ -1,18 +1,18 @@
Check that tracks are not shrinked if the available space is indefinite.
-PASS window.getComputedStyle(gridContentSizedColumn, '').getPropertyValue('-webkit-grid-template-columns') is "50px"
-PASS window.getComputedStyle(gridContentSizedColumn, '').getPropertyValue('-webkit-grid-template-rows') is "10px"
-PASS window.getComputedStyle(gridContentSizedRow, '').getPropertyValue('-webkit-grid-template-columns') is "40px"
-PASS window.getComputedStyle(gridContentSizedRow, '').getPropertyValue('-webkit-grid-template-rows') is "20px"
+PASS window.getComputedStyle(gridContentSizedColumn, '').getPropertyValue('grid-template-columns') is "50px"
+PASS window.getComputedStyle(gridContentSizedColumn, '').getPropertyValue('grid-template-rows') is "10px"
+PASS window.getComputedStyle(gridContentSizedRow, '').getPropertyValue('grid-template-columns') is "40px"
+PASS window.getComputedStyle(gridContentSizedRow, '').getPropertyValue('grid-template-rows') is "20px"
Check that tracks use the available free space if available.
-PASS window.getComputedStyle(gridContentSizedColumnFreeSpace, '').getPropertyValue('-webkit-grid-template-columns') is "80px"
-PASS window.getComputedStyle(gridContentSizedColumnFreeSpace, '').getPropertyValue('-webkit-grid-template-rows') is "10px"
-PASS window.getComputedStyle(gridContentSizedRowFreeSpace, '').getPropertyValue('-webkit-grid-template-columns') is "40px"
-PASS window.getComputedStyle(gridContentSizedRowFreeSpace, '').getPropertyValue('-webkit-grid-template-rows') is "80px"
-PASS window.getComputedStyle(gridContentSizedColumnFreeSpaceParentDefinite, '').getPropertyValue('-webkit-grid-template-columns') is "80px"
-PASS window.getComputedStyle(gridContentSizedColumnFreeSpaceParentDefinite, '').getPropertyValue('-webkit-grid-template-rows') is "10px"
-PASS window.getComputedStyle(gridContentSizedRowFreeSpaceParentDefinite, '').getPropertyValue('-webkit-grid-template-columns') is "40px"
-PASS window.getComputedStyle(gridContentSizedRowFreeSpaceParentDefinite, '').getPropertyValue('-webkit-grid-template-rows') is "100px"
+PASS window.getComputedStyle(gridContentSizedColumnFreeSpace, '').getPropertyValue('grid-template-columns') is "80px"
+PASS window.getComputedStyle(gridContentSizedColumnFreeSpace, '').getPropertyValue('grid-template-rows') is "10px"
+PASS window.getComputedStyle(gridContentSizedRowFreeSpace, '').getPropertyValue('grid-template-columns') is "40px"
+PASS window.getComputedStyle(gridContentSizedRowFreeSpace, '').getPropertyValue('grid-template-rows') is "80px"
+PASS window.getComputedStyle(gridContentSizedColumnFreeSpaceParentDefinite, '').getPropertyValue('grid-template-columns') is "80px"
+PASS window.getComputedStyle(gridContentSizedColumnFreeSpaceParentDefinite, '').getPropertyValue('grid-template-rows') is "10px"
+PASS window.getComputedStyle(gridContentSizedRowFreeSpaceParentDefinite, '').getPropertyValue('grid-template-columns') is "40px"
+PASS window.getComputedStyle(gridContentSizedRowFreeSpaceParentDefinite, '').getPropertyValue('grid-template-rows') is "100px"
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/grid-grow-tracks-to-their-max.html b/LayoutTests/fast/css-grid-layout/grid-grow-tracks-to-their-max.html
index 4007322..3ca9701 100644
--- a/LayoutTests/fast/css-grid-layout/grid-grow-tracks-to-their-max.html
+++ b/LayoutTests/fast/css-grid-layout/grid-grow-tracks-to-their-max.html
@@ -7,23 +7,23 @@
}
.gridContentSizedColumn {
- -webkit-grid-template-columns: minmax(-webkit-min-content, 20px);
- -webkit-grid-template-rows: 10px;
+ grid-template-columns: minmax(-webkit-min-content, 20px);
+ grid-template-rows: 10px;
}
.gridContentSizedColumnFreeSpace {
- -webkit-grid-template-columns: minmax(-webkit-min-content, 100px);
- -webkit-grid-template-rows: 10px;
+ grid-template-columns: minmax(-webkit-min-content, 100px);
+ grid-template-rows: 10px;
}
.gridContentSizedRow {
- -webkit-grid-template-columns: 40px;
- -webkit-grid-template-rows: minmax(-webkit-max-content, 10px);
+ grid-template-columns: 40px;
+ grid-template-rows: minmax(-webkit-max-content, 10px);
}
.gridContentSizedRowFreeSpace {
- -webkit-grid-template-columns: 40px;
- -webkit-grid-template-rows: minmax(-webkit-max-content, 100px);
+ grid-template-columns: 40px;
+ grid-template-rows: minmax(-webkit-max-content, 100px);
}
.definiteWidth { width: 80px; }
diff --git a/LayoutTests/fast/css-grid-layout/grid-gutters-and-alignment.html b/LayoutTests/fast/css-grid-layout/grid-gutters-and-alignment.html
index 0b70a47..313d613 100644
--- a/LayoutTests/fast/css-grid-layout/grid-gutters-and-alignment.html
+++ b/LayoutTests/fast/css-grid-layout/grid-gutters-and-alignment.html
@@ -8,29 +8,29 @@
body { margin: 0px; }
.grid100And200 {
- -webkit-grid-template-columns: 100px 100px;
- -webkit-grid-template-rows: 200px 200px;
+ grid-template-columns: 100px 100px;
+ grid-template-rows: 200px 200px;
position: relative; /* For the <p> comments */
}
.grid50And100 {
- -webkit-grid: 100px 100px / 50px 50px;
+ grid: 100px 100px / 50px 50px;
width: 200px;
height: 300px;
position: relative; /* For the <p> comments */
}
.gridAuto20And40 {
- -webkit-grid-auto-columns: 20px;
- -webkit-grid-auto-rows: 40px;
+ grid-auto-columns: 20px;
+ grid-auto-rows: 40px;
width: 400px;
height: 300px;
position: relative; /* For the <p> comments */
}
.gridWithPaddingBorder {
- -webkit-grid-template-columns: 100px 200px;
- -webkit-grid-template-rows: 200px 200px;
+ grid-template-columns: 100px 200px;
+ grid-template-rows: 200px 200px;
padding: 10px 15px 20px 30px;
border-width: 5px 10px 15px 20px;
border-style: dotted;
@@ -47,18 +47,18 @@
}
.gridWithAutoRows {
- -webkit-grid-auto-rows: 40px;
+ grid-auto-rows: 40px;
border: 2px solid black;
height: 50px;
width: 20px;
position: relative;
}
-.stretchedGrid { -webkit-grid-auto-columns: auto; }
+.stretchedGrid { grid-auto-columns: auto; }
.gridRowColumnGaps {
- -webkit-grid-row-gap: 17px;
- -webkit-grid-column-gap: 21px;
+ grid-row-gap: 17px;
+ grid-column-gap: 21px;
}
div.grid > div { font: 10px/1 Ahem; }
diff --git a/LayoutTests/fast/css-grid-layout/grid-gutters-and-flex-content.html b/LayoutTests/fast/css-grid-layout/grid-gutters-and-flex-content.html
index baf6421..5beb856 100644
--- a/LayoutTests/fast/css-grid-layout/grid-gutters-and-flex-content.html
+++ b/LayoutTests/fast/css-grid-layout/grid-gutters-and-flex-content.html
@@ -5,23 +5,23 @@
<script src="../../resources/check-layout.js"></script>
<script src="../../resources/js-test.js"></script>
<style>
-.gridPercentAndFlexContent { -webkit-grid-template: 50px / 50% minmax(30px, 2fr); }
-.gridTwoDoubleMaxFlexContent { -webkit-grid-template: 50px / minmax(10px, 0.5fr) minmax(10px, 2fr); }
-.gridIgnoreSecondGridItem { -webkit-grid-template: 50px / minmax(300px, 3fr) minmax(150px, 1fr); }
+.gridPercentAndFlexContent { grid-template: 50px / 50% minmax(30px, 2fr); }
+.gridTwoDoubleMaxFlexContent { grid-template: 50px / minmax(10px, 0.5fr) minmax(10px, 2fr); }
+.gridIgnoreSecondGridItem { grid-template: 50px / minmax(300px, 3fr) minmax(150px, 1fr); }
-.gridRowsPercentAndFlexContent { -webkit-grid-template: minmax(30px, 2fr) 50% / 50px; }
-.gridRowsTwoMaxFlexContent { -webkit-grid-template: minmax(10px, 1fr) minmax(10px, 2fr) / 50px; }
-.gridRowsTwoDoubleMaxFlexContent { -webkit-grid-template: minmax(10px, 0.5fr) minmax(10px, 2fr) / 50px; }
+.gridRowsPercentAndFlexContent { grid-template: minmax(30px, 2fr) 50% / 50px; }
+.gridRowsTwoMaxFlexContent { grid-template: minmax(10px, 1fr) minmax(10px, 2fr) / 50px; }
+.gridRowsTwoDoubleMaxFlexContent { grid-template: minmax(10px, 0.5fr) minmax(10px, 2fr) / 50px; }
-.gridMinMaxFlexFixedAndMinContentAndFixed { -webkit-grid-template-columns: minmax(0.5fr, 35px) -webkit-min-content 25px; }
-.gridMinContentAndMinMaxFixedMinContentAndFlex { -webkit-grid-template-columns: -webkit-min-content minmax(20px, -webkit-min-content) 2fr; }
-.gridMaxContentAndMinMaxFixedMaxContentAndFlex { -webkit-grid-template-columns: -webkit-max-content minmax(20px, -webkit-max-content) 1fr; }
+.gridMinMaxFlexFixedAndMinContentAndFixed { grid-template-columns: minmax(0.5fr, 35px) -webkit-min-content 25px; }
+.gridMinContentAndMinMaxFixedMinContentAndFlex { grid-template-columns: -webkit-min-content minmax(20px, -webkit-min-content) 2fr; }
+.gridMaxContentAndMinMaxFixedMaxContentAndFlex { grid-template-columns: -webkit-max-content minmax(20px, -webkit-max-content) 1fr; }
div.grid > div { font: 10px/1 Ahem; }
.gridRowColumnGaps {
- -webkit-grid-row-gap: 33px;
- -webkit-grid-column-gap: 19px;
+ grid-row-gap: 33px;
+ grid-column-gap: 19px;
}
</style>
@@ -77,28 +77,28 @@
<div style="position: relative; width: 100px;">
<div class="grid gridMinMaxFlexFixedAndMinContentAndFixed gridRowColumnGaps" data-expected-width="100" data-expected-height="199">
- <div style="-webkit-grid-column: 1 / span 2;" data-expected-width="54" data-expected-height="20">XXXX XXXX</div>
- <div style="-webkit-grid-column: 2 / span 2; -webkit-grid-row: 2;" data-expected-width="44" data-expected-height="20">XXX XXX</div>
- <div style="-webkit-grid-column: 1 / -1; -webkit-grid-row: 3;" data-expected-width="98" data-expected-height="20">XXXXX XXXXX</div>
- <div style="-webkit-grid-column: 2 / span 2; -webkit-grid-row: 4;" data-expected-width="44" data-expected-height="40">XX XX XX XX</div>
+ <div style="grid-column: 1 / span 2;" data-expected-width="54" data-expected-height="20">XXXX XXXX</div>
+ <div style="grid-column: 2 / span 2; grid-row: 2;" data-expected-width="44" data-expected-height="20">XXX XXX</div>
+ <div style="grid-column: 1 / -1; grid-row: 3;" data-expected-width="98" data-expected-height="20">XXXXX XXXXX</div>
+ <div style="grid-column: 2 / span 2; grid-row: 4;" data-expected-width="44" data-expected-height="40">XX XX XX XX</div>
</div>
</div>
<div style="position: relative; width: 100px;">
<div class="grid gridMinContentAndMinMaxFixedMinContentAndFlex gridRowColumnGaps" data-expected-width="100" data-expected-height="149">
- <div style="-webkit-grid-column: 2 / span 2;" data-expected-width="80">XXXXX</div>
- <div style="-webkit-grid-column: 1 / -1; -webkit-grid-row: 2;" data-expected-width="100">XXX XXX XXX</div>
- <div style="-webkit-grid-column: 1 / span 2; -webkit-grid-row: 3;" data-expected-width="40">XXXX XXXX</div>
- <div style="-webkit-grid-column: 1; -webkit-grid-row: 4;" data-expected-width="1" data-expected-height="0"></div>
+ <div style="grid-column: 2 / span 2;" data-expected-width="80">XXXXX</div>
+ <div style="grid-column: 1 / -1; grid-row: 2;" data-expected-width="100">XXX XXX XXX</div>
+ <div style="grid-column: 1 / span 2; grid-row: 3;" data-expected-width="40">XXXX XXXX</div>
+ <div style="grid-column: 1; grid-row: 4;" data-expected-width="1" data-expected-height="0"></div>
</div>
</div>
<div style="position: relative; width: 100px;">
<div class="grid gridMaxContentAndMinMaxFixedMaxContentAndFlex gridRowColumnGaps" data-expected-width="100" data-expected-height="139">
- <div style="-webkit-grid-column: 2 / span 2;" data-expected-width="39">XX</div>
- <div style="-webkit-grid-column: 1 / -1; -webkit-grid-row: 2;" data-expected-width="109">XXX XXX XXX</div>
- <div style="-webkit-grid-column: 1 / span 2; -webkit-grid-row: 3;" data-expected-width="90">XXXX XXXX</div>
- <div style="-webkit-grid-column: 1; -webkit-grid-row: 4;" data-expected-width="51" data-expected-height="0"></div>
+ <div style="grid-column: 2 / span 2;" data-expected-width="39">XX</div>
+ <div style="grid-column: 1 / -1; grid-row: 2;" data-expected-width="109">XXX XXX XXX</div>
+ <div style="grid-column: 1 / span 2; grid-row: 3;" data-expected-width="90">XXXX XXXX</div>
+ <div style="grid-column: 1; grid-row: 4;" data-expected-width="51" data-expected-height="0"></div>
</div>
</div>
diff --git a/LayoutTests/fast/css-grid-layout/grid-gutters-and-tracks.html b/LayoutTests/fast/css-grid-layout/grid-gutters-and-tracks.html
index da234f9..2bd724a 100644
--- a/LayoutTests/fast/css-grid-layout/grid-gutters-and-tracks.html
+++ b/LayoutTests/fast/css-grid-layout/grid-gutters-and-tracks.html
@@ -6,34 +6,34 @@
<style>
body { margin: 0px; }
-.normalGap { -webkit-grid-gap: normal; }
+.normalGap { grid-gap: normal; }
-.gridGap { -webkit-grid-gap: 16px; }
+.gridGap { grid-gap: 16px; }
.gridRowColumnGaps {
- -webkit-grid-row-gap: 12px;
- -webkit-grid-column-gap: 23px;
+ grid-row-gap: 12px;
+ grid-column-gap: 23px;
}
-.gridMultipleCols { -webkit-grid-template-columns: 30px minmax(10px, 50px) 80px; }
-.gridMultipleRows { -webkit-grid-template-rows: 90px 70px -webkit-min-content; }
-.gridAutoAuto { -webkit-grid-template: auto auto / auto auto; }
-.gridMultipleFixed { -webkit-grid-template: [first] 37px [foo] 57px [bar] 77px [last] / [first] 15px [foo] 25px [bar] 35px [last]; }
-.gridFixed100 { -webkit-grid-template: repeat(2, 100px) / repeat(2, 100px); }
-.gridWithPercent { -webkit-grid-template: 10% 10px / 10px 20% repeat(1, 30px); }
-.gridWithDoublePercent { -webkit-grid-template: 35% 65% / 60% 40%; }
+.gridMultipleCols { grid-template-columns: 30px minmax(10px, 50px) 80px; }
+.gridMultipleRows { grid-template-rows: 90px 70px -webkit-min-content; }
+.gridAutoAuto { grid-template: auto auto / auto auto; }
+.gridMultipleFixed { grid-template: [first] 37px [foo] 57px [bar] 77px [last] / [first] 15px [foo] 25px [bar] 35px [last]; }
+.gridFixed100 { grid-template: repeat(2, 100px) / repeat(2, 100px); }
+.gridWithPercent { grid-template: 10% 10px / 10px 20% repeat(1, 30px); }
+.gridWithDoublePercent { grid-template: 35% 65% / 60% 40%; }
.fixedSizeGrid {
width: 220px;
height: 300px;
}
.gridFixedAutoTracks {
- -webkit-grid-auto-rows: 20px;
- -webkit-grid-auto-columns: 40px;
+ grid-auto-rows: 20px;
+ grid-auto-columns: 40px;
}
-.thirdRowThirdColumn { -webkit-grid-area: 3 / 3; }
-.firstRowThirdColumn { -webkit-grid-area: 1 / 3; }
+.thirdRowThirdColumn { grid-area: 3 / 3; }
+.firstRowThirdColumn { grid-area: 1 / 3; }
div.grid > div { font: 10px/1 Ahem; }
@@ -88,9 +88,9 @@
<div style="position: relative">
<div class="grid gridMultipleFixed gridRowColumnGaps">
- <div style="-webkit-grid-row: 2; -webkit-grid-column: -2 / -1;" data-offset-x="86" data-offset-y="49" data-expected-width="35" data-expected-height="57">X X X</div>
- <div style="-webkit-grid-row: 1 / bar; -webkit-grid-column: bar" data-offset-x="86" data-offset-y="0" data-expected-width="35" data-expected-height="106">X XX X XX XX XX X</div>
- <div style="-webkit-grid-row: -2; -webkit-grid-column-end: foo" data-offset-x="0" data-offset-y="118" data-expected-width="15" data-expected-height="77">X X</div>
+ <div style="grid-row: 2; grid-column: -2 / -1;" data-offset-x="86" data-offset-y="49" data-expected-width="35" data-expected-height="57">X X X</div>
+ <div style="grid-row: 1 / bar; grid-column: bar" data-offset-x="86" data-offset-y="0" data-expected-width="35" data-expected-height="106">X XX X XX XX XX X</div>
+ <div style="grid-row: -2; grid-column-end: foo" data-offset-x="0" data-offset-y="118" data-expected-width="15" data-expected-height="77">X X</div>
</div>
</div>
@@ -130,9 +130,9 @@
<div style="position: relative">
<div class="grid gridMultipleFixed gridRowColumnGaps">
- <div style="-webkit-grid-row: 2; -webkit-grid-column: 1 / -1;" data-offset-x="0" data-offset-y="49" data-expected-width="121" data-expected-height="57">XXXX X XXXX</div>
- <div style="-webkit-grid-row: first / last; -webkit-grid-column-start: 2" data-offset-x="38" data-offset-y="0" data-expected-width="25" data-expected-height="195">X XX X XX X</div>
- <div style="-webkit-grid-row: 1 / 3; -webkit-grid-column: first / bar" data-offset-x="0" data-offset-y="0" data-expected-width="63" data-expected-height="106">XXX XX<br>XX<br>XXXXX</div>
+ <div style="grid-row: 2; grid-column: 1 / -1;" data-offset-x="0" data-offset-y="49" data-expected-width="121" data-expected-height="57">XXXX X XXXX</div>
+ <div style="grid-row: first / last; grid-column-start: 2" data-offset-x="38" data-offset-y="0" data-expected-width="25" data-expected-height="195">X XX X XX X</div>
+ <div style="grid-row: 1 / 3; grid-column: first / bar" data-offset-x="0" data-offset-y="0" data-expected-width="63" data-expected-height="106">XXX XX<br>XX<br>XXXXX</div>
</div>
</div>
diff --git a/LayoutTests/fast/css-grid-layout/grid-gutters-get-set-expected.txt b/LayoutTests/fast/css-grid-layout/grid-gutters-get-set-expected.txt
index 648b4c0..473ba8f 100644
--- a/LayoutTests/fast/css-grid-layout/grid-gutters-get-set-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/grid-gutters-get-set-expected.txt
@@ -4,42 +4,42 @@
Test getting grid-column-gap and grid-row-gap set through CSS
-PASS window.getComputedStyle(defaultGrid, '').getPropertyValue('-webkit-grid-row-gap') is "0px"
-PASS window.getComputedStyle(defaultGrid, '').getPropertyValue('-webkit-grid-column-gap') is "0px"
-PASS window.getComputedStyle(gridGap, '').getPropertyValue('-webkit-grid-row-gap') is "20px"
-PASS window.getComputedStyle(gridGap, '').getPropertyValue('-webkit-grid-column-gap') is "15px"
-PASS window.getComputedStyle(gridSimpleGap, '').getPropertyValue('-webkit-grid-row-gap') is "25px"
-PASS window.getComputedStyle(gridSimpleGap, '').getPropertyValue('-webkit-grid-column-gap') is "25px"
-PASS window.getComputedStyle(gridColumnGap, '').getPropertyValue('-webkit-grid-row-gap') is "0px"
-PASS window.getComputedStyle(gridColumnGap, '').getPropertyValue('-webkit-grid-column-gap') is "16px"
-PASS window.getComputedStyle(gridRowGap, '').getPropertyValue('-webkit-grid-row-gap') is "32px"
-PASS window.getComputedStyle(gridRowGap, '').getPropertyValue('-webkit-grid-column-gap') is "0px"
-PASS window.getComputedStyle(gridCalcGaps, '').getPropertyValue('-webkit-grid-row-gap') is "13px"
-PASS window.getComputedStyle(gridCalcGaps, '').getPropertyValue('-webkit-grid-column-gap') is "10px"
-PASS window.getComputedStyle(gridRowColumnGaps, '').getPropertyValue('-webkit-grid-row-gap') is "12px"
-PASS window.getComputedStyle(gridRowColumnGaps, '').getPropertyValue('-webkit-grid-column-gap') is "16px"
-PASS window.getComputedStyle(gridRowColumnGaps, '').getPropertyValue('-webkit-grid-row-gap') is "12px"
-PASS window.getComputedStyle(gridRowColumnGaps, '').getPropertyValue('-webkit-grid-column-gap') is "16px"
-PASS window.getComputedStyle(gridRowColumnInheritGaps, '').getPropertyValue('-webkit-grid-row-gap') is "25px"
-PASS window.getComputedStyle(gridRowColumnInheritGaps, '').getPropertyValue('-webkit-grid-column-gap') is "25px"
-PASS window.getComputedStyle(gridRowColumnInitialGaps, '').getPropertyValue('-webkit-grid-row-gap') is "0px"
-PASS window.getComputedStyle(gridRowColumnInitialGaps, '').getPropertyValue('-webkit-grid-column-gap') is "0px"
+PASS window.getComputedStyle(defaultGrid, '').getPropertyValue('grid-row-gap') is "0px"
+PASS window.getComputedStyle(defaultGrid, '').getPropertyValue('grid-column-gap') is "0px"
+PASS window.getComputedStyle(gridGap, '').getPropertyValue('grid-row-gap') is "20px"
+PASS window.getComputedStyle(gridGap, '').getPropertyValue('grid-column-gap') is "15px"
+PASS window.getComputedStyle(gridSimpleGap, '').getPropertyValue('grid-row-gap') is "25px"
+PASS window.getComputedStyle(gridSimpleGap, '').getPropertyValue('grid-column-gap') is "25px"
+PASS window.getComputedStyle(gridColumnGap, '').getPropertyValue('grid-row-gap') is "0px"
+PASS window.getComputedStyle(gridColumnGap, '').getPropertyValue('grid-column-gap') is "16px"
+PASS window.getComputedStyle(gridRowGap, '').getPropertyValue('grid-row-gap') is "32px"
+PASS window.getComputedStyle(gridRowGap, '').getPropertyValue('grid-column-gap') is "0px"
+PASS window.getComputedStyle(gridCalcGaps, '').getPropertyValue('grid-row-gap') is "13px"
+PASS window.getComputedStyle(gridCalcGaps, '').getPropertyValue('grid-column-gap') is "10px"
+PASS window.getComputedStyle(gridRowColumnGaps, '').getPropertyValue('grid-row-gap') is "12px"
+PASS window.getComputedStyle(gridRowColumnGaps, '').getPropertyValue('grid-column-gap') is "16px"
+PASS window.getComputedStyle(gridRowColumnGaps, '').getPropertyValue('grid-row-gap') is "12px"
+PASS window.getComputedStyle(gridRowColumnGaps, '').getPropertyValue('grid-column-gap') is "16px"
+PASS window.getComputedStyle(gridRowColumnInheritGaps, '').getPropertyValue('grid-row-gap') is "25px"
+PASS window.getComputedStyle(gridRowColumnInheritGaps, '').getPropertyValue('grid-column-gap') is "25px"
+PASS window.getComputedStyle(gridRowColumnInitialGaps, '').getPropertyValue('grid-row-gap') is "0px"
+PASS window.getComputedStyle(gridRowColumnInitialGaps, '').getPropertyValue('grid-column-gap') is "0px"
Test getting wrong values for grid-column-gap and grid-row-gap set through CSS
-PASS window.getComputedStyle(gridInvalidRowGap, '').getPropertyValue('-webkit-grid-row-gap') is "0px"
-PASS window.getComputedStyle(gridInvalidRowGap, '').getPropertyValue('-webkit-grid-column-gap') is "0px"
-PASS window.getComputedStyle(gridInvalidColumnGap, '').getPropertyValue('-webkit-grid-row-gap') is "0px"
-PASS window.getComputedStyle(gridInvalidColumnGap, '').getPropertyValue('-webkit-grid-column-gap') is "0px"
-PASS window.getComputedStyle(gridInvalidMultipleRowColumnGaps, '').getPropertyValue('-webkit-grid-row-gap') is "0px"
-PASS window.getComputedStyle(gridInvalidMultipleRowColumnGaps, '').getPropertyValue('-webkit-grid-column-gap') is "0px"
-PASS window.getComputedStyle(gridInvalidGridGap, '').getPropertyValue('-webkit-grid-row-gap') is "0px"
-PASS window.getComputedStyle(gridInvalidGridGap, '').getPropertyValue('-webkit-grid-column-gap') is "0px"
-PASS window.getComputedStyle(gridInvalidNoneGap, '').getPropertyValue('-webkit-grid-row-gap') is "0px"
-PASS window.getComputedStyle(gridInvalidNoneGap, '').getPropertyValue('-webkit-grid-column-gap') is "0px"
-PASS window.getComputedStyle(gridInvalidImplicitGridGap, '').getPropertyValue('-webkit-grid-row-gap') is "0px"
-PASS window.getComputedStyle(gridInvalidImplicitGridGap, '').getPropertyValue('-webkit-grid-column-gap') is "0px"
-PASS window.getComputedStyle(gridInvalidLengthRowColumnGaps, '').getPropertyValue('-webkit-grid-row-gap') is "0px"
-PASS window.getComputedStyle(gridInvalidLengthRowColumnGaps, '').getPropertyValue('-webkit-grid-column-gap') is "0px"
+PASS window.getComputedStyle(gridInvalidRowGap, '').getPropertyValue('grid-row-gap') is "0px"
+PASS window.getComputedStyle(gridInvalidRowGap, '').getPropertyValue('grid-column-gap') is "0px"
+PASS window.getComputedStyle(gridInvalidColumnGap, '').getPropertyValue('grid-row-gap') is "0px"
+PASS window.getComputedStyle(gridInvalidColumnGap, '').getPropertyValue('grid-column-gap') is "0px"
+PASS window.getComputedStyle(gridInvalidMultipleRowColumnGaps, '').getPropertyValue('grid-row-gap') is "0px"
+PASS window.getComputedStyle(gridInvalidMultipleRowColumnGaps, '').getPropertyValue('grid-column-gap') is "0px"
+PASS window.getComputedStyle(gridInvalidGridGap, '').getPropertyValue('grid-row-gap') is "0px"
+PASS window.getComputedStyle(gridInvalidGridGap, '').getPropertyValue('grid-column-gap') is "0px"
+PASS window.getComputedStyle(gridInvalidNoneGap, '').getPropertyValue('grid-row-gap') is "0px"
+PASS window.getComputedStyle(gridInvalidNoneGap, '').getPropertyValue('grid-column-gap') is "0px"
+PASS window.getComputedStyle(gridInvalidImplicitGridGap, '').getPropertyValue('grid-row-gap') is "0px"
+PASS window.getComputedStyle(gridInvalidImplicitGridGap, '').getPropertyValue('grid-column-gap') is "0px"
+PASS window.getComputedStyle(gridInvalidLengthRowColumnGaps, '').getPropertyValue('grid-row-gap') is "0px"
+PASS window.getComputedStyle(gridInvalidLengthRowColumnGaps, '').getPropertyValue('grid-column-gap') is "0px"
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/grid-gutters-get-set.html b/LayoutTests/fast/css-grid-layout/grid-gutters-get-set.html
index 7c53c42..7af88fa 100644
--- a/LayoutTests/fast/css-grid-layout/grid-gutters-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/grid-gutters-get-set.html
@@ -3,39 +3,39 @@
<head>
<link href="resources/grid.css" rel="stylesheet">
<style>
-.gridGap { -webkit-grid-gap: 20px 15px; }
-.gridSimpleGap { -webkit-grid-gap: 25px; }
-.gridColumnGap { -webkit-grid-column-gap: 2vw; }
-.gridRowGap { -webkit-grid-row-gap: 2em; }
+.gridGap { grid-gap: 20px 15px; }
+.gridSimpleGap { grid-gap: 25px; }
+.gridColumnGap { grid-column-gap: 2vw; }
+.gridRowGap { grid-row-gap: 2em; }
.gridRowColumnGaps {
- -webkit-grid-row-gap: 12px;
- -webkit-grid-column-gap: 1rem;
+ grid-row-gap: 12px;
+ grid-column-gap: 1rem;
}
.gridRowColumnInheritGaps {
- -webkit-grid-row-gap: inherit;
- -webkit-grid-column-gap: inherit;
+ grid-row-gap: inherit;
+ grid-column-gap: inherit;
}
.gridRowColumnInitialGaps {
- -webkit-grid-row-gap: initial;
- -webkit-grid-column-gap: initial;
+ grid-row-gap: initial;
+ grid-column-gap: initial;
}
.gridCalcGaps {
- -webkit-grid-row-gap: calc(10px + 3px);
- -webkit-grid-column-gap: calc(2px + 1vw);
+ grid-row-gap: calc(10px + 3px);
+ grid-column-gap: calc(2px + 1vw);
}
-.gridInvalidRowGap { -webkit-grid-row-gap: 10%; }
-.gridInvalidColumnGap { -webkit-grid-column-gap: -webkit-max-content; }
+.gridInvalidRowGap { grid-row-gap: 10%; }
+.gridInvalidColumnGap { grid-column-gap: -webkit-max-content; }
.gridInvalidMultipleRowColumnGaps {
- -webkit-grid-row-gap: 10px 1px;
- -webkit-grid-column-gap: 0px 0px 0px;
+ grid-row-gap: 10px 1px;
+ grid-column-gap: 0px 0px 0px;
}
.gridInvalidLengthRowColumnGaps {
- -webkit-grid-row-gap: 2dpi;
- -webkit-grid-column-gap: 3rad;
+ grid-row-gap: 2dpi;
+ grid-column-gap: 3rad;
}
-.gridInvalidGridGap { -webkit-grid-gap: 20px 20px 10px; }
-.gridInvalidNoneGap { -webkit-grid-gap: none; }
-.gridInvalidImplicitGridGap { -webkit-grid-gap: -webkit-fit-content; }
+.gridInvalidGridGap { grid-gap: 20px 20px 10px; }
+.gridInvalidNoneGap { grid-gap: none; }
+.gridInvalidImplicitGridGap { grid-gap: -webkit-fit-content; }
</style>
<script src="../../resources/js-test.js"></script>
diff --git a/LayoutTests/fast/css-grid-layout/grid-indefinite-calculated-height-crash-expected.txt b/LayoutTests/fast/css-grid-layout/grid-indefinite-calculated-height-crash-expected.txt
index 57a9931..ebadcce 100644
--- a/LayoutTests/fast/css-grid-layout/grid-indefinite-calculated-height-crash-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/grid-indefinite-calculated-height-crash-expected.txt
@@ -1,3 +1,3 @@
-* { display: -webkit-inline-grid; height: calc(100% - 10px); -webkit-grid-template-rows: minmax(100%, -webkit-max-content); }
+* { display: inline-grid; height: calc(100% - 10px); grid-template-rows: minmax(100%, -webkit-max-content); }
if (window.testRunner) testRunner.dumpAsText();
This test has PASSED if it didn't CRASH on Debug builds.
diff --git a/LayoutTests/fast/css-grid-layout/grid-indefinite-calculated-height-crash.html b/LayoutTests/fast/css-grid-layout/grid-indefinite-calculated-height-crash.html
index 4441a69..ef3c354 100644
--- a/LayoutTests/fast/css-grid-layout/grid-indefinite-calculated-height-crash.html
+++ b/LayoutTests/fast/css-grid-layout/grid-indefinite-calculated-height-crash.html
@@ -2,9 +2,9 @@
<head>
<style>
* {
- display: -webkit-inline-grid;
+ display: inline-grid;
height: calc(100% - 10px);
- -webkit-grid-template-rows: minmax(100%, -webkit-max-content);
+ grid-template-rows: minmax(100%, -webkit-max-content);
}
</style>
<script type="text/javascript">
diff --git a/LayoutTests/fast/css-grid-layout/grid-initialize-span-one-items-expected.txt b/LayoutTests/fast/css-grid-layout/grid-initialize-span-one-items-expected.txt
index efe1c69..9d3b905 100644
--- a/LayoutTests/fast/css-grid-layout/grid-initialize-span-one-items-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/grid-initialize-span-one-items-expected.txt
@@ -3,15 +3,15 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS window.getComputedStyle(gridAutoAndAuto, '').getPropertyValue('-webkit-grid-template-columns') is "10px 90px"
-PASS window.getComputedStyle(gridAutoAndAutoReversed, '').getPropertyValue('-webkit-grid-template-columns') is "90px 10px"
-PASS window.getComputedStyle(gridFixedMinContentFixedMaxContent, '').getPropertyValue('-webkit-grid-template-columns') is "50px 50px"
-PASS window.getComputedStyle(gridFixedMinContentFixedMaxContentTwoEmptyChildren, '').getPropertyValue('-webkit-grid-template-columns') is "50px 50px"
-PASS window.getComputedStyle(gridFixedMinContentFixedMaxContentFixedSizeChild, '').getPropertyValue('-webkit-grid-template-columns') is "60px 40px"
-PASS window.getComputedStyle(gridMaxContentAndAuto, '').getPropertyValue('-webkit-grid-template-columns') is "80px 20px"
-PASS window.getComputedStyle(gridMaxContentAndAutoReversed, '').getPropertyValue('-webkit-grid-template-columns') is "90px 10px"
-PASS window.getComputedStyle(gridMinContentAndAuto, '').getPropertyValue('-webkit-grid-template-columns') is "10px 90px"
-PASS window.getComputedStyle(gridMinContentAndAutoReversed, '').getPropertyValue('-webkit-grid-template-columns') is "20px 80px"
+PASS window.getComputedStyle(gridAutoAndAuto, '').getPropertyValue('grid-template-columns') is "10px 90px"
+PASS window.getComputedStyle(gridAutoAndAutoReversed, '').getPropertyValue('grid-template-columns') is "90px 10px"
+PASS window.getComputedStyle(gridFixedMinContentFixedMaxContent, '').getPropertyValue('grid-template-columns') is "50px 50px"
+PASS window.getComputedStyle(gridFixedMinContentFixedMaxContentTwoEmptyChildren, '').getPropertyValue('grid-template-columns') is "50px 50px"
+PASS window.getComputedStyle(gridFixedMinContentFixedMaxContentFixedSizeChild, '').getPropertyValue('grid-template-columns') is "60px 40px"
+PASS window.getComputedStyle(gridMaxContentAndAuto, '').getPropertyValue('grid-template-columns') is "80px 20px"
+PASS window.getComputedStyle(gridMaxContentAndAutoReversed, '').getPropertyValue('grid-template-columns') is "90px 10px"
+PASS window.getComputedStyle(gridMinContentAndAuto, '').getPropertyValue('grid-template-columns') is "10px 90px"
+PASS window.getComputedStyle(gridMinContentAndAutoReversed, '').getPropertyValue('grid-template-columns') is "20px 80px"
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/grid-initialize-span-one-items.html b/LayoutTests/fast/css-grid-layout/grid-initialize-span-one-items.html
index 4febafd..c1a5025 100644
--- a/LayoutTests/fast/css-grid-layout/grid-initialize-span-one-items.html
+++ b/LayoutTests/fast/css-grid-layout/grid-initialize-span-one-items.html
@@ -7,16 +7,16 @@
font: 10px/1 Ahem;
}
.gridAutoAndAuto {
- -webkit-grid-template-columns: auto auto;
+ grid-template-columns: auto auto;
}
.gridFixedMinContentFixedMaxContent {
- -webkit-grid-template-columns: minmax(50px, -webkit-min-content) minmax(40px, -webkit-max-content);
+ grid-template-columns: minmax(50px, -webkit-min-content) minmax(40px, -webkit-max-content);
}
.gridMaxContentAndAuto {
- -webkit-grid-template-columns: -webkit-max-content auto;
+ grid-template-columns: -webkit-max-content auto;
}
.gridMinContentAndAuto {
- -webkit-grid-template-columns: -webkit-min-content auto;
+ grid-template-columns: -webkit-min-content auto;
}
</style>
<script src="../../resources/js-test.js"></script>
@@ -71,7 +71,7 @@
<script>
function testGridColumnsValues(id, computedColumnValue)
{
- shouldBeEqualToString("window.getComputedStyle(" + id + ", '').getPropertyValue('-webkit-grid-template-columns')", computedColumnValue);
+ shouldBeEqualToString("window.getComputedStyle(" + id + ", '').getPropertyValue('grid-template-columns')", computedColumnValue);
}
description('This test checks that content sized tracks are initialized using non-spanning grid items.');
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-addition-auto-placement-update.html b/LayoutTests/fast/css-grid-layout/grid-item-addition-auto-placement-update.html
index 2ab22d2..506d7aa 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-addition-auto-placement-update.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-addition-auto-placement-update.html
@@ -4,8 +4,8 @@
<link href="resources/grid-alignment.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-columns: 50px 100px;
- -webkit-grid-template-rows: 50px 100px;
+ grid-template-columns: 50px 100px;
+ grid-template-rows: 50px 100px;
}
</style>
<script src="../../resources/check-layout.js"></script>
@@ -15,8 +15,8 @@
var gridElement = document.getElementById(gridElementID);
var gridItem = document.createElement("div");
- gridItem.style.webkitGridRow = position.row;
- gridItem.style.webkitGridColumn = position.column;
+ gridItem.style.gridRow = position.row;
+ gridItem.style.gridColumn = position.column;
gridElement.appendChild(gridItem);
var autoFlowElement = document.getElementById(autoFlowElementID);
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-addition-track-breadth-update.html b/LayoutTests/fast/css-grid-layout/grid-item-addition-track-breadth-update.html
index 1475ae0..3054e39 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-addition-track-breadth-update.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-addition-track-breadth-update.html
@@ -4,8 +4,8 @@
<link href="resources/grid-alignment.css" rel="stylesheet">
<style>
.gridFixedContent {
- -webkit-grid-template-columns: 50px minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 50px) minmax(50px, -webkit-min-content);
- -webkit-grid-template-rows: 70px minmax(-webkit-max-content, 70px) minmax(50px, -webkit-min-content) minmax(65px, -webkit-max-content);
+ grid-template-columns: 50px minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 50px) minmax(50px, -webkit-min-content);
+ grid-template-rows: 70px minmax(-webkit-max-content, 70px) minmax(50px, -webkit-min-content) minmax(65px, -webkit-max-content);
}
.sizedToGridArea {
@@ -22,8 +22,8 @@
var gridItem = document.createElement("div");
gridItem.classList.add("sizedToGridArea");
gridItem.innerHTML = content;
- gridItem.style.webkitGridColumn = position.column;
- gridItem.style.webkitGridRow = position.row;
+ gridItem.style.gridColumn = position.column;
+ gridItem.style.gridRow = position.row;
gridItem.setAttribute("data-expected-width", size.width);
gridItem.setAttribute("data-expected-height", size.height);
var gridElement = document.getElementById(gridElementID);
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-area-get-set-expected.txt b/LayoutTests/fast/css-grid-layout/grid-item-area-get-set-expected.txt
index 55e6f34..7153a4f 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-area-get-set-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/grid-item-area-get-set-expected.txt
@@ -1,67 +1,67 @@
-This test checks that -webkit-grid-area is properly parsed and stored internally.
+This test checks that grid-area is properly parsed and stored internally.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
Test getting grid-area set through CSS
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "1"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "thirdArea"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "thirdArea"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "thirdArea"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "thirdArea"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "-1"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "span 1"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "firstArea"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "secondArea"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "firstArea"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "secondArea"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "span 1"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "10"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "-1"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "-5"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "span 5"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "span 8"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "9"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "firstArea"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "span 1"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "nonexistent"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "1 foobar"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "1"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "thirdArea"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "thirdArea"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "thirdArea"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "thirdArea"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "-1"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "span 1"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "firstArea"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "secondArea"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "firstArea"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "secondArea"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "span 1"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "10"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "-1"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "-5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "span 5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "span 8"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "9"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "firstArea"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "span 1"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "nonexistent"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "1 foobar"
Test getting and setting grid-area set through JS
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "-1"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "-1"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "span 5"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "-1"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "10"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "span 3"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "-1"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "-1"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "span 5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "-1"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "10"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "span 3"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
Test setting some positions to invalid values through JS
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-area-get-set.html b/LayoutTests/fast/css-grid-layout/grid-item-area-get-set.html
index 488fa49..6016503 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-area-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-area-get-set.html
@@ -4,36 +4,36 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-areas: "firstArea secondArea"
+ grid-template-areas: "firstArea secondArea"
"thirdArea thirdArea";
}
#oneValueGridArea {
- -webkit-grid-area: 1;
+ grid-area: 1;
}
#oneValueIdentGridArea {
- -webkit-grid-area: thirdArea;
+ grid-area: thirdArea;
}
#twoValueGridArea {
- -webkit-grid-area: -1 / span 1;
+ grid-area: -1 / span 1;
}
#twoValueIdentGridArea {
- -webkit-grid-area: firstArea / secondArea;
+ grid-area: firstArea / secondArea;
}
#threeValueGridArea {
- -webkit-grid-area: span / 10 / -1;
+ grid-area: span / 10 / -1;
}
#fourValueGridArea {
- -webkit-grid-area: -5 / 5 span / span 8 / 9;
+ grid-area: -5 / 5 span / span 8 / 9;
}
#fourValueMixedGridArea {
- -webkit-grid-area: firstArea / span / nonexistent / 1 foobar;
+ grid-area: firstArea / span / nonexistent / 1 foobar;
}
</style>
<script src="../../resources/js-test-pre.js"></script>
@@ -49,7 +49,7 @@
<div id="fourValueMixedGridArea"></div>
</div>
<script>
- description('This test checks that -webkit-grid-area is properly parsed and stored internally.');
+ description('This test checks that grid-area is properly parsed and stored internally.');
function valueOrDefaultGridPosition(gridPosition)
{
return gridPosition === undefined ? "auto" : gridPosition;
@@ -58,11 +58,11 @@
function checkColumnRowValues(gridItem, gridRowStart, gridColumnStart, gridRowEnd, gridColumnEnd)
{
this.gridItem = gridItem;
- shouldBeEqualToString("getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start')", gridRowStart);
- shouldBeEqualToString("getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start')", valueOrDefaultGridPosition(gridColumnStart));
+ shouldBeEqualToString("getComputedStyle(gridItem, '').getPropertyValue('grid-row-start')", gridRowStart);
+ shouldBeEqualToString("getComputedStyle(gridItem, '').getPropertyValue('grid-column-start')", valueOrDefaultGridPosition(gridColumnStart));
- shouldBeEqualToString("getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end')", valueOrDefaultGridPosition(gridRowEnd));
- shouldBeEqualToString("getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end')", valueOrDefaultGridPosition(gridColumnEnd));
+ shouldBeEqualToString("getComputedStyle(gridItem, '').getPropertyValue('grid-row-end')", valueOrDefaultGridPosition(gridRowEnd));
+ shouldBeEqualToString("getComputedStyle(gridItem, '').getPropertyValue('grid-column-end')", valueOrDefaultGridPosition(gridColumnEnd));
}
function testGridAreaCSSParsing(gridItemId, gridRowStart, gridColumnStart, gridRowEnd, gridColumnEnd)
@@ -75,8 +75,8 @@
var element = document.createElement("div");
document.body.appendChild(element);
// Pre-fill it with values to detect that we properly handle and reset unset values.
- element.style.webkitGridArea = "1 / 2 / 3 / 4";
- element.style.webkitGridArea = gridAreaValue;
+ element.style.gridArea = "1 / 2 / 3 / 4";
+ element.style.gridArea = gridAreaValue;
// Get the different values.
var gridColumnRowValues = gridAreaValue.split("/");
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-lr.html b/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-lr.html
index 1b89ad0..9e5cbba 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-lr.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-lr.html
@@ -11,8 +11,8 @@
}
.grid {
- -webkit-grid-template-columns: 100px 100px;
- -webkit-grid-template-rows: 200px 200px;
+ grid-template-columns: 100px 100px;
+ grid-template-rows: 200px 200px;
margin-bottom: 20px;
}
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-rl.html b/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-rl.html
index 4a35f26..4fac87a 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-rl.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-rl.html
@@ -11,8 +11,8 @@
}
.grid {
- -webkit-grid-template-columns: 100px 100px;
- -webkit-grid-template-rows: 200px 200px;
+ grid-template-columns: 100px 100px;
+ grid-template-rows: 200px 200px;
margin-bottom: 20px;
}
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment.html b/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment.html
index 051eb02..3981447 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment.html
@@ -11,8 +11,8 @@
}
.grid {
- -webkit-grid-template-columns: 100px 100px;
- -webkit-grid-template-rows: 200px 200px;
+ grid-template-columns: 100px 100px;
+ grid-template-rows: 200px 200px;
margin-bottom: 20px;
}
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-and-stretch.html b/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-and-stretch.html
index 9e02650..70b4890 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-and-stretch.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-and-stretch.html
@@ -10,8 +10,8 @@
}
.grid {
- -webkit-grid-template-columns: 100px 100px;
- -webkit-grid-template-rows: 200px 200px;
+ grid-template-columns: 100px 100px;
+ grid-template-rows: 200px 200px;
margin-bottom: 20px;
font: 15px/1 Ahem;
}
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-must-respect-specified-margins.html b/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-must-respect-specified-margins.html
index ac0fb93..7a428e8 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-must-respect-specified-margins.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-must-respect-specified-margins.html
@@ -8,8 +8,8 @@
}
.grid {
- -webkit-grid-template-columns: 100px;
- -webkit-grid-template-rows: 100px;
+ grid-template-columns: 100px;
+ grid-template-rows: 100px;
width: -webkit-fit-content;
position: relative;
}
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-auto-placement-automatic-span.html b/LayoutTests/fast/css-grid-layout/grid-item-auto-placement-automatic-span.html
index 91f84db..0c0fb1c 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-auto-placement-automatic-span.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-auto-placement-automatic-span.html
@@ -3,64 +3,64 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-auto-rows: 50px;
- -webkit-grid-auto-columns: 100px;
+ grid-auto-rows: 50px;
+ grid-auto-columns: 100px;
}
.gridNamedGridLinesColumns {
- -webkit-grid-template-columns: 50px 100px [line] 200px [line];
+ grid-template-columns: 50px 100px [line] 200px [line];
}
.gridNamedGridLinesRows {
- -webkit-grid-template-rows: 50px 100px [line] 200px [line];
+ grid-template-rows: 50px 100px [line] 200px [line];
}
.autoRowAutoColumnSpanning3 {
background-color: teal;
- -webkit-grid-column: span 3;
- -webkit-grid-row: auto;
+ grid-column: span 3;
+ grid-row: auto;
}
.autoRowSpanning2AutoColumn {
background-color: aqua;
- -webkit-grid-column: auto;
- -webkit-grid-row: span 2;
+ grid-column: auto;
+ grid-row: span 2;
}
.autoRowSpanning3AutoColumn {
background-color: salmon;
- -webkit-grid-column: auto;
- -webkit-grid-row: span 3;
+ grid-column: auto;
+ grid-row: span 3;
}
.autoRowSpanning2AutoColumnSpanning2 {
background-color: olive;
- -webkit-grid-column: span 2;
- -webkit-grid-row: span 2;
+ grid-column: span 2;
+ grid-row: span 2;
}
.autoRowAutoColumnSpanningLine {
background-color: indigo;
- -webkit-grid-column: span line; /* This is treated as "span 1". */
- -webkit-grid-row: auto;
+ grid-column: span line; /* This is treated as "span 1". */
+ grid-row: auto;
}
.autoRowSpanningLineAutoColumn {
background-color: moccasin;
- -webkit-grid-column: auto;
- -webkit-grid-row: span line; /* This is treated as "span 1". */
+ grid-column: auto;
+ grid-row: span line; /* This is treated as "span 1". */
}
.autoRowAutoColumnSpanning2Line {
background-color: sienna;
- -webkit-grid-column: span 2 line; /* This is treated as "span 1". */
- -webkit-grid-row: auto;
+ grid-column: span 2 line; /* This is treated as "span 1". */
+ grid-row: auto;
}
.autoRowSpanning2LineAutoColumn {
background-color: tomato;
- -webkit-grid-column: auto;
- -webkit-grid-row: span 2 line; /* This is treated as "span 1". */
+ grid-column: auto;
+ grid-row: span 2 line; /* This is treated as "span 1". */
}
</style>
<script src="../../resources/check-layout.js"></script>
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-auto-placement-definite-span.html b/LayoutTests/fast/css-grid-layout/grid-item-auto-placement-definite-span.html
index 88733fd..1f62371 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-auto-placement-definite-span.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-auto-placement-definite-span.html
@@ -3,20 +3,20 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-auto-rows: 50px;
- -webkit-grid-auto-columns: 100px;
+ grid-auto-rows: 50px;
+ grid-auto-columns: 100px;
}
.autoRowFirstColumnSpanning3 {
background-color: teal;
- -webkit-grid-column: 1 / span 3;
- -webkit-grid-row: auto;
+ grid-column: 1 / span 3;
+ grid-row: auto;
}
.firstRowSpanning3AutoColumn {
background-color: teal;
- -webkit-grid-column: auto;
- -webkit-grid-row: 1 / span 3;
+ grid-column: auto;
+ grid-row: 1 / span 3;
height: 100%;
}
</style>
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-auto-placement-fixed-row-column.html b/LayoutTests/fast/css-grid-layout/grid-item-auto-placement-fixed-row-column.html
index d7258ef..195f3e9 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-auto-placement-fixed-row-column.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-auto-placement-fixed-row-column.html
@@ -3,44 +3,44 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-auto-columns: 50px;
- -webkit-grid-auto-rows: 50px;
+ grid-auto-columns: 50px;
+ grid-auto-rows: 50px;
}
.firstRowAutoColumnSpanning2 {
background-color: maroon;
- -webkit-grid-column: span 2;
- -webkit-grid-row: 1;
+ grid-column: span 2;
+ grid-row: 1;
}
.autoRowSpanning2FirstColumn {
background-color: aqua;
- -webkit-grid-column: 1;
- -webkit-grid-row: span 2;
+ grid-column: 1;
+ grid-row: span 2;
}
.firstRowFourthColumn {
background-color: salmon;
- -webkit-grid-column: 4;
- -webkit-grid-row: 1;
+ grid-column: 4;
+ grid-row: 1;
}
.fourthRowFirstColumn {
background-color: salmon;
- -webkit-grid-column: 1;
- -webkit-grid-row: 4;
+ grid-column: 1;
+ grid-row: 4;
}
.secondRowThirdColumn {
background-color: red;
- -webkit-grid-column: 3;
- -webkit-grid-row: 2;
+ grid-column: 3;
+ grid-row: 2;
}
.thirdRowSecondColumn {
background-color: red;
- -webkit-grid-column: 2;
- -webkit-grid-row: 3;
+ grid-column: 2;
+ grid-row: 3;
}
</style>
<script src="../../resources/check-layout.js"></script>
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-auto-sized-align-justify-margin-border-padding.html b/LayoutTests/fast/css-grid-layout/grid-item-auto-sized-align-justify-margin-border-padding.html
index 0a2d4a6..db4ed62 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-auto-sized-align-justify-margin-border-padding.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-auto-sized-align-justify-margin-border-padding.html
@@ -9,8 +9,8 @@
}
.grid {
- -webkit-grid-template-columns: 100px 200px;
- -webkit-grid-template-rows: 200px 200px;
+ grid-template-columns: 100px 200px;
+ grid-template-rows: 200px 200px;
padding: 10px 15px 20px 30px;
border-width: 5px 10px 15px 20px;
border-style: dotted;
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html b/LayoutTests/fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html
index 9afe97c..ca583e7 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html
@@ -4,34 +4,34 @@
<link href="resources/grid-alignment.css" rel="stylesheet"/>
<style>
.grid {
- -webkit-grid-template-rows: 10px 20px;
- -webkit-grid-auto-rows: 5px;
- -webkit-grid-template-columns: 30px 40px;
- -webkit-grid-auto-columns: 15px;
- -webkit-grid-auto-flow: row;
+ grid-template-rows: 10px 20px;
+ grid-auto-rows: 5px;
+ grid-template-columns: 30px 40px;
+ grid-auto-columns: 15px;
+ grid-auto-flow: row;
}
.bothNamedGridLineRow {
- -webkit-grid-row: nonExistentArea / nonExistentArea;
- -webkit-grid-column: 1;
+ grid-row: nonExistentArea / nonExistentArea;
+ grid-column: 1;
background-color: lime;
}
.bothNamedGridLineColumn {
- -webkit-grid-row: 1;
- -webkit-grid-column: nonExistentArea / span 3;
+ grid-row: 1;
+ grid-column: nonExistentArea / span 3;
background-color: lime;
}
.namedGridLineSpanRow {
- -webkit-grid-row: nonExistentArea / span 5 firstRow;
- -webkit-grid-column: 1;
+ grid-row: nonExistentArea / span 5 firstRow;
+ grid-column: 1;
background-color: lime;
}
.namedGridLineSpanColumn {
- -webkit-grid-row: 1;
- -webkit-grid-column: nonExistentArea / span;
+ grid-row: 1;
+ grid-column: nonExistentArea / span;
background-color: lime;
}
</style>
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-bad-resolution-double-span.html b/LayoutTests/fast/css-grid-layout/grid-item-bad-resolution-double-span.html
index 5770b7e..440eeb7 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-bad-resolution-double-span.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-bad-resolution-double-span.html
@@ -3,30 +3,30 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- display: -webkit-grid;
- -webkit-grid-template-rows: [firstRow] 10px 20px;
- -webkit-grid-template-columns: [firstColumn] 30px 40px;
- -webkit-grid-auto-flow: row;
+ display: grid;
+ grid-template-rows: [firstRow] 10px 20px;
+ grid-template-columns: [firstColumn] 30px 40px;
+ grid-auto-flow: row;
}
.bothSpanRow {
- -webkit-grid-column: 1;
- -webkit-grid-row: span 5 firstRow / span 1;
+ grid-column: 1;
+ grid-row: span 5 firstRow / span 1;
}
.bothSpanColumn {
- -webkit-grid-column: span / span 3;
- -webkit-grid-row: 1;
+ grid-column: span / span 3;
+ grid-row: 1;
}
.spanAutoRow {
- -webkit-grid-column: 1;
- -webkit-grid-row: span 5 firstRow / auto;
+ grid-column: 1;
+ grid-row: span 5 firstRow / auto;
}
.spanAutoColumn {
- -webkit-grid-column: span / auto;
- -webkit-grid-row: 1;
+ grid-column: span / auto;
+ grid-row: 1;
}
</style>
<script src="../../resources/check-layout.js"></script>
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-change-column-repaint.html b/LayoutTests/fast/css-grid-layout/grid-item-change-column-repaint.html
index 6568ab84..52bec11 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-change-column-repaint.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-change-column-repaint.html
@@ -5,7 +5,7 @@
function repaintTest()
{
var gridItem = document.getElementsByClassName("sizedToGridArea")[0];
- gridItem.style.webkitGridColumn = "3";
+ gridItem.style.gridColumn = "3";
}
window.addEventListener("load", runRepaintTest, false);
</script>
@@ -17,8 +17,8 @@
}
.grid {
- -webkit-grid-template-rows: 50px;
- -webkit-grid-template-columns: minmax(100px, 180px) 100px minmax(50px, 100px);
+ grid-template-rows: 50px;
+ grid-template-columns: minmax(100px, 180px) 100px minmax(50px, 100px);
}
.sizedToGridArea {
background-color: purple;
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-change-row-repaint.html b/LayoutTests/fast/css-grid-layout/grid-item-change-row-repaint.html
index 1753ffc..219a9db 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-change-row-repaint.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-change-row-repaint.html
@@ -5,7 +5,7 @@
function repaintTest()
{
var gridItem = document.getElementsByClassName("sizedToGridArea")[0];
- gridItem.style.webkitGridRow = "2";
+ gridItem.style.gridRow = "2";
}
window.addEventListener("load", runRepaintTest, false);
</script>
@@ -16,8 +16,8 @@
}
.grid {
- -webkit-grid-template-rows: 50px 100px;
- -webkit-grid-template-columns: 100px 50px;
+ grid-template-rows: 50px 100px;
+ grid-template-columns: 100px 50px;
/* Make the grid shrink to fit. */
position: absolute;
}
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set-expected.txt b/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set-expected.txt
index 3f20bf3..5a1174b 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set-expected.txt
@@ -3,463 +3,463 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-Test getting -webkit-grid-column and -webkit-grid-row set through CSS
-PASS getComputedStyle(gridItemWithNoCSSRule, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItemWithNoCSSRule, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItemWithNoCSSRule, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItemWithNoCSSRule, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItemWithNoCSSRule, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItemWithNoCSSRule, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-column') is "10 / auto"
-PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-column-start') is "10"
-PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-row') is "15 / auto"
-PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-row-start') is "15"
-PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-column') is "-10 / auto"
-PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-column-start') is "-10"
-PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-row') is "-15 / auto"
-PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-row-start') is "-15"
-PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('-webkit-grid-column') is "10 / 15"
-PASS getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('-webkit-grid-column-start') is "10"
-PASS getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('-webkit-grid-column-end') is "15"
-PASS getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('-webkit-grid-row') is "5 / 5"
-PASS getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('-webkit-grid-row-start') is "5"
-PASS getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('-webkit-grid-row-end') is "5"
-PASS getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('-webkit-grid-column') is "10 / -10"
-PASS getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('-webkit-grid-column-start') is "10"
-PASS getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('-webkit-grid-column-end') is "-10"
-PASS getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('-webkit-grid-row') is "-8 / 5"
-PASS getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('-webkit-grid-row-start') is "-8"
-PASS getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('-webkit-grid-row-end') is "5"
-PASS getComputedStyle(gridItemWithBeforeSpanElement, '').getPropertyValue('-webkit-grid-column') is "span 2 / 4"
-PASS getComputedStyle(gridItemWithBeforeSpanElement, '').getPropertyValue('-webkit-grid-column-start') is "span 2"
-PASS getComputedStyle(gridItemWithBeforeSpanElement, '').getPropertyValue('-webkit-grid-column-end') is "4"
-PASS getComputedStyle(gridItemWithBeforeSpanElement, '').getPropertyValue('-webkit-grid-row') is "3 / span 5"
-PASS getComputedStyle(gridItemWithBeforeSpanElement, '').getPropertyValue('-webkit-grid-row-start') is "3"
-PASS getComputedStyle(gridItemWithBeforeSpanElement, '').getPropertyValue('-webkit-grid-row-end') is "span 5"
-PASS getComputedStyle(gridItemWithAfterSpanElement, '').getPropertyValue('-webkit-grid-column') is "span 2 / 4"
-PASS getComputedStyle(gridItemWithAfterSpanElement, '').getPropertyValue('-webkit-grid-column-start') is "span 2"
-PASS getComputedStyle(gridItemWithAfterSpanElement, '').getPropertyValue('-webkit-grid-column-end') is "4"
-PASS getComputedStyle(gridItemWithAfterSpanElement, '').getPropertyValue('-webkit-grid-row') is "3 / span 5"
-PASS getComputedStyle(gridItemWithAfterSpanElement, '').getPropertyValue('-webkit-grid-row-start') is "3"
-PASS getComputedStyle(gridItemWithAfterSpanElement, '').getPropertyValue('-webkit-grid-row-end') is "span 5"
-PASS getComputedStyle(gridItemWith2OnlySpanElement, '').getPropertyValue('-webkit-grid-column') is "span 1 / span 1"
-PASS getComputedStyle(gridItemWith2OnlySpanElement, '').getPropertyValue('-webkit-grid-column-start') is "span 1"
-PASS getComputedStyle(gridItemWith2OnlySpanElement, '').getPropertyValue('-webkit-grid-column-end') is "span 1"
-PASS getComputedStyle(gridItemWith2OnlySpanElement, '').getPropertyValue('-webkit-grid-row') is "span 1 / span 1"
-PASS getComputedStyle(gridItemWith2OnlySpanElement, '').getPropertyValue('-webkit-grid-row-start') is "span 1"
-PASS getComputedStyle(gridItemWith2OnlySpanElement, '').getPropertyValue('-webkit-grid-row-end') is "span 1"
-PASS getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('-webkit-grid-column') is "10 / 11"
-PASS getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('-webkit-grid-column-start') is "10"
-PASS getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('-webkit-grid-column-end') is "11"
-PASS getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('-webkit-grid-row') is "4 / 5"
-PASS getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('-webkit-grid-row-start') is "4"
-PASS getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('-webkit-grid-row-end') is "5"
-PASS getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('-webkit-grid-column') is "auto / 1"
-PASS getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('-webkit-grid-column-end') is "1"
-PASS getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('-webkit-grid-row') is "5 / auto"
-PASS getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('-webkit-grid-row-start') is "5"
-PASS getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('-webkit-grid-column') is "first / first"
-PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('-webkit-grid-column-start') is "first"
-PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('-webkit-grid-column-end') is "first"
-PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('-webkit-grid-row') is "last / last"
-PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('-webkit-grid-row-start') is "last"
-PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('-webkit-grid-row-end') is "last"
-PASS getComputedStyle(gridItemWithNonExistingCustomIdent, '').getPropertyValue('-webkit-grid-column') is "nav / nav"
-PASS getComputedStyle(gridItemWithNonExistingCustomIdent, '').getPropertyValue('-webkit-grid-column-start') is "nav"
-PASS getComputedStyle(gridItemWithNonExistingCustomIdent, '').getPropertyValue('-webkit-grid-column-end') is "nav"
-PASS getComputedStyle(gridItemWithNonExistingCustomIdent, '').getPropertyValue('-webkit-grid-row') is "foo / foo"
-PASS getComputedStyle(gridItemWithNonExistingCustomIdent, '').getPropertyValue('-webkit-grid-row-start') is "foo"
-PASS getComputedStyle(gridItemWithNonExistingCustomIdent, '').getPropertyValue('-webkit-grid-row-end') is "foo"
-PASS getComputedStyle(gridItemWithSpanCustomIdent, '').getPropertyValue('-webkit-grid-column') is "1 / span 1 first"
-PASS getComputedStyle(gridItemWithSpanCustomIdent, '').getPropertyValue('-webkit-grid-column-start') is "1"
-PASS getComputedStyle(gridItemWithSpanCustomIdent, '').getPropertyValue('-webkit-grid-column-end') is "span 1 first"
-PASS getComputedStyle(gridItemWithSpanCustomIdent, '').getPropertyValue('-webkit-grid-row') is "-1 / span 1 last"
-PASS getComputedStyle(gridItemWithSpanCustomIdent, '').getPropertyValue('-webkit-grid-row-start') is "-1"
-PASS getComputedStyle(gridItemWithSpanCustomIdent, '').getPropertyValue('-webkit-grid-row-end') is "span 1 last"
-PASS getComputedStyle(gridItemWithSpanNumberCustomIdent, '').getPropertyValue('-webkit-grid-column') is "1 / span 3 first"
-PASS getComputedStyle(gridItemWithSpanNumberCustomIdent, '').getPropertyValue('-webkit-grid-column-start') is "1"
-PASS getComputedStyle(gridItemWithSpanNumberCustomIdent, '').getPropertyValue('-webkit-grid-column-end') is "span 3 first"
-PASS getComputedStyle(gridItemWithSpanNumberCustomIdent, '').getPropertyValue('-webkit-grid-row') is "-1 / span 2 last"
-PASS getComputedStyle(gridItemWithSpanNumberCustomIdent, '').getPropertyValue('-webkit-grid-row-start') is "-1"
-PASS getComputedStyle(gridItemWithSpanNumberCustomIdent, '').getPropertyValue('-webkit-grid-row-end') is "span 2 last"
-PASS getComputedStyle(gridItemWithSingleNamedGridArea, '').getPropertyValue('-webkit-grid-column') is "thirdArea / thirdArea"
-PASS getComputedStyle(gridItemWithSingleNamedGridArea, '').getPropertyValue('-webkit-grid-column-start') is "thirdArea"
-PASS getComputedStyle(gridItemWithSingleNamedGridArea, '').getPropertyValue('-webkit-grid-column-end') is "thirdArea"
-PASS getComputedStyle(gridItemWithSingleNamedGridArea, '').getPropertyValue('-webkit-grid-row') is "firstArea / firstArea"
-PASS getComputedStyle(gridItemWithSingleNamedGridArea, '').getPropertyValue('-webkit-grid-row-start') is "firstArea"
-PASS getComputedStyle(gridItemWithSingleNamedGridArea, '').getPropertyValue('-webkit-grid-row-end') is "firstArea"
-PASS getComputedStyle(gridItemWithNamedGridAreaAndSpan, '').getPropertyValue('-webkit-grid-column') is "thirdArea / span 1"
-PASS getComputedStyle(gridItemWithNamedGridAreaAndSpan, '').getPropertyValue('-webkit-grid-column-start') is "thirdArea"
-PASS getComputedStyle(gridItemWithNamedGridAreaAndSpan, '').getPropertyValue('-webkit-grid-column-end') is "span 1"
-PASS getComputedStyle(gridItemWithNamedGridAreaAndSpan, '').getPropertyValue('-webkit-grid-row') is "firstArea / span 2"
-PASS getComputedStyle(gridItemWithNamedGridAreaAndSpan, '').getPropertyValue('-webkit-grid-row-start') is "firstArea"
-PASS getComputedStyle(gridItemWithNamedGridAreaAndSpan, '').getPropertyValue('-webkit-grid-row-end') is "span 2"
+Test getting grid-column and grid-row set through CSS
+PASS getComputedStyle(gridItemWithNoCSSRule, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItemWithNoCSSRule, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItemWithNoCSSRule, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItemWithNoCSSRule, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItemWithNoCSSRule, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItemWithNoCSSRule, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('grid-column') is "10 / auto"
+PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('grid-column-start') is "10"
+PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('grid-row') is "15 / auto"
+PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('grid-row-start') is "15"
+PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('grid-column') is "-10 / auto"
+PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('grid-column-start') is "-10"
+PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('grid-row') is "-15 / auto"
+PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('grid-row-start') is "-15"
+PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('grid-column') is "10 / 15"
+PASS getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('grid-column-start') is "10"
+PASS getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('grid-column-end') is "15"
+PASS getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('grid-row') is "5 / 5"
+PASS getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('grid-row-start') is "5"
+PASS getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('grid-row-end') is "5"
+PASS getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('grid-column') is "10 / -10"
+PASS getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('grid-column-start') is "10"
+PASS getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('grid-column-end') is "-10"
+PASS getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('grid-row') is "-8 / 5"
+PASS getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('grid-row-start') is "-8"
+PASS getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('grid-row-end') is "5"
+PASS getComputedStyle(gridItemWithBeforeSpanElement, '').getPropertyValue('grid-column') is "span 2 / 4"
+PASS getComputedStyle(gridItemWithBeforeSpanElement, '').getPropertyValue('grid-column-start') is "span 2"
+PASS getComputedStyle(gridItemWithBeforeSpanElement, '').getPropertyValue('grid-column-end') is "4"
+PASS getComputedStyle(gridItemWithBeforeSpanElement, '').getPropertyValue('grid-row') is "3 / span 5"
+PASS getComputedStyle(gridItemWithBeforeSpanElement, '').getPropertyValue('grid-row-start') is "3"
+PASS getComputedStyle(gridItemWithBeforeSpanElement, '').getPropertyValue('grid-row-end') is "span 5"
+PASS getComputedStyle(gridItemWithAfterSpanElement, '').getPropertyValue('grid-column') is "span 2 / 4"
+PASS getComputedStyle(gridItemWithAfterSpanElement, '').getPropertyValue('grid-column-start') is "span 2"
+PASS getComputedStyle(gridItemWithAfterSpanElement, '').getPropertyValue('grid-column-end') is "4"
+PASS getComputedStyle(gridItemWithAfterSpanElement, '').getPropertyValue('grid-row') is "3 / span 5"
+PASS getComputedStyle(gridItemWithAfterSpanElement, '').getPropertyValue('grid-row-start') is "3"
+PASS getComputedStyle(gridItemWithAfterSpanElement, '').getPropertyValue('grid-row-end') is "span 5"
+PASS getComputedStyle(gridItemWith2OnlySpanElement, '').getPropertyValue('grid-column') is "span 1 / span 1"
+PASS getComputedStyle(gridItemWith2OnlySpanElement, '').getPropertyValue('grid-column-start') is "span 1"
+PASS getComputedStyle(gridItemWith2OnlySpanElement, '').getPropertyValue('grid-column-end') is "span 1"
+PASS getComputedStyle(gridItemWith2OnlySpanElement, '').getPropertyValue('grid-row') is "span 1 / span 1"
+PASS getComputedStyle(gridItemWith2OnlySpanElement, '').getPropertyValue('grid-row-start') is "span 1"
+PASS getComputedStyle(gridItemWith2OnlySpanElement, '').getPropertyValue('grid-row-end') is "span 1"
+PASS getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('grid-column') is "10 / 11"
+PASS getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('grid-column-start') is "10"
+PASS getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('grid-column-end') is "11"
+PASS getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('grid-row') is "4 / 5"
+PASS getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('grid-row-start') is "4"
+PASS getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('grid-row-end') is "5"
+PASS getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('grid-column') is "auto / 1"
+PASS getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('grid-column-end') is "1"
+PASS getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('grid-row') is "5 / auto"
+PASS getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('grid-row-start') is "5"
+PASS getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('grid-column') is "first / first"
+PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('grid-column-start') is "first"
+PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('grid-column-end') is "first"
+PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('grid-row') is "last / last"
+PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('grid-row-start') is "last"
+PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('grid-row-end') is "last"
+PASS getComputedStyle(gridItemWithNonExistingCustomIdent, '').getPropertyValue('grid-column') is "nav / nav"
+PASS getComputedStyle(gridItemWithNonExistingCustomIdent, '').getPropertyValue('grid-column-start') is "nav"
+PASS getComputedStyle(gridItemWithNonExistingCustomIdent, '').getPropertyValue('grid-column-end') is "nav"
+PASS getComputedStyle(gridItemWithNonExistingCustomIdent, '').getPropertyValue('grid-row') is "foo / foo"
+PASS getComputedStyle(gridItemWithNonExistingCustomIdent, '').getPropertyValue('grid-row-start') is "foo"
+PASS getComputedStyle(gridItemWithNonExistingCustomIdent, '').getPropertyValue('grid-row-end') is "foo"
+PASS getComputedStyle(gridItemWithSpanCustomIdent, '').getPropertyValue('grid-column') is "1 / span 1 first"
+PASS getComputedStyle(gridItemWithSpanCustomIdent, '').getPropertyValue('grid-column-start') is "1"
+PASS getComputedStyle(gridItemWithSpanCustomIdent, '').getPropertyValue('grid-column-end') is "span 1 first"
+PASS getComputedStyle(gridItemWithSpanCustomIdent, '').getPropertyValue('grid-row') is "-1 / span 1 last"
+PASS getComputedStyle(gridItemWithSpanCustomIdent, '').getPropertyValue('grid-row-start') is "-1"
+PASS getComputedStyle(gridItemWithSpanCustomIdent, '').getPropertyValue('grid-row-end') is "span 1 last"
+PASS getComputedStyle(gridItemWithSpanNumberCustomIdent, '').getPropertyValue('grid-column') is "1 / span 3 first"
+PASS getComputedStyle(gridItemWithSpanNumberCustomIdent, '').getPropertyValue('grid-column-start') is "1"
+PASS getComputedStyle(gridItemWithSpanNumberCustomIdent, '').getPropertyValue('grid-column-end') is "span 3 first"
+PASS getComputedStyle(gridItemWithSpanNumberCustomIdent, '').getPropertyValue('grid-row') is "-1 / span 2 last"
+PASS getComputedStyle(gridItemWithSpanNumberCustomIdent, '').getPropertyValue('grid-row-start') is "-1"
+PASS getComputedStyle(gridItemWithSpanNumberCustomIdent, '').getPropertyValue('grid-row-end') is "span 2 last"
+PASS getComputedStyle(gridItemWithSingleNamedGridArea, '').getPropertyValue('grid-column') is "thirdArea / thirdArea"
+PASS getComputedStyle(gridItemWithSingleNamedGridArea, '').getPropertyValue('grid-column-start') is "thirdArea"
+PASS getComputedStyle(gridItemWithSingleNamedGridArea, '').getPropertyValue('grid-column-end') is "thirdArea"
+PASS getComputedStyle(gridItemWithSingleNamedGridArea, '').getPropertyValue('grid-row') is "firstArea / firstArea"
+PASS getComputedStyle(gridItemWithSingleNamedGridArea, '').getPropertyValue('grid-row-start') is "firstArea"
+PASS getComputedStyle(gridItemWithSingleNamedGridArea, '').getPropertyValue('grid-row-end') is "firstArea"
+PASS getComputedStyle(gridItemWithNamedGridAreaAndSpan, '').getPropertyValue('grid-column') is "thirdArea / span 1"
+PASS getComputedStyle(gridItemWithNamedGridAreaAndSpan, '').getPropertyValue('grid-column-start') is "thirdArea"
+PASS getComputedStyle(gridItemWithNamedGridAreaAndSpan, '').getPropertyValue('grid-column-end') is "span 1"
+PASS getComputedStyle(gridItemWithNamedGridAreaAndSpan, '').getPropertyValue('grid-row') is "firstArea / span 2"
+PASS getComputedStyle(gridItemWithNamedGridAreaAndSpan, '').getPropertyValue('grid-row-start') is "firstArea"
+PASS getComputedStyle(gridItemWithNamedGridAreaAndSpan, '').getPropertyValue('grid-row-end') is "span 2"
Test the initial value
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is 'auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is 'auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is 'auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-column') is 'auto / auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-column-start') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-column-end') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-row') is 'auto / auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-row-start') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-row-end') is 'auto'
Test getting and setting grid-column and grid-row through JS
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "18 / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "18"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "66 / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "66"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "-55 / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "-55"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "-40 / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "-40"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "10 / 55"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "10"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "55"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "1 / 10"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "1"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "10"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "span 5 / 5"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "span 5"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "5"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "4 / span 4"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "4"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "span 4"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "-5 / 5"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "-5"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "5"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "4 / -4"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "4"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "-4"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "4 / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "4"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "5 / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "5"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / 5"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "5"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / 8"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "8"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "span 1 / 3"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "span 1"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "3"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "5 / span 1"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "5"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "span 1"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "span 1 first / 3"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "span 1 first"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "3"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "5 / span 1 last"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "5"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "span 1 last"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "first / last"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "first"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "last"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "nav / span 1 last"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "nav"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "span 1 last"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "3 first / 2 last"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "3 first"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "2 last"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "5 nav / span 7 last"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "5 nav"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "span 7 last"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "span 3 first / -3 last"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "span 3 first"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "-3 last"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "span 2 last / -1 nav"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "span 2 last"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "-1 nav"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "5 / none"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "5"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "none"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "8 / foobar"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "8"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "foobar"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "nonExistent / none"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "nonExistent"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "none"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "nonExistent / foobar"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "nonExistent"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "foobar"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "span 3 first / none"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "span 3 first"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "none"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "span 1 last / foobar"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "span 1 last"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "foobar"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "span 5 / span 2"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "span 5"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "span 2"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "span 1 first / span 1 last"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "span 1 first"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "span 1 last"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "span 5 first / span 2 last"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "span 5 first"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "span 2 last"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "span 3 first / span 7 last"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "span 3 first"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "span 7 last"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "18 / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "18"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "66 / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "66"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "-55 / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "-55"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "-40 / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "-40"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "10 / 55"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "10"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "55"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "1 / 10"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "1"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "10"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "span 5 / 5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "span 5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "4 / span 4"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "4"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "span 4"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "-5 / 5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "-5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "4 / -4"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "4"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "-4"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "4 / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "4"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "5 / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / 5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / 8"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "8"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "span 1 / 3"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "span 1"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "3"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "5 / span 1"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "span 1"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "span 1 first / 3"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "span 1 first"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "3"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "5 / span 1 last"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "span 1 last"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "first / last"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "first"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "last"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "nav / span 1 last"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "nav"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "span 1 last"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "3 first / 2 last"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "3 first"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "2 last"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "5 nav / span 7 last"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "5 nav"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "span 7 last"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "span 3 first / -3 last"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "span 3 first"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "-3 last"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "span 2 last / -1 nav"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "span 2 last"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "-1 nav"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "5 / none"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "none"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "8 / foobar"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "8"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "foobar"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "nonExistent / none"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "nonExistent"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "none"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "nonExistent / foobar"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "nonExistent"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "foobar"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "span 3 first / none"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "span 3 first"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "none"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "span 1 last / foobar"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "span 1 last"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "foobar"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "span 5 / span 2"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "span 5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "span 2"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "span 1 first / span 1 last"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "span 1 first"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "span 1 last"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "span 5 first / span 2 last"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "span 5 first"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "span 2 last"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "span 3 first / span 7 last"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "span 3 first"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "span 7 last"
Test setting grid-column and grid-row back to 'auto' through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is '18 / 19'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is '18'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is '19'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is '66 / 68'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is '66'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is '68'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is 'auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is 'auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is 'auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-column') is '18 / 19'
+PASS getComputedStyle(element, '').getPropertyValue('grid-column-start') is '18'
+PASS getComputedStyle(element, '').getPropertyValue('grid-column-end') is '19'
+PASS getComputedStyle(element, '').getPropertyValue('grid-row') is '66 / 68'
+PASS getComputedStyle(element, '').getPropertyValue('grid-row-start') is '66'
+PASS getComputedStyle(element, '').getPropertyValue('grid-row-end') is '68'
+PASS getComputedStyle(element, '').getPropertyValue('grid-column') is 'auto / auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-column-start') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-column-end') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-row') is 'auto / auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-row-start') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-row-end') is 'auto'
Test getting and setting 'initial' grid-column and grid-row through JS
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "1 / span 2"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "1"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "span 2"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "span 3 / 5"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "span 3"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "5"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "span 3 / 5"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "span 3"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "5"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "1 / span 2"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "1"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "span 2"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "span 3 / 5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "span 3"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "span 3 / 5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "span 3"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
Test getting and setting 'inherit' grid-column and grid-row through JS
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "1 / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "1"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "span 1 / 7"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "span 1"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "7"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "6 / span 2"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "6"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "span 2"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "1 / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "1"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "6 / span 2"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "6"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "span 2"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "span 1 / 7"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "span 1"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "7"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "1 / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "1"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "span 1 / 7"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "span 1"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "7"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "6 / span 2"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "6"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "span 2"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "1 / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "1"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "6 / span 2"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "6"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "span 2"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "span 1 / 7"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "span 1"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "7"
Test getting and setting invalid grid-column and grid-row through JS
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set.html b/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set.html
index 96a99a3..1f599a1 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set.html
@@ -4,80 +4,80 @@
<script src="resources/grid-item-column-row-parsing-utils.js"></script>
<style>
.grid {
- -webkit-grid-template-areas: "firstArea secondArea"
+ grid-template-areas: "firstArea secondArea"
"thirdArea thirdArea";
- -webkit-grid-template-columns: [first nav] 10px 10px;
- -webkit-grid-template-rows: [last] 10px 10px;
+ grid-template-columns: [first nav] 10px 10px;
+ grid-template-rows: [last] 10px 10px;
}
.gridItemWithPositiveInteger {
- -webkit-grid-column: 10;
- -webkit-grid-row: 15;
+ grid-column: 10;
+ grid-row: 15;
}
.gridItemWithNegativeInteger {
- -webkit-grid-column: -10;
- -webkit-grid-row: -15;
+ grid-column: -10;
+ grid-row: -15;
}
.gridItemWithAuto {
- -webkit-grid-column: auto;
- -webkit-grid-row: auto;
+ grid-column: auto;
+ grid-row: auto;
}
.gridItemWith2Integer {
- -webkit-grid-column: 10 / 15;
- -webkit-grid-row: 5 / 5;
+ grid-column: 10 / 15;
+ grid-row: 5 / 5;
}
.gridItemWithNegativePositiveInteger {
- -webkit-grid-column: 10 / -10;
- -webkit-grid-row: -8 / 5;
+ grid-column: 10 / -10;
+ grid-row: -8 / 5;
}
.gridItemWithBeforeSpan {
- -webkit-grid-column: span 2 / 4;
- -webkit-grid-row: 3 / span 5;
+ grid-column: span 2 / 4;
+ grid-row: 3 / span 5;
}
.gridItemWithAfterSpan {
- -webkit-grid-column: 2 span / 4;
- -webkit-grid-row: 3 / 5 span;
+ grid-column: 2 span / 4;
+ grid-row: 3 / 5 span;
}
.gridItemWith2OnlySpan {
- -webkit-grid-column: span / span;
- -webkit-grid-row: span / span;
+ grid-column: span / span;
+ grid-row: span / span;
}
.gridItemWith2Auto {
- -webkit-grid-column: auto / auto;
- -webkit-grid-row: auto / auto;
+ grid-column: auto / auto;
+ grid-row: auto / auto;
}
.gridItemWithBothLongHand {
- -webkit-grid-column-end: 11;
- -webkit-grid-row-start: 4;
+ grid-column-end: 11;
+ grid-row-start: 4;
}
.gridItemWithNoSpace {
- -webkit-grid-column: auto/1;
- -webkit-grid-row: 5/auto;
+ grid-column: auto/1;
+ grid-row: 5/auto;
}
.gridItemWithCustomIdent {
- -webkit-grid-column: first;
- -webkit-grid-row: last;
+ grid-column: first;
+ grid-row: last;
}
.gridItemWithNonExistingCustomIdent {
- -webkit-grid-column: nav;
- -webkit-grid-row: foo;
+ grid-column: nav;
+ grid-row: foo;
}
.gridItemWithSpanCustomIdent {
- -webkit-grid-column: 1 /span first;
- -webkit-grid-row: -1 / span last;
+ grid-column: 1 /span first;
+ grid-row: -1 / span last;
}
.gridItemWithSpanNumberCustomIdent {
- -webkit-grid-column: 1 /span 3 first;
- -webkit-grid-row: -1 / last 2 span ;
+ grid-column: 1 /span 3 first;
+ grid-row: -1 / last 2 span ;
}
.gridItemWithSingleNamedGridArea {
- -webkit-grid-column: thirdArea;
- -webkit-grid-row: firstArea;
+ grid-column: thirdArea;
+ grid-row: firstArea;
}
.gridItemWithNamedGridAreaAndSpan {
- -webkit-grid-column: thirdArea / span;
- -webkit-grid-row: firstArea / span 2;
+ grid-column: thirdArea / span;
+ grid-row: firstArea / span 2;
}
</style>
<script src="../../resources/js-test-pre.js"></script>
@@ -107,7 +107,7 @@
<script>
description('Test that setting and getting grid-column and grid-row works as expected');
- debug("Test getting -webkit-grid-column and -webkit-grid-row set through CSS");
+ debug("Test getting grid-column and grid-row set through CSS");
testColumnRowCSSParsing("gridItemWithNoCSSRule", "auto / auto", "auto / auto");
testColumnRowCSSParsing("gridItemWithPositiveInteger", "10 / auto", "15 / auto");
testColumnRowCSSParsing("gridItemWithNegativeInteger", "-10 / auto", "-15 / auto");
@@ -131,12 +131,12 @@
debug("Test the initial value");
var element = document.createElement("div");
document.body.appendChild(element);
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'auto'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'auto'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'auto'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-column')", "'auto / auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-column-start')", "'auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-column-end')", "'auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-row')", "'auto / auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-row-start')", "'auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-row-end')", "'auto'");
debug("");
debug("Test getting and setting grid-column and grid-row through JS");
@@ -161,23 +161,23 @@
debug("");
debug("Test setting grid-column and grid-row back to 'auto' through JS");
- element.style.webkitGridColumn = "18 / 19";
- element.style.webkitGridRow = "66 / 68";
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'18 / 19'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'18'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'19'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'66 / 68'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'66'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'68'");
+ element.style.gridColumn = "18 / 19";
+ element.style.gridRow = "66 / 68";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-column')", "'18 / 19'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-column-start')", "'18'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-column-end')", "'19'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-row')", "'66 / 68'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-row-start')", "'66'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-row-end')", "'68'");
- element.style.webkitGridColumn = "auto";
- element.style.webkitGridRow = "auto";
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'auto'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'auto'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'auto'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
+ element.style.gridColumn = "auto";
+ element.style.gridRow = "auto";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-column')", "'auto / auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-column-start')", "'auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-column-end')", "'auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-row')", "'auto / auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-row-start')", "'auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-row-end')", "'auto'");
debug("");
debug("Test getting and setting 'initial' grid-column and grid-row through JS");
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-display.html b/LayoutTests/fast/css-grid-layout/grid-item-display.html
index 51b1cfc..3ca3199 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-display.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-display.html
@@ -3,14 +3,14 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-columns: 50px 100px 200px;
- -webkit-grid-template-rows: 50px 100px 200px;
+ grid-template-columns: 50px 100px 200px;
+ grid-template-rows: 50px 100px 200px;
background-color: #aaa;
}
.grid > * {
margin: 0; /* Disable any margins as they change the top / left offsets. */
- -webkit-grid-column: 2;
- -webkit-grid-row: 3;
+ grid-column: 2;
+ grid-row: 3;
}
</style>
<script src="../../resources/check-layout.js"></script>
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set-expected.txt b/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set-expected.txt
index 2f405d1..bf7ea5d 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set-expected.txt
@@ -3,191 +3,191 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-Test getting -webkit-grid-column-end and -webkit-grid-row-end set through CSS
-PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-column') is "auto / 10"
-PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-column-end') is "10"
-PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-row') is "auto / 15"
-PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-row-end') is "15"
-PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-column') is "auto / -10"
-PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-column-end') is "-10"
-PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-row') is "auto / -15"
-PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-row-end') is "-15"
-PASS getComputedStyle(gridItemWithBeforeSpan, '').getPropertyValue('-webkit-grid-column') is "auto / span 2"
-PASS getComputedStyle(gridItemWithBeforeSpan, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItemWithBeforeSpan, '').getPropertyValue('-webkit-grid-column-end') is "span 2"
-PASS getComputedStyle(gridItemWithBeforeSpan, '').getPropertyValue('-webkit-grid-row') is "auto / span 9"
-PASS getComputedStyle(gridItemWithBeforeSpan, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItemWithBeforeSpan, '').getPropertyValue('-webkit-grid-row-end') is "span 9"
-PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('-webkit-grid-column') is "auto / span 2"
-PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('-webkit-grid-column-end') is "span 2"
-PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('-webkit-grid-row') is "auto / span 9"
-PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('-webkit-grid-row-end') is "span 9"
-PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('-webkit-grid-column') is "auto / span 1"
-PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('-webkit-grid-column-end') is "span 1"
-PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('-webkit-grid-row') is "auto / span 1"
-PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('-webkit-grid-row-end') is "span 1"
-PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('-webkit-grid-column') is "auto / first"
-PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('-webkit-grid-column-end') is "first"
-PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('-webkit-grid-row') is "auto / last"
-PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('-webkit-grid-row-end') is "last"
-PASS getComputedStyle(gridItemWithNumberCustomIdent, '').getPropertyValue('-webkit-grid-column') is "auto / 2 first"
-PASS getComputedStyle(gridItemWithNumberCustomIdent, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItemWithNumberCustomIdent, '').getPropertyValue('-webkit-grid-column-end') is "2 first"
-PASS getComputedStyle(gridItemWithNumberCustomIdent, '').getPropertyValue('-webkit-grid-row') is "auto / 3 last"
-PASS getComputedStyle(gridItemWithNumberCustomIdent, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItemWithNumberCustomIdent, '').getPropertyValue('-webkit-grid-row-end') is "3 last"
-PASS getComputedStyle(gridItemWithSpanCustomIdentElement, '').getPropertyValue('-webkit-grid-column') is "auto / span 1 first"
-PASS getComputedStyle(gridItemWithSpanCustomIdentElement, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItemWithSpanCustomIdentElement, '').getPropertyValue('-webkit-grid-column-end') is "span 1 first"
-PASS getComputedStyle(gridItemWithSpanCustomIdentElement, '').getPropertyValue('-webkit-grid-row') is "auto / span 1 last"
-PASS getComputedStyle(gridItemWithSpanCustomIdentElement, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItemWithSpanCustomIdentElement, '').getPropertyValue('-webkit-grid-row-end') is "span 1 last"
-PASS getComputedStyle(gridItemWithSpanNumberCustomIdentElement, '').getPropertyValue('-webkit-grid-column') is "auto / span 2 first"
-PASS getComputedStyle(gridItemWithSpanNumberCustomIdentElement, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItemWithSpanNumberCustomIdentElement, '').getPropertyValue('-webkit-grid-column-end') is "span 2 first"
-PASS getComputedStyle(gridItemWithSpanNumberCustomIdentElement, '').getPropertyValue('-webkit-grid-row') is "auto / span 3 last"
-PASS getComputedStyle(gridItemWithSpanNumberCustomIdentElement, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItemWithSpanNumberCustomIdentElement, '').getPropertyValue('-webkit-grid-row-end') is "span 3 last"
-PASS getComputedStyle(gridItemWithArea, '').getPropertyValue('-webkit-grid-column') is "auto / firstArea"
-PASS getComputedStyle(gridItemWithArea, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItemWithArea, '').getPropertyValue('-webkit-grid-column-end') is "firstArea"
-PASS getComputedStyle(gridItemWithArea, '').getPropertyValue('-webkit-grid-row') is "auto / thirdArea"
-PASS getComputedStyle(gridItemWithArea, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItemWithArea, '').getPropertyValue('-webkit-grid-row-end') is "thirdArea"
+Test getting grid-column-end and grid-row-end set through CSS
+PASS getComputedStyle(gridElement, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridElement, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridElement, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridElement, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridElement, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridElement, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('grid-column') is "auto / 10"
+PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('grid-column-end') is "10"
+PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('grid-row') is "auto / 15"
+PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('grid-row-end') is "15"
+PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('grid-column') is "auto / -10"
+PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('grid-column-end') is "-10"
+PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('grid-row') is "auto / -15"
+PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('grid-row-end') is "-15"
+PASS getComputedStyle(gridItemWithBeforeSpan, '').getPropertyValue('grid-column') is "auto / span 2"
+PASS getComputedStyle(gridItemWithBeforeSpan, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItemWithBeforeSpan, '').getPropertyValue('grid-column-end') is "span 2"
+PASS getComputedStyle(gridItemWithBeforeSpan, '').getPropertyValue('grid-row') is "auto / span 9"
+PASS getComputedStyle(gridItemWithBeforeSpan, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItemWithBeforeSpan, '').getPropertyValue('grid-row-end') is "span 9"
+PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('grid-column') is "auto / span 2"
+PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('grid-column-end') is "span 2"
+PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('grid-row') is "auto / span 9"
+PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('grid-row-end') is "span 9"
+PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-column') is "auto / span 1"
+PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-column-end') is "span 1"
+PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-row') is "auto / span 1"
+PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-row-end') is "span 1"
+PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('grid-column') is "auto / first"
+PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('grid-column-end') is "first"
+PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('grid-row') is "auto / last"
+PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('grid-row-end') is "last"
+PASS getComputedStyle(gridItemWithNumberCustomIdent, '').getPropertyValue('grid-column') is "auto / 2 first"
+PASS getComputedStyle(gridItemWithNumberCustomIdent, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItemWithNumberCustomIdent, '').getPropertyValue('grid-column-end') is "2 first"
+PASS getComputedStyle(gridItemWithNumberCustomIdent, '').getPropertyValue('grid-row') is "auto / 3 last"
+PASS getComputedStyle(gridItemWithNumberCustomIdent, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItemWithNumberCustomIdent, '').getPropertyValue('grid-row-end') is "3 last"
+PASS getComputedStyle(gridItemWithSpanCustomIdentElement, '').getPropertyValue('grid-column') is "auto / span 1 first"
+PASS getComputedStyle(gridItemWithSpanCustomIdentElement, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItemWithSpanCustomIdentElement, '').getPropertyValue('grid-column-end') is "span 1 first"
+PASS getComputedStyle(gridItemWithSpanCustomIdentElement, '').getPropertyValue('grid-row') is "auto / span 1 last"
+PASS getComputedStyle(gridItemWithSpanCustomIdentElement, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItemWithSpanCustomIdentElement, '').getPropertyValue('grid-row-end') is "span 1 last"
+PASS getComputedStyle(gridItemWithSpanNumberCustomIdentElement, '').getPropertyValue('grid-column') is "auto / span 2 first"
+PASS getComputedStyle(gridItemWithSpanNumberCustomIdentElement, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItemWithSpanNumberCustomIdentElement, '').getPropertyValue('grid-column-end') is "span 2 first"
+PASS getComputedStyle(gridItemWithSpanNumberCustomIdentElement, '').getPropertyValue('grid-row') is "auto / span 3 last"
+PASS getComputedStyle(gridItemWithSpanNumberCustomIdentElement, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItemWithSpanNumberCustomIdentElement, '').getPropertyValue('grid-row-end') is "span 3 last"
+PASS getComputedStyle(gridItemWithArea, '').getPropertyValue('grid-column') is "auto / firstArea"
+PASS getComputedStyle(gridItemWithArea, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItemWithArea, '').getPropertyValue('grid-column-end') is "firstArea"
+PASS getComputedStyle(gridItemWithArea, '').getPropertyValue('grid-row') is "auto / thirdArea"
+PASS getComputedStyle(gridItemWithArea, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItemWithArea, '').getPropertyValue('grid-row-end') is "thirdArea"
Test the initial value
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is 'auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is 'auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-column-end') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-column') is 'auto / auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-row-end') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-row') is 'auto / auto'
Test getting and setting grid-column-end and grid-row-end through JS
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / 18"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "18"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / 66"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "66"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / -55"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "-55"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / -40"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "-40"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / first"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "first"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / last"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "last"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / span 7"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "span 7"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / span 2"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "span 2"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / span 1 first"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "span 1 first"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / span 1 last"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "span 1 last"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / thirdArea"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "thirdArea"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / secondArea"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "secondArea"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / nonExistentArea"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "nonExistentArea"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / secondArea"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "secondArea"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / secondArea"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "secondArea"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / nonExistentArea"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "nonExistentArea"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / 18"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "18"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / 66"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "66"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / -55"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "-55"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / -40"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "-40"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / first"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "first"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / last"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "last"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / span 7"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "span 7"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / span 2"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "span 2"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / span 1 first"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "span 1 first"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / span 1 last"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "span 1 last"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / thirdArea"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "thirdArea"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / secondArea"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "secondArea"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / nonExistentArea"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "nonExistentArea"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / secondArea"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "secondArea"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / secondArea"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "secondArea"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / nonExistentArea"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "nonExistentArea"
Test setting grid-start and grid-before to 'inherit' through JS
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / span 2"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "span 2"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / 18"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "18"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / 2"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "2"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / 7"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "7"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / span 2"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "span 2"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / 7"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "7"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / span 2"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "span 2"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / 18"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "18"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / 2"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "2"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / 7"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "7"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / span 2"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "span 2"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / 7"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "7"
Test setting grid-start and grid-before to 'initial' through JS
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "1 / span 2"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "1"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "span 2"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "span 3 / 5"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "span 3"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "5"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "1 / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "1"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "span 3 / 5"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "span 3"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "5"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "1 / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "1"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "span 3 / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "span 3"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "1 / span 2"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "1"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "span 2"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "span 3 / 5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "span 3"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "1 / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "1"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "span 3 / 5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "span 3"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "1 / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "1"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "span 3 / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "span 3"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
Test setting grid-column-end and grid-row-end back to 'auto' through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is '18'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto / 18'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is '66'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto / 66'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is 'auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is 'auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-column-end') is '18'
+PASS getComputedStyle(element, '').getPropertyValue('grid-column') is 'auto / 18'
+PASS getComputedStyle(element, '').getPropertyValue('grid-row-end') is '66'
+PASS getComputedStyle(element, '').getPropertyValue('grid-row') is 'auto / 66'
+PASS getComputedStyle(element, '').getPropertyValue('grid-column-end') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-column') is 'auto / auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-row-end') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-row') is 'auto / auto'
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set.html b/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set.html
index f0291f3..d172c00 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set.html
@@ -4,53 +4,53 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-areas: "firstArea secondArea"
+ grid-template-areas: "firstArea secondArea"
"thirdArea thirdArea";
}
.gridItemWithPositiveInteger {
- -webkit-grid-column-end: 10;
- -webkit-grid-row-end: 15;
+ grid-column-end: 10;
+ grid-row-end: 15;
}
.gridItemWithNegativeInteger {
- -webkit-grid-column-end: -10;
- -webkit-grid-row-end: -15;
+ grid-column-end: -10;
+ grid-row-end: -15;
}
.gridItemWithBeforeSpan {
- -webkit-grid-column-end: span 2;
- -webkit-grid-row-end: span 9;
+ grid-column-end: span 2;
+ grid-row-end: span 9;
}
.gridItemWithAfterSpan {
- -webkit-grid-column-end: 2 span;
- -webkit-grid-row-end: 9 span;
+ grid-column-end: 2 span;
+ grid-row-end: 9 span;
}
.gridItemWithOnlySpan {
- -webkit-grid-column-end: span;
- -webkit-grid-row-end: span;
+ grid-column-end: span;
+ grid-row-end: span;
}
.gridItemWithAuto {
- -webkit-grid-column-end: auto;
- -webkit-grid-row-end: auto;
+ grid-column-end: auto;
+ grid-row-end: auto;
}
.gridItemWithCustomIdent {
- -webkit-grid-column-end: first;
- -webkit-grid-row-end: last;
+ grid-column-end: first;
+ grid-row-end: last;
}
.gridItemWithNumberCustomIdent {
- -webkit-grid-column-end: first 2;
- -webkit-grid-row-end: 3 last;
+ grid-column-end: first 2;
+ grid-row-end: 3 last;
}
.gridItemWithSpanCustomIdent {
- -webkit-grid-column-end: first span;
- -webkit-grid-row-end: span last;
+ grid-column-end: first span;
+ grid-row-end: span last;
}
.gridItemWithSpanNumberCustomIdent {
- -webkit-grid-column-end: 2 first span;
- -webkit-grid-row-end: last 3 span;
+ grid-column-end: 2 first span;
+ grid-row-end: last 3 span;
}
.gridItemWithArea {
- -webkit-grid-column-end: firstArea;
- -webkit-grid-row-end: thirdArea;
+ grid-column-end: firstArea;
+ grid-row-end: thirdArea;
}
</style>
<script src="resources/grid-item-column-row-parsing-utils.js"></script>
@@ -75,7 +75,7 @@
<script>
description('Test that setting and getting grid-column-end and grid-row-end works as expected');
- debug("Test getting -webkit-grid-column-end and -webkit-grid-row-end set through CSS");
+ debug("Test getting grid-column-end and grid-row-end set through CSS");
testColumnRowCSSParsing("gridElement", "auto / auto", "auto / auto");
testColumnRowCSSParsing("gridItemWithPositiveInteger", "auto / 10", "auto / 15");
testColumnRowCSSParsing("gridItemWithNegativeInteger", "auto / -10", "auto / -15");
@@ -93,10 +93,10 @@
debug("Test the initial value");
var element = document.createElement("div");
document.body.appendChild(element);
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'auto'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-column-end')", "'auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-column')", "'auto / auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-row-end')", "'auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-row')", "'auto / auto'");
debug("");
debug("Test getting and setting grid-column-end and grid-row-end through JS");
@@ -122,18 +122,18 @@
debug("");
debug("Test setting grid-column-end and grid-row-end back to 'auto' through JS");
- element.style.webkitGridColumnEnd = "18";
- element.style.webkitGridRowEnd = "66";
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'18'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto / 18'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'66'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / 66'");
- element.style.webkitGridColumnEnd = "auto";
- element.style.webkitGridRowEnd = "auto";
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'auto'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
+ element.style.gridColumnEnd = "18";
+ element.style.gridRowEnd = "66";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-column-end')", "'18'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-column')", "'auto / 18'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-row-end')", "'66'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-row')", "'auto / 66'");
+ element.style.gridColumnEnd = "auto";
+ element.style.gridRowEnd = "auto";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-column-end')", "'auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-column')", "'auto / auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-row-end')", "'auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-row')", "'auto / auto'");
</script>
<script src="../../resources/js-test-post.js"></script>
</body>
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-ltr.html b/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-ltr.html
index 1e56e08..fa3fc0a9 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-ltr.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-ltr.html
@@ -4,8 +4,8 @@
<link href="resources/grid-alignment.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-rows: auto auto;
- -webkit-grid-template-columns: auto auto;
+ grid-template-rows: auto auto;
+ grid-template-columns: auto auto;
width: 200px;
}
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-rtl.html b/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-rtl.html
index e20d583..4eb07e7 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-rtl.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-rtl.html
@@ -4,8 +4,8 @@
<link href="resources/grid-alignment.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-rows: auto auto;
- -webkit-grid-template-columns: auto auto;
+ grid-template-rows: auto auto;
+ grid-template-columns: auto auto;
width: 200px;
}
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-ltr.html b/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-ltr.html
index 44f561c..e88c8bf7 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-ltr.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-ltr.html
@@ -4,8 +4,8 @@
<link href="resources/grid-alignment.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-rows: auto auto;
- -webkit-grid-template-columns: auto auto;
+ grid-template-rows: auto auto;
+ grid-template-columns: auto auto;
width: 200px;
}
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-rtl.html b/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-rtl.html
index d40d072..b8fdbf5 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-rtl.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-rtl.html
@@ -4,8 +4,8 @@
<link href="resources/grid-alignment.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-rows: auto auto;
- -webkit-grid-template-columns: auto auto;
+ grid-template-rows: auto auto;
+ grid-template-columns: auto auto;
width: 200px;
}
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-margin-resolution.html b/LayoutTests/fast/css-grid-layout/grid-item-margin-resolution.html
index 8e922dd..f00a373 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-margin-resolution.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-margin-resolution.html
@@ -5,8 +5,8 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-rows: 100px 100px;
- -webkit-grid-template-columns: 100px 100px;
+ grid-template-rows: 100px 100px;
+ grid-template-columns: 100px 100px;
width: 200px;
}
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-margins-not-collapse.html b/LayoutTests/fast/css-grid-layout/grid-item-margins-not-collapse.html
index 16e2342..e5d4adf 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-margins-not-collapse.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-margins-not-collapse.html
@@ -2,7 +2,7 @@
<div>This test checks that grid item's margins do not collapse with its content's margins (single margin in the first row and double between subsequent).</div>
-<div style="display: -webkit-grid;">
+<div style="display: grid;">
<div><p margin="20px 0px">XXXXX</p></div>
<div style="margin:20px 0px;">XXXXX</div>
<div><p margin="20px 0px">XXXXX</p></div>
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-multiple-minmax-content-resolution.html b/LayoutTests/fast/css-grid-layout/grid-item-multiple-minmax-content-resolution.html
index 5abb534..0cbf319 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-multiple-minmax-content-resolution.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-multiple-minmax-content-resolution.html
@@ -4,8 +4,8 @@
<link href="resources/grid-alignment.css" rel="stylesheet">
<style>
.gridMinMaxAutoWithColumnMinMaxAuto {
- -webkit-grid-template-columns: minmax(50px, 180px) auto;
- -webkit-grid-template-rows: auto minmax(50px, 100px);
+ grid-template-columns: minmax(50px, 180px) auto;
+ grid-template-rows: auto minmax(50px, 100px);
}
</style>
<script src="../../resources/check-layout.js"></script>
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-named-grid-area-resolution.html b/LayoutTests/fast/css-grid-layout/grid-item-named-grid-area-resolution.html
index eec8fac..9e94708 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-named-grid-area-resolution.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-named-grid-area-resolution.html
@@ -5,52 +5,52 @@
<link href="resources/grid-alignment.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-rows: [before] 50px [middle] 100px [after] 150px;
- -webkit-grid-template-columns: 40px 80px 160px;
+ grid-template-rows: [before] 50px [middle] 100px [after] 150px;
+ grid-template-columns: 40px 80px 160px;
}
.gridWithoutRepeat {
- -webkit-grid-template-areas: "first second third"
+ grid-template-areas: "first second third"
"fourth fifth sixth";
}
.gridWithRepeat {
- -webkit-grid-template-areas: "first second third"
+ grid-template-areas: "first second third"
"fourth fourth third";
}
.gridItemFirstArea {
- -webkit-grid-area: first;
+ grid-area: first;
}
.gridItemSecondArea {
- -webkit-grid-area: second;
+ grid-area: second;
}
.gridItemThirdArea {
- -webkit-grid-area: third;
+ grid-area: third;
}
.gridItemFourthArea {
- -webkit-grid-area: fourth;
+ grid-area: fourth;
}
.gridItemFifthArea {
- -webkit-grid-area: fifth;
+ grid-area: fifth;
}
.gridItemSixthArea {
- -webkit-grid-area: sixth;
+ grid-area: sixth;
}
.gridItemSpan2ThirdArea {
- -webkit-grid-row: fourth;
- -webkit-grid-column: span 2 / third;
+ grid-row: fourth;
+ grid-column: span 2 / third;
}
.gridItemNamedGridLineWithArea {
- -webkit-grid-row: third / after;
- -webkit-grid-column: 1;
+ grid-row: third / after;
+ grid-column: 1;
}
</style>
<script src="../../resources/check-layout.js"></script>
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-named-grid-line-resolution.html b/LayoutTests/fast/css-grid-layout/grid-item-named-grid-line-resolution.html
index 733258f..ad42340 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-named-grid-line-resolution.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-named-grid-line-resolution.html
@@ -4,63 +4,63 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-auto-columns: 5px;
- -webkit-grid-auto-rows: 5px;
+ grid-auto-columns: 5px;
+ grid-auto-rows: 5px;
}
.gridWithoutRepeat {
- -webkit-grid-template-columns: [a] 50px [b] 100px [c] 200px [d];
- -webkit-grid-template-rows: [e] 50px [f] 100px [g] 200px [h];
+ grid-template-columns: [a] 50px [b] 100px [c] 200px [d];
+ grid-template-rows: [e] 50px [f] 100px [g] 200px [h];
}
.gridWithRepeat {
- -webkit-grid-template-columns: [b] 50px [b] 100px [b] 200px [b];
- -webkit-grid-template-rows: [g] 50px [g] 100px [g] 200px [g];
+ grid-template-columns: [b] 50px [b] 100px [b] 200px [b];
+ grid-template-rows: [g] 50px [g] 100px [g] 200px [g];
}
.gridFromSpecs {
- -webkit-grid-template-columns: [A] 10px [B] 20px [C] 30px [A] 40px [B] 50px [C] 60px [A] 70px [B] 80px [C];
- -webkit-grid-template-rows: 100px;
+ grid-template-columns: [A] 10px [B] 20px [C] 30px [A] 40px [B] 50px [C] 60px [A] 70px [B] 80px [C];
+ grid-template-rows: 100px;
}
.gridItemBToD {
- -webkit-grid-column: b / d;
- -webkit-grid-row: 1;
+ grid-column: b / d;
+ grid-row: 1;
}
.gridItemGToH {
- -webkit-grid-column: 1;
- -webkit-grid-row: g / h;
+ grid-column: 1;
+ grid-row: g / h;
}
.gridItemInvalidPositiveGridLine {
- -webkit-grid-column: nonexistent / span 2;
- -webkit-grid-row: span 2 / nonexistent;
+ grid-column: nonexistent / span 2;
+ grid-row: span 2 / nonexistent;
}
.gridItemInvalidNegativeGridLine {
- -webkit-grid-column: 1 / -1 nonexistent;
- -webkit-grid-row: span 2 / -10 nonexistent;
+ grid-column: 1 / -1 nonexistent;
+ grid-row: span 2 / -10 nonexistent;
}
.gridItemAToSpanC {
- -webkit-grid-column: a / span c;
- -webkit-grid-row: 1;
+ grid-column: a / span c;
+ grid-row: 1;
}
.gridItemFToSpanH {
- -webkit-grid-column: 1;
- -webkit-grid-row: f span / h;
+ grid-column: 1;
+ grid-row: f span / h;
}
.gridItem2BSpan2B {
- -webkit-grid-column: 2 b / span 2 b;
- -webkit-grid-row: 1;
+ grid-column: 2 b / span 2 b;
+ grid-row: 1;
}
.gridItemSpan2GNegativeG {
- -webkit-grid-column: 1;
- -webkit-grid-row: span 2 g / -1 g;
+ grid-column: 1;
+ grid-row: span 2 g / -1 g;
}
</style>
<script src="../../resources/check-layout.js"></script>
@@ -162,61 +162,61 @@
<div style="position: relative">
<div class="grid gridFromSpecs">
- <div class="sizedToGridArea" style="-webkit-grid-column: 4 / auto;" data-offset-x="60px" data-expected-width="40px"></div>
+ <div class="sizedToGridArea" style="grid-column: 4 / auto;" data-offset-x="60px" data-expected-width="40px"></div>
</div>
</div>
<div style="position: relative">
<div class="grid gridFromSpecs">
- <div class="sizedToGridArea" style="-webkit-grid-column: auto / 6;" data-offset-x="100px" data-expected-width="50px"></div>
+ <div class="sizedToGridArea" style="grid-column: auto / 6;" data-offset-x="100px" data-expected-width="50px"></div>
</div>
</div>
<div style="position: relative">
<div class="grid gridFromSpecs">
- <div class="sizedToGridArea" style="-webkit-grid-column: C / C -1;" data-offset-x="30px" data-expected-width="330px"></div>
+ <div class="sizedToGridArea" style="grid-column: C / C -1;" data-offset-x="30px" data-expected-width="330px"></div>
</div>
</div>
<div style="position: relative">
<div class="grid gridFromSpecs">
- <div class="sizedToGridArea" style="-webkit-grid-column: C / span C;" data-offset-x="30px" data-expected-width="120px"></div>
+ <div class="sizedToGridArea" style="grid-column: C / span C;" data-offset-x="30px" data-expected-width="120px"></div>
</div>
</div>
<div style="position: relative">
<div class="grid gridFromSpecs">
- <div class="sizedToGridArea" style="-webkit-grid-column: span C / C -1;" data-offset-x="150px" data-expected-width="210px"></div>
+ <div class="sizedToGridArea" style="grid-column: span C / C -1;" data-offset-x="150px" data-expected-width="210px"></div>
</div>
</div>
<div style="position: relative">
<div class="grid gridFromSpecs">
- <div class="sizedToGridArea" style="-webkit-grid-column: span C / span C;" data-offset-x="0px" data-expected-width="10px"></div>
+ <div class="sizedToGridArea" style="grid-column: span C / span C;" data-offset-x="0px" data-expected-width="10px"></div>
</div>
</div>
<div style="position: relative">
<div class="grid gridFromSpecs">
- <div class="sizedToGridArea" style="-webkit-grid-column: 5 / C -1;" data-offset-x="100px" data-expected-width="260px"></div>
+ <div class="sizedToGridArea" style="grid-column: 5 / C -1;" data-offset-x="100px" data-expected-width="260px"></div>
</div>
</div>
<div style="position: relative">
<div class="grid gridFromSpecs">
- <div class="sizedToGridArea" style="-webkit-grid-column: 5 / span C;" data-offset-x="100px" data-expected-width="50px"></div>
+ <div class="sizedToGridArea" style="grid-column: 5 / span C;" data-offset-x="100px" data-expected-width="50px"></div>
</div>
</div>
<div style="position: relative">
<div class="grid gridFromSpecs">
- <div class="sizedToGridArea" style="-webkit-grid-column: 8 / 8;" data-offset-x="280px" data-expected-width="80px"></div>
+ <div class="sizedToGridArea" style="grid-column: 8 / 8;" data-offset-x="280px" data-expected-width="80px"></div>
</div>
</div>
<div style="position: relative">
<div class="grid gridFromSpecs">
- <div class="sizedToGridArea" style="-webkit-grid-column: B 2 / span 1;" data-offset-x="100px" data-expected-width="50px"></div>
+ <div class="sizedToGridArea" style="grid-column: B 2 / span 1;" data-offset-x="100px" data-expected-width="50px"></div>
</div>
</div>
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-negative-indexes.html b/LayoutTests/fast/css-grid-layout/grid-item-negative-indexes.html
index a8ab0c9..1132e65 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-negative-indexes.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-negative-indexes.html
@@ -3,16 +3,16 @@
<link href="resources/grid-alignment.css" rel="stylesheet">
<style>
.negativeStartBeforePositionIndexes {
- -webkit-grid-row: -10 / 1;
- -webkit-grid-column: -28 / 1;
+ grid-row: -10 / 1;
+ grid-column: -28 / 1;
}
.negativeEndAfterPositionIndexes {
- -webkit-grid-row: 1 / -17;
- -webkit-grid-column: 1 / -80;
+ grid-row: 1 / -17;
+ grid-column: 1 / -80;
}
.negativePositionIndexes {
- -webkit-grid-row: -50 / -3;
- -webkit-grid-column: -8 / -54;
+ grid-row: -50 / -3;
+ grid-column: -8 / -54;
}
</style>
<script src="../../resources/check-layout.js"></script>
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-negative-integer-explicit-grid-resolution.html b/LayoutTests/fast/css-grid-layout/grid-item-negative-integer-explicit-grid-resolution.html
index 52224e2..f107fcf 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-negative-integer-explicit-grid-resolution.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-negative-integer-explicit-grid-resolution.html
@@ -3,14 +3,14 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.columnGrid {
- -webkit-grid-template-columns: 50px 100px;
- /* -webkit-grid-template-rows is left unset so that the grid items' row is implicit. */
+ grid-template-columns: 50px 100px;
+ /* grid-template-rows is left unset so that the grid items' row is implicit. */
font: 10px/1 Ahem;
}
.rowGrid {
- -webkit-grid-template-rows: 50px 100px;
- /* -webkit-grid-template-columns is left unset so that the grid items' column is implicit. */
+ grid-template-rows: 50px 100px;
+ /* grid-template-columns is left unset so that the grid items' column is implicit. */
font: 10px/1 Ahem;
}
</style>
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-negative-position-resolution.html b/LayoutTests/fast/css-grid-layout/grid-item-negative-position-resolution.html
index e4cf8fd..811f526 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-negative-position-resolution.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-negative-position-resolution.html
@@ -3,99 +3,99 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-columns: [first] 50px [middle] 100px [last];
- -webkit-grid-template-rows: [first] 50px [middle] 100px [last];
+ grid-template-columns: [first] 50px [middle] 100px [last];
+ grid-template-rows: [first] 50px [middle] 100px [last];
/* To detect how much we extend the grid. */
- -webkit-grid-auto-columns: 200px;
- -webkit-grid-auto-rows: 200px;
+ grid-auto-columns: 200px;
+ grid-auto-rows: 200px;
/* Make the grid shrink-to-fit. */
position: absolute;
}
.negativeStartPositionGrowGridInColumnDirection {
- -webkit-grid-column: -1 / auto;
- -webkit-grid-row: 1;
+ grid-column: -1 / auto;
+ grid-row: 1;
}
.negativeStartPositionGrowGridInRowDirection {
- -webkit-grid-column: 1;
- -webkit-grid-row: -1 / auto;
+ grid-column: 1;
+ grid-row: -1 / auto;
}
.lastNamedGridLineStartPositionGrowGridInRowDirection {
- -webkit-grid-column: 1;
- -webkit-grid-row: -1 / auto;
+ grid-column: 1;
+ grid-row: -1 / auto;
}
.lastNamedGridLineStartPositionGrowGridInColumnDirection {
- -webkit-grid-column: last / auto;
- -webkit-grid-row: 1;
+ grid-column: last / auto;
+ grid-row: 1;
}
.negativeStartPositionGrowGridInRowDirection {
- -webkit-grid-column: 1;
- -webkit-grid-row: last / auto;
+ grid-column: 1;
+ grid-row: last / auto;
}
.endSpanGrowGridInColumnDirection {
- -webkit-grid-column: -2 / span 3;
- -webkit-grid-row: 1;
+ grid-column: -2 / span 3;
+ grid-row: 1;
}
.endSpanGrowGridInRowDirection {
- -webkit-grid-column: 1;
- -webkit-grid-row: -2 / span 3;
+ grid-column: 1;
+ grid-row: -2 / span 3;
}
.namedEndSpanGrowGridInColumnDirection {
- -webkit-grid-column: -1 middle / span 3;
- -webkit-grid-row: 1;
+ grid-column: -1 middle / span 3;
+ grid-row: 1;
}
.namedEndSpanGrowGridInRowDirection {
- -webkit-grid-column: 1;
- -webkit-grid-row: 2 middle / span 3;
+ grid-column: 1;
+ grid-row: 2 middle / span 3;
}
.negativeEndPositionStartSpanInColumnDirection {
- -webkit-grid-column: span / -1;
- -webkit-grid-row: 1;
+ grid-column: span / -1;
+ grid-row: 1;
}
.negativeEndPositionStartSpanInRowDirection {
- -webkit-grid-column: 1;
- -webkit-grid-row: span 5 / -1;
+ grid-column: 1;
+ grid-row: span 5 / -1;
}
.negativeNamedGridLineEndPositionStartSpanInColumnDirection {
- -webkit-grid-column: span / last;
- -webkit-grid-row: 1;
+ grid-column: span / last;
+ grid-row: 1;
}
.negativeNamedGridLineEndPositionStartSpanInRowDirection {
- -webkit-grid-column: 1;
- -webkit-grid-row: span 5 / last;
+ grid-column: 1;
+ grid-row: span 5 / last;
}
.negativeEndPositionStartNegativeInColumnDirection {
- -webkit-grid-column: -3 / -1;
- -webkit-grid-row: 1;
+ grid-column: -3 / -1;
+ grid-row: 1;
}
.negativeEndPositionStartNegativeInRowDirection {
- -webkit-grid-column: -5 / -2;
- -webkit-grid-row: 1;
+ grid-column: -5 / -2;
+ grid-row: 1;
}
.namedGridLineEndPositionStartNegativeInColumnDirection {
- -webkit-grid-column: -3 / 10 last;
- -webkit-grid-row: 1;
+ grid-column: -3 / 10 last;
+ grid-row: 1;
}
.namedGridLineEndPositionStartNegativeInRowDirection {
- -webkit-grid-column: -5 / -2 middle;
- -webkit-grid-row: 1;
+ grid-column: -5 / -2 middle;
+ grid-row: 1;
}
</style>
<script src="../../resources/check-layout.js"></script>
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-order-auto-flow-resolution.html b/LayoutTests/fast/css-grid-layout/grid-item-order-auto-flow-resolution.html
index d57afe2..77b9f74 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-order-auto-flow-resolution.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-order-auto-flow-resolution.html
@@ -3,9 +3,9 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- display: -webkit-grid;
- -webkit-grid-template-columns: 50px 100px;
- -webkit-grid-template-rows: 50px 100px;
+ display: grid;
+ grid-template-columns: 50px 100px;
+ grid-template-rows: 50px 100px;
}
.negativeOrder {
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-order-in-content-sized-columns-resolution.html b/LayoutTests/fast/css-grid-layout/grid-item-order-in-content-sized-columns-resolution.html
index 0eef081..4207fde 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-order-in-content-sized-columns-resolution.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-order-in-content-sized-columns-resolution.html
@@ -8,31 +8,31 @@
font: 10px/1 Ahem;
}
.gridFixedMinContentAndFixedMaxContent {
- -webkit-grid-template-columns: minmax(20px, -webkit-min-content) minmax(20px, -webkit-max-content);
+ grid-template-columns: minmax(20px, -webkit-min-content) minmax(20px, -webkit-max-content);
}
.gridMaxContentFixedAndMinContentFixed {
- -webkit-grid-template-columns: minmax(-webkit-max-content, 50px) minmax(-webkit-min-content, 50px);
+ grid-template-columns: minmax(-webkit-max-content, 50px) minmax(-webkit-min-content, 50px);
}
.gridFixedMinContentAndAuto {
- -webkit-grid-template-columns: minmax(20px, -webkit-min-content) auto;
+ grid-template-columns: minmax(20px, -webkit-min-content) auto;
}
.gridFixedMaxContentAndAuto {
- -webkit-grid-template-columns: minmax(20px, -webkit-max-content) auto;
+ grid-template-columns: minmax(20px, -webkit-max-content) auto;
}
.gridMaxContentAndAuto {
- -webkit-grid-template-columns: -webkit-max-content auto;
+ grid-template-columns: -webkit-max-content auto;
}
.gridAutoAndMaxContent {
- -webkit-grid-template-columns: auto -webkit-max-content;
+ grid-template-columns: auto -webkit-max-content;
}
.gridMinContentAndAuto {
- -webkit-grid-template-columns: -webkit-min-content auto;
+ grid-template-columns: -webkit-min-content auto;
}
.gridAutoAndMinContent {
- -webkit-grid-template-columns: -webkit-min-content auto;
+ grid-template-columns: -webkit-min-content auto;
}
.spanTwo {
- -webkit-grid-column: 1 / 3;
+ grid-column: 1 / 3;
}
</style>
<script src="../../resources/js-test.js"></script>
@@ -101,11 +101,11 @@
function checkTrackBreadthAfterItemRowSwap(gridId)
{
window.gridElement = document.getElementById(gridId);
- var oldValue = getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-template-columns');
- var firstChildRow = getComputedStyle(gridElement.children[0],'').getPropertyValue('-webkit-grid-row');
- gridElement.children[0].style.webkitGridRow = getComputedStyle(gridElement.children[1],'').getPropertyValue('-webkit-grid-row');
- gridElement.children[1].style.webkitGridRow = firstChildRow;
- var newValue = getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-template-columns');
+ var oldValue = getComputedStyle(gridElement, '').getPropertyValue('grid-template-columns');
+ var firstChildRow = getComputedStyle(gridElement.children[0],'').getPropertyValue('grid-row');
+ gridElement.children[0].style.gridRow = getComputedStyle(gridElement.children[1],'').getPropertyValue('grid-row');
+ gridElement.children[1].style.gridRow = firstChildRow;
+ var newValue = getComputedStyle(gridElement, '').getPropertyValue('grid-template-columns');
if (newValue == oldValue)
testPassed("grid-template-columns is " + newValue + " after grid row swap.");
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-order-paint-order.html b/LayoutTests/fast/css-grid-layout/grid-item-order-paint-order.html
index c6b0ffc..4bca193 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-order-paint-order.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-order-paint-order.html
@@ -5,8 +5,8 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-rows: 100px;
- -webkit-grid-template-columns: 100px;
+ grid-template-rows: 100px;
+ grid-template-columns: 100px;
}
.sizedToGridArea {
background-color: green;
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-position-changed-dynamic.html b/LayoutTests/fast/css-grid-layout/grid-item-position-changed-dynamic.html
index d06b72f..a51c41a 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-position-changed-dynamic.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-position-changed-dynamic.html
@@ -3,14 +3,14 @@
<link href="resources/grid.css" rel="stylesheet">
<style type="text/css">
.grid {
- -webkit-grid-template-columns: [col] 50px [col] 100px [col] 200px [col];
- -webkit-grid-template-rows: [row] 70px [row] 140px [row] 280px [row];
- -webkit-grid-auto-columns: 5px;
- -webkit-grid-auto-rows: 10px;
+ grid-template-columns: [col] 50px [col] 100px [col] 200px [col];
+ grid-template-rows: [row] 70px [row] 140px [row] 280px [row];
+ grid-auto-columns: 5px;
+ grid-auto-rows: 10px;
}
.differentNamedGridLines {
- -webkit-grid-template-columns: [col1] 50px [col2] 100px [col3] 200px [col4];
- -webkit-grid-template-rows: [row1] 70px [row2] 140px [row3] 280px [row4];
+ grid-template-columns: [col1] 50px [col2] 100px [col3] 200px [col4];
+ grid-template-rows: [row1] 70px [row2] 140px [row3] 280px [row4];
}
</style>
<script src="../../resources/check-layout.js"></script>
@@ -18,8 +18,8 @@
function testPosition(position, size)
{
gridItem = document.getElementsByClassName("grid")[0].firstChild;
- gridItem.style.webkitGridColumn = position.column;
- gridItem.style.webkitGridRow = position.row;
+ gridItem.style.gridColumn = position.column;
+ gridItem.style.gridRow = position.row;
gridItem.setAttribute("data-expected-width", size.width);
gridItem.setAttribute("data-expected-height", size.height);
checkLayout(".grid");
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-removal-auto-placement-update.html b/LayoutTests/fast/css-grid-layout/grid-item-removal-auto-placement-update.html
index cf167d6..2d4a0d6 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-removal-auto-placement-update.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-removal-auto-placement-update.html
@@ -4,8 +4,8 @@
<link href="resources/grid-alignment.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-columns: 50px 100px;
- -webkit-grid-template-rows: 50px 100px;
+ grid-template-columns: 50px 100px;
+ grid-template-rows: 50px 100px;
}
</style>
<script src="../../resources/check-layout.js"></script>
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-removal-track-breadth-update.html b/LayoutTests/fast/css-grid-layout/grid-item-removal-track-breadth-update.html
index b8a6771..bb7fc94c 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-removal-track-breadth-update.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-removal-track-breadth-update.html
@@ -4,28 +4,28 @@
<link href="resources/grid-alignment.css" rel="stylesheet">
<style>
.gridAutoContent {
- -webkit-grid-template-columns: auto;
- -webkit-grid-template-rows: auto;
+ grid-template-columns: auto;
+ grid-template-rows: auto;
}
.gridMinContentFixed {
- -webkit-grid-template-columns: minmax(-webkit-min-content, 100px);
- -webkit-grid-template-rows: minmax(-webkit-min-content, 40px);
+ grid-template-columns: minmax(-webkit-min-content, 100px);
+ grid-template-rows: minmax(-webkit-min-content, 40px);
}
.gridMaxContentFixed {
- -webkit-grid-template-columns: minmax(-webkit-max-content, 150px);
- -webkit-grid-template-rows: minmax(-webkit-max-content, 40px);
+ grid-template-columns: minmax(-webkit-max-content, 150px);
+ grid-template-rows: minmax(-webkit-max-content, 40px);
}
.gridFixedMinContent {
- -webkit-grid-template-columns: minmax(100px, -webkit-min-content);
- -webkit-grid-template-rows: minmax(40px, -webkit-min-content);
+ grid-template-columns: minmax(100px, -webkit-min-content);
+ grid-template-rows: minmax(40px, -webkit-min-content);
}
.gridFixedMaxContent {
- -webkit-grid-template-columns: minmax(100px, -webkit-max-content);
- -webkit-grid-template-rows: minmax(40px, -webkit-max-content);
+ grid-template-columns: minmax(100px, -webkit-max-content);
+ grid-template-rows: minmax(40px, -webkit-max-content);
}
.lessConstrainedContainer {
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-spanning-resolution.html b/LayoutTests/fast/css-grid-layout/grid-item-spanning-resolution.html
index 16feacf..4afa300 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-spanning-resolution.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-spanning-resolution.html
@@ -3,89 +3,89 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-columns: 40% 60%;
- -webkit-grid-template-rows: 30% 70%;
+ grid-template-columns: 40% 60%;
+ grid-template-rows: 30% 70%;
width: 400px;
height: 300px;
- -webkit-grid-auto-columns: 200px;
- -webkit-grid-auto-rows: 250px;
+ grid-auto-columns: 200px;
+ grid-auto-rows: 250px;
}
#bigGrid {
- -webkit-grid-template-columns: 25% 25% 25% 25%;
- -webkit-grid-template-rows: 25% 25% 25% 25%;
+ grid-template-columns: 25% 25% 25% 25%;
+ grid-template-rows: 25% 25% 25% 25%;
height: 100px;
width: 200px;
}
#fixedGrid {
- -webkit-grid-template-columns: 10px 20px 40px 80px;
- -webkit-grid-template-rows: 15px 30px 60px 120px;
+ grid-template-columns: 10px 20px 40px 80px;
+ grid-template-rows: 15px 30px 60px 120px;
}
.negativeOverflowRowFirstColumn {
- -webkit-grid-row: 1 / -5;
- -webkit-grid-column: 1;
+ grid-row: 1 / -5;
+ grid-column: 1;
}
.overflowRowFirstColumn {
- -webkit-grid-row: 1 / 5;
- -webkit-grid-column: 1;
+ grid-row: 1 / 5;
+ grid-column: 1;
}
.firstRowNegativeOverflowColumn {
- -webkit-grid-row: 1;
- -webkit-grid-column: 1 / -5;
+ grid-row: 1;
+ grid-column: 1 / -5;
}
.firstRowOverflowColumn {
- -webkit-grid-row: 1;
- -webkit-grid-column: 1 / 5;
+ grid-row: 1;
+ grid-column: 1 / 5;
}
.secondRowSecondColumnNoSpan {
- -webkit-grid-column: 2 / 3;
- -webkit-grid-row: 2 / 3;
+ grid-column: 2 / 3;
+ grid-row: 2 / 3;
}
.thirdRowThirdColumnNoSpan {
- -webkit-grid-column: 3 / 4;
- -webkit-grid-row: 3 / 4;
+ grid-column: 3 / 4;
+ grid-row: 3 / 4;
}
.firstRowSpanning3SecondColumn {
- -webkit-grid-column: 2;
- -webkit-grid-row: 1 / span 3;
+ grid-column: 2;
+ grid-row: 1 / span 3;
}
.thirdRowSecondColumnSpanning2 {
- -webkit-grid-column: 2 / span 2;
- -webkit-grid-row: 3;
+ grid-column: 2 / span 2;
+ grid-row: 3;
}
.spanning3Row5SecondColumn {
- -webkit-grid-column: 2;
- -webkit-grid-row: span 3 / 5;
+ grid-column: 2;
+ grid-row: span 3 / 5;
}
.thirdRowSpanning2Column3 {
- -webkit-grid-column: span 2 / 3;
- -webkit-grid-row: 3;
+ grid-column: span 2 / 3;
+ grid-row: 3;
}
.underflowSpanning {
- -webkit-grid-column: span 3 / 3;
- -webkit-grid-row: span 8 / 4;
+ grid-column: span 3 / 3;
+ grid-row: span 8 / 4;
}
.doubleSpan {
- -webkit-grid-column: span 2 / span 2;
- -webkit-grid-row: span 3 / span 1;
+ grid-column: span 2 / span 2;
+ grid-row: span 3 / span 1;
}
.spanAndAuto {
- -webkit-grid-column: auto / span 2;
- -webkit-grid-row: span 3 / auto;
+ grid-column: auto / span 2;
+ grid-row: span 3 / auto;
}
</style>
@@ -195,14 +195,14 @@
<!-- Check that the end span is ignored when two opposing spans are specified-->
<div style="position: relative">
-<div class="grid" id="fixedGrid" style="-webkit-grid-auto-flow: row;">
- <div class="sizedToGridArea" style="-webkit-grid-column: 1; -webkit-grid-row: 1;" data-offset-x="0" data-offset-y="0" data-expected-width="10" data-expected-height="15"></div>
+<div class="grid" id="fixedGrid" style="grid-auto-flow: row;">
+ <div class="sizedToGridArea" style="grid-column: 1; grid-row: 1;" data-offset-x="0" data-offset-y="0" data-expected-width="10" data-expected-height="15"></div>
<div class="sizedToGridArea doubleSpan" data-offset-x="10" data-offset-y="0" data-expected-width="60" data-expected-height="105"></div>
</div>
<div style="position: relative">
-<div class="grid" id="fixedGrid" style="-webkit-grid-auto-flow: column;">
- <div class="sizedToGridArea" style="-webkit-grid-column: 1; -webkit-grid-row: 1;" data-offset-x="0" data-offset-y="0" data-expected-width="10" data-expected-height="15"></div>
+<div class="grid" id="fixedGrid" style="grid-auto-flow: column;">
+ <div class="sizedToGridArea" style="grid-column: 1; grid-row: 1;" data-offset-x="0" data-offset-y="0" data-expected-width="10" data-expected-height="15"></div>
<div class="sizedToGridArea doubleSpan" data-offset-x="0" data-offset-y="15" data-expected-width="30" data-expected-height="210"></div>
</div>
</body>
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-start-before-get-set-expected.txt b/LayoutTests/fast/css-grid-layout/grid-item-start-before-get-set-expected.txt
index 5baf90f..14ded3f 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-start-before-get-set-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/grid-item-start-before-get-set-expected.txt
@@ -4,188 +4,188 @@
Test getting grid-column-start and grid-row-start set through CSS
-PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-column-start') is 'auto'
-PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
-PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-row-start') is 'auto'
-PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
-PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-column') is "10 / auto"
-PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-column-start') is "10"
-PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-row') is "15 / auto"
-PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-row-start') is "15"
-PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-column') is "-10 / auto"
-PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-column-start') is "-10"
-PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-row') is "-15 / auto"
-PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-row-start') is "-15"
-PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItemWithBeforeSpan, '').getPropertyValue('-webkit-grid-column') is "span 2 / auto"
-PASS getComputedStyle(gridItemWithBeforeSpan, '').getPropertyValue('-webkit-grid-column-start') is "span 2"
-PASS getComputedStyle(gridItemWithBeforeSpan, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItemWithBeforeSpan, '').getPropertyValue('-webkit-grid-row') is "span 8 / auto"
-PASS getComputedStyle(gridItemWithBeforeSpan, '').getPropertyValue('-webkit-grid-row-start') is "span 8"
-PASS getComputedStyle(gridItemWithBeforeSpan, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('-webkit-grid-column') is "span 2 / auto"
-PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('-webkit-grid-column-start') is "span 2"
-PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('-webkit-grid-row') is "span 8 / auto"
-PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('-webkit-grid-row-start') is "span 8"
-PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('-webkit-grid-column') is "span 1 / auto"
-PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('-webkit-grid-column-start') is "span 1"
-PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('-webkit-grid-row') is "span 1 / auto"
-PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('-webkit-grid-row-start') is "span 1"
-PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('-webkit-grid-column') is "first / auto"
-PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('-webkit-grid-column-start') is "first"
-PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('-webkit-grid-row') is "last / auto"
-PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('-webkit-grid-row-start') is "last"
-PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItemWithNumberCustomIdent, '').getPropertyValue('-webkit-grid-column') is "2 first / auto"
-PASS getComputedStyle(gridItemWithNumberCustomIdent, '').getPropertyValue('-webkit-grid-column-start') is "2 first"
-PASS getComputedStyle(gridItemWithNumberCustomIdent, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItemWithNumberCustomIdent, '').getPropertyValue('-webkit-grid-row') is "3 last / auto"
-PASS getComputedStyle(gridItemWithNumberCustomIdent, '').getPropertyValue('-webkit-grid-row-start') is "3 last"
-PASS getComputedStyle(gridItemWithNumberCustomIdent, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItemWithSpanCustomIdentElement, '').getPropertyValue('-webkit-grid-column') is "span 1 first / auto"
-PASS getComputedStyle(gridItemWithSpanCustomIdentElement, '').getPropertyValue('-webkit-grid-column-start') is "span 1 first"
-PASS getComputedStyle(gridItemWithSpanCustomIdentElement, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItemWithSpanCustomIdentElement, '').getPropertyValue('-webkit-grid-row') is "span 1 last / auto"
-PASS getComputedStyle(gridItemWithSpanCustomIdentElement, '').getPropertyValue('-webkit-grid-row-start') is "span 1 last"
-PASS getComputedStyle(gridItemWithSpanCustomIdentElement, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItemWithSpanNumberCustomIdentElement, '').getPropertyValue('-webkit-grid-column') is "span 2 first / auto"
-PASS getComputedStyle(gridItemWithSpanNumberCustomIdentElement, '').getPropertyValue('-webkit-grid-column-start') is "span 2 first"
-PASS getComputedStyle(gridItemWithSpanNumberCustomIdentElement, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItemWithSpanNumberCustomIdentElement, '').getPropertyValue('-webkit-grid-row') is "span 3 last / auto"
-PASS getComputedStyle(gridItemWithSpanNumberCustomIdentElement, '').getPropertyValue('-webkit-grid-row-start') is "span 3 last"
-PASS getComputedStyle(gridItemWithSpanNumberCustomIdentElement, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItemWithArea, '').getPropertyValue('-webkit-grid-column') is "firstArea / auto"
-PASS getComputedStyle(gridItemWithArea, '').getPropertyValue('-webkit-grid-column-start') is "firstArea"
-PASS getComputedStyle(gridItemWithArea, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItemWithArea, '').getPropertyValue('-webkit-grid-row') is "thirdArea / auto"
-PASS getComputedStyle(gridItemWithArea, '').getPropertyValue('-webkit-grid-row-start') is "thirdArea"
-PASS getComputedStyle(gridItemWithArea, '').getPropertyValue('-webkit-grid-row-end') is "auto"
+PASS getComputedStyle(gridElement, '').getPropertyValue('grid-column-start') is 'auto'
+PASS getComputedStyle(gridElement, '').getPropertyValue('grid-column') is 'auto / auto'
+PASS getComputedStyle(gridElement, '').getPropertyValue('grid-row-start') is 'auto'
+PASS getComputedStyle(gridElement, '').getPropertyValue('grid-row') is 'auto / auto'
+PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('grid-column') is "10 / auto"
+PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('grid-column-start') is "10"
+PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('grid-row') is "15 / auto"
+PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('grid-row-start') is "15"
+PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('grid-column') is "-10 / auto"
+PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('grid-column-start') is "-10"
+PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('grid-row') is "-15 / auto"
+PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('grid-row-start') is "-15"
+PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItemWithBeforeSpan, '').getPropertyValue('grid-column') is "span 2 / auto"
+PASS getComputedStyle(gridItemWithBeforeSpan, '').getPropertyValue('grid-column-start') is "span 2"
+PASS getComputedStyle(gridItemWithBeforeSpan, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItemWithBeforeSpan, '').getPropertyValue('grid-row') is "span 8 / auto"
+PASS getComputedStyle(gridItemWithBeforeSpan, '').getPropertyValue('grid-row-start') is "span 8"
+PASS getComputedStyle(gridItemWithBeforeSpan, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('grid-column') is "span 2 / auto"
+PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('grid-column-start') is "span 2"
+PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('grid-row') is "span 8 / auto"
+PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('grid-row-start') is "span 8"
+PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-column') is "span 1 / auto"
+PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-column-start') is "span 1"
+PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-row') is "span 1 / auto"
+PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-row-start') is "span 1"
+PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('grid-column') is "first / auto"
+PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('grid-column-start') is "first"
+PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('grid-row') is "last / auto"
+PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('grid-row-start') is "last"
+PASS getComputedStyle(gridItemWithCustomIdent, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItemWithNumberCustomIdent, '').getPropertyValue('grid-column') is "2 first / auto"
+PASS getComputedStyle(gridItemWithNumberCustomIdent, '').getPropertyValue('grid-column-start') is "2 first"
+PASS getComputedStyle(gridItemWithNumberCustomIdent, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItemWithNumberCustomIdent, '').getPropertyValue('grid-row') is "3 last / auto"
+PASS getComputedStyle(gridItemWithNumberCustomIdent, '').getPropertyValue('grid-row-start') is "3 last"
+PASS getComputedStyle(gridItemWithNumberCustomIdent, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItemWithSpanCustomIdentElement, '').getPropertyValue('grid-column') is "span 1 first / auto"
+PASS getComputedStyle(gridItemWithSpanCustomIdentElement, '').getPropertyValue('grid-column-start') is "span 1 first"
+PASS getComputedStyle(gridItemWithSpanCustomIdentElement, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItemWithSpanCustomIdentElement, '').getPropertyValue('grid-row') is "span 1 last / auto"
+PASS getComputedStyle(gridItemWithSpanCustomIdentElement, '').getPropertyValue('grid-row-start') is "span 1 last"
+PASS getComputedStyle(gridItemWithSpanCustomIdentElement, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItemWithSpanNumberCustomIdentElement, '').getPropertyValue('grid-column') is "span 2 first / auto"
+PASS getComputedStyle(gridItemWithSpanNumberCustomIdentElement, '').getPropertyValue('grid-column-start') is "span 2 first"
+PASS getComputedStyle(gridItemWithSpanNumberCustomIdentElement, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItemWithSpanNumberCustomIdentElement, '').getPropertyValue('grid-row') is "span 3 last / auto"
+PASS getComputedStyle(gridItemWithSpanNumberCustomIdentElement, '').getPropertyValue('grid-row-start') is "span 3 last"
+PASS getComputedStyle(gridItemWithSpanNumberCustomIdentElement, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItemWithArea, '').getPropertyValue('grid-column') is "firstArea / auto"
+PASS getComputedStyle(gridItemWithArea, '').getPropertyValue('grid-column-start') is "firstArea"
+PASS getComputedStyle(gridItemWithArea, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItemWithArea, '').getPropertyValue('grid-row') is "thirdArea / auto"
+PASS getComputedStyle(gridItemWithArea, '').getPropertyValue('grid-row-start') is "thirdArea"
+PASS getComputedStyle(gridItemWithArea, '').getPropertyValue('grid-row-end') is "auto"
Test the initial value
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is 'auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is 'auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-column-start') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-column') is 'auto / auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-row-start') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-row') is 'auto / auto'
Test getting and setting grid-column-start and grid-row-start through JS
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "18 / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "18"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "66 / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "66"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "-55 / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "-55"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "-40 / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "-40"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "nav / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "nav"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "last / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "last"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "span 3 / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "span 3"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "span 20 / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "span 20"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "span 1 nav / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "span 1 nav"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "span 1 last / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "span 1 last"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "thirdArea / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "thirdArea"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "secondArea / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "secondArea"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "nonExistentArea / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "nonExistentArea"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "secondArea / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "secondArea"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "secondArea / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "secondArea"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "nonExistentArea / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "nonExistentArea"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "18 / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "18"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "66 / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "66"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "-55 / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "-55"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "-40 / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "-40"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "nav / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "nav"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "last / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "last"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "span 3 / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "span 3"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "span 20 / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "span 20"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "span 1 nav / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "span 1 nav"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "span 1 last / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "span 1 last"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "thirdArea / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "thirdArea"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "secondArea / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "secondArea"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "nonExistentArea / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "nonExistentArea"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "secondArea / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "secondArea"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "secondArea / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "secondArea"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "nonExistentArea / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "nonExistentArea"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
Test setting grid-start and grid-before to 'inherit' through JS
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "6 / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "6"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "18 / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "18"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "2 / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "2"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "span 1 / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "span 1"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "6 / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "6"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "span 1 / auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "span 1"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "6 / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "6"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "18 / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "18"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "2 / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "2"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "span 1 / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "span 1"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "6 / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "6"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "span 1 / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "span 1"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
Test setting grid-start and grid-before to 'initial' through JS
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "1 / span 2"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "1"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "span 2"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "span 3 / 5"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "span 3"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "5"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / span 2"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "span 2"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "span 3 / 5"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "span 3"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "5"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column') is "auto / span 2"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-column-end') is "span 2"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row') is "auto / 5"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(gridItem, '').getPropertyValue('-webkit-grid-row-end') is "5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "1 / span 2"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "1"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "span 2"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "span 3 / 5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "span 3"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / span 2"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "span 2"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "span 3 / 5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "span 3"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / span 2"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "span 2"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / 5"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "5"
Test setting grid-column-start and grid-row-start back to 'auto' through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is '18'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is '18 / auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is '66'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is '66 / auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is 'auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is 'auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-column-start') is '18'
+PASS getComputedStyle(element, '').getPropertyValue('grid-column') is '18 / auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-row-start') is '66'
+PASS getComputedStyle(element, '').getPropertyValue('grid-row') is '66 / auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-column-start') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-column') is 'auto / auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-row-start') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-row') is 'auto / auto'
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-start-before-get-set.html b/LayoutTests/fast/css-grid-layout/grid-item-start-before-get-set.html
index a89ac4a..63ffea3 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-start-before-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-start-before-get-set.html
@@ -4,53 +4,53 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-areas: "firstArea secondArea"
+ grid-template-areas: "firstArea secondArea"
"thirdArea thirdArea";
}
.gridItemWithPositiveInteger {
- -webkit-grid-column-start: 10;
- -webkit-grid-row-start: 15;
+ grid-column-start: 10;
+ grid-row-start: 15;
}
.gridItemWithNegativeInteger {
- -webkit-grid-column-start: -10;
- -webkit-grid-row-start: -15;
+ grid-column-start: -10;
+ grid-row-start: -15;
}
.gridItemWithBeforeSpan {
- -webkit-grid-column-start: span 2;
- -webkit-grid-row-start: span 8;
+ grid-column-start: span 2;
+ grid-row-start: span 8;
}
.gridItemWithAfterSpan {
- -webkit-grid-column-start: 2 span;
- -webkit-grid-row-start: 8 span;
+ grid-column-start: 2 span;
+ grid-row-start: 8 span;
}
.gridItemWithOnlySpan {
- -webkit-grid-column-start: span;
- -webkit-grid-row-start: span;
+ grid-column-start: span;
+ grid-row-start: span;
}
.gridItemWithAuto {
- -webkit-grid-column-start: auto;
- -webkit-grid-row-start: auto;
+ grid-column-start: auto;
+ grid-row-start: auto;
}
.gridItemWithCustomIdent {
- -webkit-grid-column-start: first;
- -webkit-grid-row-start: last;
+ grid-column-start: first;
+ grid-row-start: last;
}
.gridItemWithNumberCustomIdent {
- -webkit-grid-column-start: first 2;
- -webkit-grid-row-start: 3 last;
+ grid-column-start: first 2;
+ grid-row-start: 3 last;
}
.gridItemWithSpanCustomIdent {
- -webkit-grid-column-start: first span;
- -webkit-grid-row-start: span last;
+ grid-column-start: first span;
+ grid-row-start: span last;
}
.gridItemWithSpanNumberCustomIdent {
- -webkit-grid-column-start: 2 first span;
- -webkit-grid-row-start: last 3 span;
+ grid-column-start: 2 first span;
+ grid-row-start: last 3 span;
}
.gridItemWithArea {
- -webkit-grid-column-start: firstArea;
- -webkit-grid-row-start: thirdArea;
+ grid-column-start: firstArea;
+ grid-row-start: thirdArea;
}
</style>
<script src="resources/grid-item-column-row-parsing-utils.js"></script>
@@ -77,10 +77,10 @@
debug("Test getting grid-column-start and grid-row-start set through CSS");
var gridElement = document.getElementById("gridElement");
- shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-column-start')", "'auto'");
- shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
- shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-row-start')", "'auto'");
- shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
+ shouldBe("getComputedStyle(gridElement, '').getPropertyValue('grid-column-start')", "'auto'");
+ shouldBe("getComputedStyle(gridElement, '').getPropertyValue('grid-column')", "'auto / auto'");
+ shouldBe("getComputedStyle(gridElement, '').getPropertyValue('grid-row-start')", "'auto'");
+ shouldBe("getComputedStyle(gridElement, '').getPropertyValue('grid-row')", "'auto / auto'");
testColumnRowCSSParsing("gridItemWithPositiveInteger", "10 / auto", "15 / auto");
testColumnRowCSSParsing("gridItemWithNegativeInteger", "-10 / auto", "-15 / auto");
@@ -98,10 +98,10 @@
debug("Test the initial value");
var element = document.createElement("div");
document.body.appendChild(element);
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'auto'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'auto'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-column-start')", "'auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-column')", "'auto / auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-row-start')", "'auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-row')", "'auto / auto'");
debug("");
debug("Test getting and setting grid-column-start and grid-row-start through JS");
@@ -127,18 +127,18 @@
debug("");
debug("Test setting grid-column-start and grid-row-start back to 'auto' through JS");
- element.style.webkitGridColumnStart = "18";
- element.style.webkitGridRowStart = "66";
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'18'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'18 / auto'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'66'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'66 / auto'");
- element.style.webkitGridColumnStart = "auto";
- element.style.webkitGridRowStart = "auto";
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'auto'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'auto'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
+ element.style.gridColumnStart = "18";
+ element.style.gridRowStart = "66";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-column-start')", "'18'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-column')", "'18 / auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-row-start')", "'66'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-row')", "'66 / auto'");
+ element.style.gridColumnStart = "auto";
+ element.style.gridRowStart = "auto";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-column-start')", "'auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-column')", "'auto / auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-row-start')", "'auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-row')", "'auto / auto'");
</script>
<script src="../../resources/js-test-post.js"></script>
</body>
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-stretch-with-margins-borders-padding-vertical-lr.html b/LayoutTests/fast/css-grid-layout/grid-item-stretch-with-margins-borders-padding-vertical-lr.html
index e0e21ac..fbab1d0 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-stretch-with-margins-borders-padding-vertical-lr.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-stretch-with-margins-borders-padding-vertical-lr.html
@@ -10,8 +10,8 @@
}
.grid {
- -webkit-grid-template-columns: 100px 100px;
- -webkit-grid-template-rows: 200px 200px;
+ grid-template-columns: 100px 100px;
+ grid-template-rows: 200px 200px;
margin-bottom: 20px;
position: relative;
font: 15px/1 Ahem;
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-stretch-with-margins-borders-padding-vertical-rl.html b/LayoutTests/fast/css-grid-layout/grid-item-stretch-with-margins-borders-padding-vertical-rl.html
index ce4cda9..2fef741 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-stretch-with-margins-borders-padding-vertical-rl.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-stretch-with-margins-borders-padding-vertical-rl.html
@@ -10,8 +10,8 @@
}
.grid {
- -webkit-grid-template-columns: 100px 100px;
- -webkit-grid-template-rows: 200px 200px;
+ grid-template-columns: 100px 100px;
+ grid-template-rows: 200px 200px;
margin-bottom: 20px;
position: relative;
font: 15px/1 Ahem;
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-stretch-with-margins-borders-padding.html b/LayoutTests/fast/css-grid-layout/grid-item-stretch-with-margins-borders-padding.html
index 26f0edb..482c936 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-stretch-with-margins-borders-padding.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-stretch-with-margins-borders-padding.html
@@ -10,8 +10,8 @@
}
.grid {
- -webkit-grid-template-columns: 100px 100px;
- -webkit-grid-template-rows: 200px 200px;
+ grid-template-columns: 100px 100px;
+ grid-template-rows: 200px 200px;
margin-bottom: 20px;
position: relative;
font: 15px/1 Ahem;
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-text-background-not-interleaved.html b/LayoutTests/fast/css-grid-layout/grid-item-text-background-not-interleaved.html
index df07e6a..a689730 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-text-background-not-interleaved.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-text-background-not-interleaved.html
@@ -2,12 +2,12 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-columns: 50px 50px;
+ grid-template-columns: 50px 50px;
}
.firstRowFirstColumnSpanning2 {
background: lime;
- -webkit-grid-column: 1 / span 2;
- -webkit-grid-row: 1;
+ grid-column: 1 / span 2;
+ grid-row: 1;
}
</style>
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-unknown-named-grid-line-resolution.html b/LayoutTests/fast/css-grid-layout/grid-item-unknown-named-grid-line-resolution.html
index 84e8947..c1ef5d7 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-unknown-named-grid-line-resolution.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-unknown-named-grid-line-resolution.html
@@ -2,10 +2,10 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-columns: [vertical] 50px [middle vertical] 100px [vertical];
- -webkit-grid-auto-columns: 10px;
- -webkit-grid-template-rows: [horizontal] 30px [middle horizontal] 60px [horizontal];
- -webkit-grid-auto-rows: 5px;
+ grid-template-columns: [vertical] 50px [middle vertical] 100px [vertical];
+ grid-auto-columns: 10px;
+ grid-template-rows: [horizontal] 30px [middle horizontal] 60px [horizontal];
+ grid-auto-rows: 5px;
}
</style>
<script src="../../resources/check-layout.js"></script>
@@ -16,13 +16,13 @@
<div style="position: relative">
<div class="grid">
- <div style="-webkit-grid-column: foo; -webkit-grid-row: bar;"
+ <div style="grid-column: foo; grid-row: bar;"
data-offset-x="160" data-offset-y="95" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: a; -webkit-grid-row: b;"
+ <div style="grid-column: a; grid-row: b;"
data-offset-x="160" data-offset-y="95" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: line; -webkit-grid-row: line;"
+ <div style="grid-column: line; grid-row: line;"
data-offset-x="160" data-offset-y="95" data-expected-width="10" data-expected-height="5">
</div>
</div>
@@ -30,19 +30,19 @@
<div style="position: relative">
<div class="grid">
- <div style="-webkit-grid-column: foo; -webkit-grid-row: bar;"
+ <div style="grid-column: foo; grid-row: bar;"
data-offset-x="160" data-offset-y="95" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: 1 / foo; -webkit-grid-row: 1 / bar;"
+ <div style="grid-column: 1 / foo; grid-row: 1 / bar;"
data-offset-x="0" data-offset-y="0" data-expected-width="160" data-expected-height="95">
</div>
- <div style="-webkit-grid-column: foo / 1; -webkit-grid-row: bar / 1;"
+ <div style="grid-column: foo / 1; grid-row: bar / 1;"
data-offset-x="0" data-offset-y="0" data-expected-width="160" data-expected-height="95">
</div>
- <div style="-webkit-grid-column: foo / foo; -webkit-grid-row: bar / bar;"
+ <div style="grid-column: foo / foo; grid-row: bar / bar;"
data-offset-x="160" data-offset-y="95" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: foo / bar; -webkit-grid-row: bar / foo;"
+ <div style="grid-column: foo / bar; grid-row: bar / foo;"
data-offset-x="160" data-offset-y="95" data-expected-width="10" data-expected-height="5">
</div>
</div>
@@ -50,31 +50,31 @@
<div style="position: relative">
<div class="grid">
- <div style="-webkit-grid-column: 1 foo; -webkit-grid-row: 1 bar;"
+ <div style="grid-column: 1 foo; grid-row: 1 bar;"
data-offset-x="160" data-offset-y="95" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: 2 foo; -webkit-grid-row: 2 bar;"
+ <div style="grid-column: 2 foo; grid-row: 2 bar;"
data-offset-x="170" data-offset-y="100" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: 3 foo; -webkit-grid-row: 3 bar;"
+ <div style="grid-column: 3 foo; grid-row: 3 bar;"
data-offset-x="180" data-offset-y="105" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: 4 foo; -webkit-grid-row: 4 bar;"
+ <div style="grid-column: 4 foo; grid-row: 4 bar;"
data-offset-x="190" data-offset-y="110" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: 5 foo; -webkit-grid-row: 5 bar;"
+ <div style="grid-column: 5 foo; grid-row: 5 bar;"
data-offset-x="200" data-offset-y="115" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: 2 foo / 4 foo; -webkit-grid-row: 2 bar / 4 bar;"
+ <div style="grid-column: 2 foo / 4 foo; grid-row: 2 bar / 4 bar;"
data-offset-x="170" data-offset-y="100" data-expected-width="20" data-expected-height="10">
</div>
- <div style="-webkit-grid-column: 2 foo / 4 bar; -webkit-grid-row: 2 bar / 4 foo;"
+ <div style="grid-column: 2 foo / 4 bar; grid-row: 2 bar / 4 foo;"
data-offset-x="170" data-offset-y="100" data-expected-width="20" data-expected-height="10">
</div>
- <div style="-webkit-grid-column: 5 foo / 3 foo; -webkit-grid-row: 5 bar / 3 bar;"
+ <div style="grid-column: 5 foo / 3 foo; grid-row: 5 bar / 3 bar;"
data-offset-x="180" data-offset-y="105" data-expected-width="20" data-expected-height="10">
</div>
- <div style="-webkit-grid-column: 5 foo / 3 bar; -webkit-grid-row: 5 bar / 3 foo;"
+ <div style="grid-column: 5 foo / 3 bar; grid-row: 5 bar / 3 foo;"
data-offset-x="180" data-offset-y="105" data-expected-width="20" data-expected-height="10">
</div>
</div>
@@ -82,31 +82,31 @@
<div style="position: relative">
<div class="grid">
- <div style="-webkit-grid-column: -1 foo; -webkit-grid-row: -1 bar;"
+ <div style="grid-column: -1 foo; grid-row: -1 bar;"
data-offset-x="40" data-offset-y="20" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: -2 foo; -webkit-grid-row: -2 bar;"
+ <div style="grid-column: -2 foo; grid-row: -2 bar;"
data-offset-x="30" data-offset-y="15" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: -3 foo; -webkit-grid-row: -3 bar;"
+ <div style="grid-column: -3 foo; grid-row: -3 bar;"
data-offset-x="20" data-offset-y="10" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: -4 foo; -webkit-grid-row: -4 bar;"
+ <div style="grid-column: -4 foo; grid-row: -4 bar;"
data-offset-x="10" data-offset-y="5" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: -5 foo; -webkit-grid-row: -5 bar;"
+ <div style="grid-column: -5 foo; grid-row: -5 bar;"
data-offset-x="0" data-offset-y="0" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: -4 foo / -2 foo; -webkit-grid-row: -4 bar / -2 bar;"
+ <div style="grid-column: -4 foo / -2 foo; grid-row: -4 bar / -2 bar;"
data-offset-x="10" data-offset-y="5" data-expected-width="20" data-expected-height="10">
</div>
- <div style="-webkit-grid-column: -4 foo / -2 bar; -webkit-grid-row: -4 bar / -2 foo;"
+ <div style="grid-column: -4 foo / -2 bar; grid-row: -4 bar / -2 foo;"
data-offset-x="10" data-offset-y="5" data-expected-width="20" data-expected-height="10">
</div>
- <div style="-webkit-grid-column: -3 foo / -5 foo; -webkit-grid-row: -3 bar / -5 bar;"
+ <div style="grid-column: -3 foo / -5 foo; grid-row: -3 bar / -5 bar;"
data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="10">
</div>
- <div style="-webkit-grid-column: -3 foo / -5 bar; -webkit-grid-row: -3 bar / -5 foo;"
+ <div style="grid-column: -3 foo / -5 bar; grid-row: -3 bar / -5 foo;"
data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="10">
</div>
</div>
@@ -114,22 +114,22 @@
<div style="position: relative">
<div class="grid">
- <div style="-webkit-grid-column: 1 / span foo; -webkit-grid-row: 1 / span bar;"
+ <div style="grid-column: 1 / span foo; grid-row: 1 / span bar;"
data-offset-x="10" data-offset-y="5" data-expected-width="160" data-expected-height="95">
</div>
- <div style="-webkit-grid-column: span foo / 1; -webkit-grid-row: span bar / 1;"
+ <div style="grid-column: span foo / 1; grid-row: span bar / 1;"
data-offset-x="0" data-offset-y="0" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: foo / span foo; -webkit-grid-row: bar / span bar;"
+ <div style="grid-column: foo / span foo; grid-row: bar / span bar;"
data-offset-x="170" data-offset-y="100" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: foo / span bar; -webkit-grid-row: bar / span foo;"
+ <div style="grid-column: foo / span bar; grid-row: bar / span foo;"
data-offset-x="170" data-offset-y="100" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: span foo / foo; -webkit-grid-row: span bar / bar;"
+ <div style="grid-column: span foo / foo; grid-row: span bar / bar;"
data-offset-x="0" data-offset-y="0" data-expected-width="170" data-expected-height="100">
</div>
- <div style="-webkit-grid-column: span foo / bar; -webkit-grid-row: span bar / foo;"
+ <div style="grid-column: span foo / bar; grid-row: span bar / foo;"
data-offset-x="0" data-offset-y="0" data-expected-width="170" data-expected-height="100">
</div>
</div>
@@ -137,22 +137,22 @@
<div style="position: relative">
<div class="grid">
- <div style="-webkit-grid-column: -1 / span foo; -webkit-grid-row: -1 / span bar;"
+ <div style="grid-column: -1 / span foo; grid-row: -1 / span bar;"
data-offset-x="170" data-offset-y="100" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: span foo / -1; -webkit-grid-row: span bar / -1;"
+ <div style="grid-column: span foo / -1; grid-row: span bar / -1;"
data-offset-x="10" data-offset-y="5" data-expected-width="160" data-expected-height="95">
</div>
- <div style="-webkit-grid-column: -1 foo / span foo; -webkit-grid-row: -1 bar / span bar;"
+ <div style="grid-column: -1 foo / span foo; grid-row: -1 bar / span bar;"
data-offset-x="10" data-offset-y="5" data-expected-width="170" data-expected-height="100">
</div>
- <div style="-webkit-grid-column: -1 foo / span bar; -webkit-grid-row: -1 bar / span foo;"
+ <div style="grid-column: -1 foo / span bar; grid-row: -1 bar / span foo;"
data-offset-x="10" data-offset-y="5" data-expected-width="170" data-expected-height="100">
</div>
- <div style="-webkit-grid-column: span foo / -1 foo; -webkit-grid-row: span bar / -1 bar;"
+ <div style="grid-column: span foo / -1 foo; grid-row: span bar / -1 bar;"
data-offset-x="0" data-offset-y="0" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: span foo / -1 bar; -webkit-grid-row: span bar / -1 foo;"
+ <div style="grid-column: span foo / -1 bar; grid-row: span bar / -1 foo;"
data-offset-x="0" data-offset-y="0" data-expected-width="10" data-expected-height="5">
</div>
</div>
@@ -160,22 +160,22 @@
<div style="position: relative">
<div class="grid">
- <div style="-webkit-grid-column: 1 / span 2 foo; -webkit-grid-row: 1 / span 2 bar;"
+ <div style="grid-column: 1 / span 2 foo; grid-row: 1 / span 2 bar;"
data-offset-x="20" data-offset-y="10" data-expected-width="170" data-expected-height="100">
</div>
- <div style="-webkit-grid-column: span 2 foo / 1; -webkit-grid-row: span 2 bar / 1;"
+ <div style="grid-column: span 2 foo / 1; grid-row: span 2 bar / 1;"
data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="10">
</div>
- <div style="-webkit-grid-column: foo / span 2 foo; -webkit-grid-row: bar / span 2 bar;"
+ <div style="grid-column: foo / span 2 foo; grid-row: bar / span 2 bar;"
data-offset-x="180" data-offset-y="105" data-expected-width="20" data-expected-height="10">
</div>
- <div style="-webkit-grid-column: foo / span 2 bar; -webkit-grid-row: bar / span 2 foo;"
+ <div style="grid-column: foo / span 2 bar; grid-row: bar / span 2 foo;"
data-offset-x="180" data-offset-y="105" data-expected-width="20" data-expected-height="10">
</div>
- <div style="-webkit-grid-column: span 2 foo / foo; -webkit-grid-row: span 2 bar / bar;"
+ <div style="grid-column: span 2 foo / foo; grid-row: span 2 bar / bar;"
data-offset-x="0" data-offset-y="0" data-expected-width="180" data-expected-height="105">
</div>
- <div style="-webkit-grid-column: span 2 foo / bar; -webkit-grid-row: span 2 bar / foo;"
+ <div style="grid-column: span 2 foo / bar; grid-row: span 2 bar / foo;"
data-offset-x="0" data-offset-y="0" data-expected-width="180" data-expected-height="105">
</div>
</div>
@@ -183,22 +183,22 @@
<div style="position: relative">
<div class="grid">
- <div style="-webkit-grid-column: -1 / span 2 foo; -webkit-grid-row: -1 / span 2 bar;"
+ <div style="grid-column: -1 / span 2 foo; grid-row: -1 / span 2 bar;"
data-offset-x="180" data-offset-y="105" data-expected-width="20" data-expected-height="10">
</div>
- <div style="-webkit-grid-column: span 2 foo / -1; -webkit-grid-row: span 2 bar / -1;"
+ <div style="grid-column: span 2 foo / -1; grid-row: span 2 bar / -1;"
data-offset-x="10" data-offset-y="5" data-expected-width="170" data-expected-height="100">
</div>
- <div style="-webkit-grid-column: -1 foo / span 2 foo; -webkit-grid-row: -1 bar / span 2 bar;"
+ <div style="grid-column: -1 foo / span 2 foo; grid-row: -1 bar / span 2 bar;"
data-offset-x="20" data-offset-y="10" data-expected-width="180" data-expected-height="105">
</div>
- <div style="-webkit-grid-column: -1 foo / span 2 bar; -webkit-grid-row: -1 bar / span 2 foo;"
+ <div style="grid-column: -1 foo / span 2 bar; grid-row: -1 bar / span 2 foo;"
data-offset-x="20" data-offset-y="10" data-expected-width="180" data-expected-height="105">
</div>
- <div style="-webkit-grid-column: span 2 foo / -1 foo; -webkit-grid-row: span 2 bar / -1 bar;"
+ <div style="grid-column: span 2 foo / -1 foo; grid-row: span 2 bar / -1 bar;"
data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="10">
</div>
- <div style="-webkit-grid-column: span 2 foo / -1 bar; -webkit-grid-row: span 2 bar / -1 foo;"
+ <div style="grid-column: span 2 foo / -1 bar; grid-row: span 2 bar / -1 foo;"
data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="10">
</div>
</div>
@@ -206,28 +206,28 @@
<div style="position: relative">
<div class="grid">
- <div style="-webkit-grid-column: 2 foo / span foo; -webkit-grid-row: 2 bar / span bar;"
+ <div style="grid-column: 2 foo / span foo; grid-row: 2 bar / span bar;"
data-offset-x="190" data-offset-y="110" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: 2 foo / span bar; -webkit-grid-row: 2 bar / span foo;"
+ <div style="grid-column: 2 foo / span bar; grid-row: 2 bar / span foo;"
data-offset-x="190" data-offset-y="110" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: 2 foo / span 2 foo; -webkit-grid-row: 2 bar / span 2 bar;"
+ <div style="grid-column: 2 foo / span 2 foo; grid-row: 2 bar / span 2 bar;"
data-offset-x="190" data-offset-y="110" data-expected-width="20" data-expected-height="10">
</div>
- <div style="-webkit-grid-column: 2 foo / span 2 bar; -webkit-grid-row: 2 bar / span 2 foo;"
+ <div style="grid-column: 2 foo / span 2 bar; grid-row: 2 bar / span 2 foo;"
data-offset-x="190" data-offset-y="110" data-expected-width="20" data-expected-height="10">
</div>
- <div style="-webkit-grid-column: span foo / 2 foo; -webkit-grid-row: span bar / 2 bar;"
+ <div style="grid-column: span foo / 2 foo; grid-row: span bar / 2 bar;"
data-offset-x="10" data-offset-y="5" data-expected-width="180" data-expected-height="105">
</div>
- <div style="-webkit-grid-column: span foo / 2 bar; -webkit-grid-row: span bar / 2 foo;"
+ <div style="grid-column: span foo / 2 bar; grid-row: span bar / 2 foo;"
data-offset-x="10" data-offset-y="5" data-expected-width="180" data-expected-height="105">
</div>
- <div style="-webkit-grid-column: span 2 foo / 2 foo; -webkit-grid-row: span 2 bar / 2 bar;"
+ <div style="grid-column: span 2 foo / 2 foo; grid-row: span 2 bar / 2 bar;"
data-offset-x="0" data-offset-y="0" data-expected-width="190" data-expected-height="110">
</div>
- <div style="-webkit-grid-column: span 2 foo / 2 bar; -webkit-grid-row: span 2 bar / 2 foo;"
+ <div style="grid-column: span 2 foo / 2 bar; grid-row: span 2 bar / 2 foo;"
data-offset-x="0" data-offset-y="0" data-expected-width="190" data-expected-height="110">
</div>
</div>
@@ -235,28 +235,28 @@
<div style="position: relative">
<div class="grid">
- <div style="-webkit-grid-column: -2 foo / span foo; -webkit-grid-row: -2 bar / span bar;"
+ <div style="grid-column: -2 foo / span foo; grid-row: -2 bar / span bar;"
data-offset-x="20" data-offset-y="10" data-expected-width="180" data-expected-height="105">
</div>
- <div style="-webkit-grid-column: -2 foo / span bar; -webkit-grid-row: -2 bar / span foo;"
+ <div style="grid-column: -2 foo / span bar; grid-row: -2 bar / span foo;"
data-offset-x="20" data-offset-y="10" data-expected-width="180" data-expected-height="105">
</div>
- <div style="-webkit-grid-column: -2 foo / span 2 foo; -webkit-grid-row: -2 bar / span 2 bar;"
+ <div style="grid-column: -2 foo / span 2 foo; grid-row: -2 bar / span 2 bar;"
data-offset-x="20" data-offset-y="10" data-expected-width="190" data-expected-height="110">
</div>
- <div style="-webkit-grid-column: -2 foo / span 2 bar; -webkit-grid-row: -2 bar / span 2 foo;"
+ <div style="grid-column: -2 foo / span 2 bar; grid-row: -2 bar / span 2 foo;"
data-offset-x="20" data-offset-y="10" data-expected-width="190" data-expected-height="110">
</div>
- <div style="-webkit-grid-column: span foo / -2 foo; -webkit-grid-row: span bar / -2 bar;"
+ <div style="grid-column: span foo / -2 foo; grid-row: span bar / -2 bar;"
data-offset-x="10" data-offset-y="5" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: span foo / -2 bar; -webkit-grid-row: span bar / -2 foo;"
+ <div style="grid-column: span foo / -2 bar; grid-row: span bar / -2 foo;"
data-offset-x="10" data-offset-y="5" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: span 2 foo / -2 foo; -webkit-grid-row: span 2 bar / -2 bar;"
+ <div style="grid-column: span 2 foo / -2 foo; grid-row: span 2 bar / -2 bar;"
data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="10">
</div>
- <div style="-webkit-grid-column: span 2 foo / -2 bar; -webkit-grid-row: span 2 bar / -2 foo;"
+ <div style="grid-column: span 2 foo / -2 bar; grid-row: span 2 bar / -2 foo;"
data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="10">
</div>
</div>
@@ -264,25 +264,25 @@
<div style="position: relative">
<div class="grid">
- <div style="-webkit-grid-column: 1 middle; -webkit-grid-row: 1 middle;"
+ <div style="grid-column: 1 middle; grid-row: 1 middle;"
data-offset-x="50" data-offset-y="30" data-expected-width="100" data-expected-height="60">
</div>
- <div style="-webkit-grid-column: 2 middle; -webkit-grid-row: 2 middle;"
+ <div style="grid-column: 2 middle; grid-row: 2 middle;"
data-offset-x="160" data-offset-y="95" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: 3 middle; -webkit-grid-row: 3 middle;"
+ <div style="grid-column: 3 middle; grid-row: 3 middle;"
data-offset-x="170" data-offset-y="100" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: 4 middle; -webkit-grid-row: 4 middle;"
+ <div style="grid-column: 4 middle; grid-row: 4 middle;"
data-offset-x="180" data-offset-y="105" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: 5 middle; -webkit-grid-row: 5 middle;"
+ <div style="grid-column: 5 middle; grid-row: 5 middle;"
data-offset-x="190" data-offset-y="110" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: 2 middle / 4 middle; -webkit-grid-row: 2 middle / 4 middle;"
+ <div style="grid-column: 2 middle / 4 middle; grid-row: 2 middle / 4 middle;"
data-offset-x="160" data-offset-y="95" data-expected-width="20" data-expected-height="10">
</div>
- <div style="-webkit-grid-column: 5 middle / 3 middle; -webkit-grid-row: 5 middle / 3 middle;"
+ <div style="grid-column: 5 middle / 3 middle; grid-row: 5 middle / 3 middle;"
data-offset-x="170" data-offset-y="100" data-expected-width="20" data-expected-height="10">
</div>
</div>
@@ -290,25 +290,25 @@
<div style="position: relative">
<div class="grid">
- <div style="-webkit-grid-column: -1 middle; -webkit-grid-row: -1 middle;"
+ <div style="grid-column: -1 middle; grid-row: -1 middle;"
data-offset-x="90" data-offset-y="50" data-expected-width="100" data-expected-height="60">
</div>
- <div style="-webkit-grid-column: -2 middle; -webkit-grid-row: -2 middle;"
+ <div style="grid-column: -2 middle; grid-row: -2 middle;"
data-offset-x="30" data-offset-y="15" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: -3 middle; -webkit-grid-row: -3 middle;"
+ <div style="grid-column: -3 middle; grid-row: -3 middle;"
data-offset-x="20" data-offset-y="10" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: -4 middle; -webkit-grid-row: -4 middle;"
+ <div style="grid-column: -4 middle; grid-row: -4 middle;"
data-offset-x="10" data-offset-y="5" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: -5 middle; -webkit-grid-row: -5 middle;"
+ <div style="grid-column: -5 middle; grid-row: -5 middle;"
data-offset-x="0" data-offset-y="0" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: -2 middle / -4 middle; -webkit-grid-row: -2 middle / -4 middle;"
+ <div style="grid-column: -2 middle / -4 middle; grid-row: -2 middle / -4 middle;"
data-offset-x="10" data-offset-y="5" data-expected-width="20" data-expected-height="10">
</div>
- <div style="-webkit-grid-column: -5 middle / -3 middle; -webkit-grid-row: -5 middle / -3 middle;"
+ <div style="grid-column: -5 middle / -3 middle; grid-row: -5 middle / -3 middle;"
data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="10">
</div>
</div>
@@ -316,25 +316,25 @@
<div style="position: relative">
<div class="grid">
- <div style="-webkit-grid-column: 1 vertical; -webkit-grid-row: 1 horizontal;"
+ <div style="grid-column: 1 vertical; grid-row: 1 horizontal;"
data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="30">
</div>
- <div style="-webkit-grid-column: 2 vertical; -webkit-grid-row: 2 horizontal;"
+ <div style="grid-column: 2 vertical; grid-row: 2 horizontal;"
data-offset-x="50" data-offset-y="30" data-expected-width="100" data-expected-height="60">
</div>
- <div style="-webkit-grid-column: 3 vertical; -webkit-grid-row: 3 horizontal;"
+ <div style="grid-column: 3 vertical; grid-row: 3 horizontal;"
data-offset-x="150" data-offset-y="90" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: 4 vertical; -webkit-grid-row: 4 horizontal;"
+ <div style="grid-column: 4 vertical; grid-row: 4 horizontal;"
data-offset-x="160" data-offset-y="95" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: 5 vertical; -webkit-grid-row: 5 horizontal;"
+ <div style="grid-column: 5 vertical; grid-row: 5 horizontal;"
data-offset-x="170" data-offset-y="100" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: 2 vertical / 4 vertical; -webkit-grid-row: 2 horizontal / 4 horizontal;"
+ <div style="grid-column: 2 vertical / 4 vertical; grid-row: 2 horizontal / 4 horizontal;"
data-offset-x="50" data-offset-y="30" data-expected-width="110" data-expected-height="65">
</div>
- <div style="-webkit-grid-column: 5 vertical / 3 vertical; -webkit-grid-row: 5 horizontal / 3 horizontal;"
+ <div style="grid-column: 5 vertical / 3 vertical; grid-row: 5 horizontal / 3 horizontal;"
data-offset-x="150" data-offset-y="90" data-expected-width="20" data-expected-height="10">
</div>
</div>
@@ -342,25 +342,25 @@
<div style="position: relative">
<div class="grid">
- <div style="-webkit-grid-column: -1 vertical; -webkit-grid-row: -1 horizontal;"
+ <div style="grid-column: -1 vertical; grid-row: -1 horizontal;"
data-offset-x="170" data-offset-y="100" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: -2 vertical; -webkit-grid-row: -2 horizontal;"
+ <div style="grid-column: -2 vertical; grid-row: -2 horizontal;"
data-offset-x="70" data-offset-y="40" data-expected-width="100" data-expected-height="60">
</div>
- <div style="-webkit-grid-column: -3 vertical; -webkit-grid-row: -3 horizontal;"
+ <div style="grid-column: -3 vertical; grid-row: -3 horizontal;"
data-offset-x="20" data-offset-y="10" data-expected-width="50" data-expected-height="30">
</div>
- <div style="-webkit-grid-column: -4 vertical; -webkit-grid-row: -4 horizontal;"
+ <div style="grid-column: -4 vertical; grid-row: -4 horizontal;"
data-offset-x="10" data-offset-y="5" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: -5 vertical; -webkit-grid-row: -5 horizontal;"
+ <div style="grid-column: -5 vertical; grid-row: -5 horizontal;"
data-offset-x="0" data-offset-y="0" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: -2 vertical / -4 vertical; -webkit-grid-row: -2 horizontal / -4 horizontal;"
+ <div style="grid-column: -2 vertical / -4 vertical; grid-row: -2 horizontal / -4 horizontal;"
data-offset-x="10" data-offset-y="5" data-expected-width="60" data-expected-height="35">
</div>
- <div style="-webkit-grid-column: -5 vertical / -3 vertical; -webkit-grid-row: -5 horizontal / -3 horizontal;"
+ <div style="grid-column: -5 vertical / -3 vertical; grid-row: -5 horizontal / -3 horizontal;"
data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="10">
</div>
</div>
@@ -368,28 +368,28 @@
<div style="position: relative">
<div class="grid">
- <div style="-webkit-grid-column: 1 / span middle; -webkit-grid-row: 1 / span middle;"
+ <div style="grid-column: 1 / span middle; grid-row: 1 / span middle;"
data-offset-x="20" data-offset-y="10" data-expected-width="50" data-expected-height="30">
</div>
- <div style="-webkit-grid-column: span middle / 1; -webkit-grid-row: span middle / 1;"
+ <div style="grid-column: span middle / 1; grid-row: span middle / 1;"
data-offset-x="10" data-offset-y="5" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: 1 / span 2 middle; -webkit-grid-row: 1 / span 2 middle;"
+ <div style="grid-column: 1 / span 2 middle; grid-row: 1 / span 2 middle;"
data-offset-x="20" data-offset-y="10" data-expected-width="160" data-expected-height="95">
</div>
- <div style="-webkit-grid-column: span 2 middle / 1; -webkit-grid-row: span 2 middle / 1;"
+ <div style="grid-column: span 2 middle / 1; grid-row: span 2 middle / 1;"
data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="10">
</div>
- <div style="-webkit-grid-column: middle / span middle; -webkit-grid-row: middle / span middle;"
+ <div style="grid-column: middle / span middle; grid-row: middle / span middle;"
data-offset-x="70" data-offset-y="40" data-expected-width="110" data-expected-height="65">
</div>
- <div style="-webkit-grid-column: span middle / middle; -webkit-grid-row: span middle / middle;"
+ <div style="grid-column: span middle / middle; grid-row: span middle / middle;"
data-offset-x="10" data-offset-y="5" data-expected-width="60" data-expected-height="35">
</div>
- <div style="-webkit-grid-column: middle / span 2 middle; -webkit-grid-row: middle / span 2 middle;"
+ <div style="grid-column: middle / span 2 middle; grid-row: middle / span 2 middle;"
data-offset-x="70" data-offset-y="40" data-expected-width="120" data-expected-height="70">
</div>
- <div style="-webkit-grid-column: span 2 middle / middle; -webkit-grid-row: span 2 middle / middle;"
+ <div style="grid-column: span 2 middle / middle; grid-row: span 2 middle / middle;"
data-offset-x="0" data-offset-y="0" data-expected-width="70" data-expected-height="40">
</div>
</div>
@@ -397,28 +397,28 @@
<div style="position: relative">
<div class="grid">
- <div style="-webkit-grid-column: -1 / span middle; -webkit-grid-row: -1 / span middle;"
+ <div style="grid-column: -1 / span middle; grid-row: -1 / span middle;"
data-offset-x="170" data-offset-y="100" data-expected-width="10" data-expected-height="5">
</div>
- <div style="-webkit-grid-column: span middle / -1; -webkit-grid-row: span middle / -1;"
+ <div style="grid-column: span middle / -1; grid-row: span middle / -1;"
data-offset-x="70" data-offset-y="40" data-expected-width="100" data-expected-height="60">
</div>
- <div style="-webkit-grid-column: -1 / span 2 middle; -webkit-grid-row: -1 / span 2 middle;"
+ <div style="grid-column: -1 / span 2 middle; grid-row: -1 / span 2 middle;"
data-offset-x="170" data-offset-y="100" data-expected-width="20" data-expected-height="10">
</div>
- <div style="-webkit-grid-column: span 2 middle / -1; -webkit-grid-row: span 2 middle / -1;"
+ <div style="grid-column: span 2 middle / -1; grid-row: span 2 middle / -1;"
data-offset-x="10" data-offset-y="5" data-expected-width="160" data-expected-height="95">
</div>
- <div style="-webkit-grid-column: -1 middle / span middle; -webkit-grid-row: -1 middle / span middle;"
+ <div style="grid-column: -1 middle / span middle; grid-row: -1 middle / span middle;"
data-offset-x="70" data-offset-y="40" data-expected-width="110" data-expected-height="65">
</div>
- <div style="-webkit-grid-column: span middle / -1 middle; -webkit-grid-row: span middle / -1 middle;"
+ <div style="grid-column: span middle / -1 middle; grid-row: span middle / -1 middle;"
data-offset-x="10" data-offset-y="5" data-expected-width="60" data-expected-height="35">
</div>
- <div style="-webkit-grid-column: -1 middle / span 2 middle; -webkit-grid-row: -1 middle / span 2 middle;"
+ <div style="grid-column: -1 middle / span 2 middle; grid-row: -1 middle / span 2 middle;"
data-offset-x="70" data-offset-y="40" data-expected-width="120" data-expected-height="70">
</div>
- <div style="-webkit-grid-column: span 2 middle / -1 middle; -webkit-grid-row: span 2 middle / -1 middle;"
+ <div style="grid-column: span 2 middle / -1 middle; grid-row: span 2 middle / -1 middle;"
data-offset-x="0" data-offset-y="0" data-expected-width="70" data-expected-height="40">
</div>
</div>
@@ -426,16 +426,16 @@
<div style="position: relative">
<div class="grid">
- <div style="-webkit-grid-column: span middle / 6; -webkit-grid-row: span middle / 6;"
+ <div style="grid-column: span middle / 6; grid-row: span middle / 6;"
data-offset-x="80" data-offset-y="45" data-expected-width="130" data-expected-height="75">
</div>
- <div style="-webkit-grid-column: span 2 middle / 6; -webkit-grid-row: span 2 middle / 6;"
+ <div style="grid-column: span 2 middle / 6; grid-row: span 2 middle / 6;"
data-offset-x="20" data-offset-y="10" data-expected-width="190" data-expected-height="110">
</div>
- <div style="-webkit-grid-column: -6 / span middle; -webkit-grid-row: -6 / span middle;"
+ <div style="grid-column: -6 / span middle; grid-row: -6 / span middle;"
data-offset-x="0" data-offset-y="0" data-expected-width="80" data-expected-height="45">
</div>
- <div style="-webkit-grid-column: -6 / span 2 middle; -webkit-grid-row: -6 / span 2 middle;"
+ <div style="grid-column: -6 / span 2 middle; grid-row: -6 / span 2 middle;"
data-offset-x="0" data-offset-y="0" data-expected-width="190" data-expected-height="110">
</div>
</div>
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-with-border-in-fr.html b/LayoutTests/fast/css-grid-layout/grid-item-with-border-in-fr.html
index 1bc2644..f44044b 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-with-border-in-fr.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-with-border-in-fr.html
@@ -4,7 +4,7 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.frGrid {
- -webkit-grid: 1fr / 1fr;
+ grid: 1fr / 1fr;
font: 50px/1 Ahem;
border: 50px solid magenta;
width: 300px;
@@ -20,13 +20,13 @@
}
.frRowsGrid {
- -webkit-grid-auto-columns: 100px;
- -webkit-grid-auto-rows: minmax(0, 1fr);
+ grid-auto-columns: 100px;
+ grid-auto-rows: minmax(0, 1fr);
}
.frColsGrid {
- -webkit-grid-auto-columns: minmax(0, 1fr);
- -webkit-grid-auto-rows: 100px;
+ grid-auto-columns: minmax(0, 1fr);
+ grid-auto-rows: 100px;
}
span {
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-with-border-in-intrinsic.html b/LayoutTests/fast/css-grid-layout/grid-item-with-border-in-intrinsic.html
index a065adf..fdc84ee 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-with-border-in-intrinsic.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-with-border-in-intrinsic.html
@@ -2,7 +2,7 @@
<style>
.grid {
- display: -webkit-grid;
+ display: grid;
font: 50px/1 Ahem;
border: 5px dashed magenta;
width: 150px;
@@ -12,16 +12,16 @@
border: 50px solid rgba(0, 255, 250, 0.5);
}
.gridFR {
- -webkit-grid: 1fr / 1fr;
+ grid: 1fr / 1fr;
}
.gridMaxContent {
- -webkit-grid: -webkit-max-content / -webkit-max-content;
+ grid: -webkit-max-content / -webkit-max-content;
}
.gridMinContent {
- -webkit-grid: -webkit-min-content / -webkit-min-content;
+ grid: -webkit-min-content / -webkit-min-content;
}
.gridAuto {
- -webkit-grid: auto / auto;
+ grid: auto / auto;
}
</style>
<script src="../../resources/check-layout.js"></script>
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-with-percent-height-in-auto-height-grid-resolution.html b/LayoutTests/fast/css-grid-layout/grid-item-with-percent-height-in-auto-height-grid-resolution.html
index a2cff12..97e8437 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-with-percent-height-in-auto-height-grid-resolution.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-with-percent-height-in-auto-height-grid-resolution.html
@@ -3,13 +3,13 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.gridMinMaxMinMax {
- -webkit-grid-template-columns: 50px 100px;
- -webkit-grid-template-rows: minmax(10px, -webkit-min-content) minmax(50px, 100px);
+ grid-template-columns: 50px 100px;
+ grid-template-rows: minmax(10px, -webkit-min-content) minmax(50px, 100px);
}
.gridAutoAuto {
- -webkit-grid-template-columns: 50px 100px;
- -webkit-grid-template-rows: auto auto;
+ grid-template-columns: 50px 100px;
+ grid-template-rows: auto auto;
}
.sizedToGridAreaMinSizes {
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-with-percent-min-max-height-dynamic.html b/LayoutTests/fast/css-grid-layout/grid-item-with-percent-min-max-height-dynamic.html
index 06a5cf2..05415bf 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-with-percent-min-max-height-dynamic.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-with-percent-min-max-height-dynamic.html
@@ -3,8 +3,8 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-columns: 50px 100px;
- -webkit-grid-template-rows: 70px 140px;
+ grid-template-columns: 50px 100px;
+ grid-template-rows: 70px 140px;
}
#minHeightPercent {
@@ -22,7 +22,7 @@
function testLayout(gridElementID, gridTracks, size)
{
var gridElement = document.getElementById(gridElementID);
- gridElement.style.webkitGridTemplateRows = gridTracks.rows;
+ gridElement.style.gridTemplateRows = gridTracks.rows;
var gridItem = gridElement.firstChild.nextSibling;
gridItem.setAttribute("data-expected-width", size.width);
gridItem.setAttribute("data-expected-height", size.height);
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-z-index-change-repaint-expected.html b/LayoutTests/fast/css-grid-layout/grid-item-z-index-change-repaint-expected.html
index cda347a..228b1a0 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-z-index-change-repaint-expected.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-z-index-change-repaint-expected.html
@@ -4,8 +4,8 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-rows: 100px;
- -webkit-grid-template-columns: 200px;
+ grid-template-rows: 100px;
+ grid-template-columns: 200px;
margin-top: 10px;
}
.green {
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-z-index-change-repaint.html b/LayoutTests/fast/css-grid-layout/grid-item-z-index-change-repaint.html
index 6f28ce0..4879ba9 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-z-index-change-repaint.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-z-index-change-repaint.html
@@ -4,8 +4,8 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-rows: 100px;
- -webkit-grid-template-columns: 200px;
+ grid-template-rows: 100px;
+ grid-template-columns: 200px;
margin-top: 10px;
}
.red {
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-z-index-stacking-context-expected.html b/LayoutTests/fast/css-grid-layout/grid-item-z-index-stacking-context-expected.html
index 229785f..cbdc0dd 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-z-index-stacking-context-expected.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-z-index-stacking-context-expected.html
@@ -5,8 +5,8 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-rows: 100px;
- -webkit-grid-template-columns: 200px 200px;
+ grid-template-rows: 100px;
+ grid-template-columns: 200px 200px;
margin-top: 10px;
}
.green {
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-z-index-stacking-context.html b/LayoutTests/fast/css-grid-layout/grid-item-z-index-stacking-context.html
index b7208e7..7e373a7 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-z-index-stacking-context.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-z-index-stacking-context.html
@@ -5,8 +5,8 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-rows: 100px;
- -webkit-grid-template-columns: 200px 200px;
+ grid-template-rows: 100px;
+ grid-template-columns: 200px 200px;
margin-top: 10px;
}
.red {
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-z-index-support.html b/LayoutTests/fast/css-grid-layout/grid-item-z-index-support.html
index 4c4cc04..90b5c46 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-z-index-support.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-z-index-support.html
@@ -18,7 +18,7 @@
debug('Test z-index property once the element becomes a grid item');
var grid = document.getElementById("grid");
-grid.style.display = "-webkit-grid";
+grid.style.display = "grid";
shouldBe("getComputedStyle(item, '').getPropertyValue('z-index')", "'-10'");
item.style.zIndex = "10";
shouldBe("getComputedStyle(item, '').getPropertyValue('z-index')", "'10'");
diff --git a/LayoutTests/fast/css-grid-layout/grid-items-should-not-be-stretched-when-height-or-width-or-margin-change.html b/LayoutTests/fast/css-grid-layout/grid-items-should-not-be-stretched-when-height-or-width-or-margin-change.html
index 2ff6cf9..7df568b 100644
--- a/LayoutTests/fast/css-grid-layout/grid-items-should-not-be-stretched-when-height-or-width-or-margin-change.html
+++ b/LayoutTests/fast/css-grid-layout/grid-items-should-not-be-stretched-when-height-or-width-or-margin-change.html
@@ -15,19 +15,19 @@
#fromMarginAuto { margin: auto; }
</style>
<p>The grids below had initially 'stretched' items, but we have changed 'height', 'width' and 'margin' to values which don't allow stretch. This test verifies that the layout algorithm properly detects such changes and clear the override height and width accordingly.</p>
-<div class="grid fit-content" style="-webkit-grid-template: 200px 200px / 200px 200px;">
+<div class="grid fit-content" style="grid-template: 200px 200px / 200px 200px;">
<div id="toFixedHeight" class="firstRowFirstColumn" data-expected-width="200" data-expected-height="100"></div>
<div class="firstRowSecondColumn" data-expected-width="200" data-expected-height="200"></div>
<div class="secondRowFirstColumn" data-expected-width="200" data-expected-height="200"></div>
<div id="fromFixedHeight" class="secondRowSecondColumn" data-expected-width="200" data-expected-height="200"></div>
</div>
-<div class="grid fit-content" style="-webkit-grid-template: 200px 200px / 200px 200px;">
+<div class="grid fit-content" style="grid-template: 200px 200px / 200px 200px;">
<div id="toFixedWidth" class="firstRowFirstColumn" data-expected-width="150" data-expected-height="200"></div>
<div class="firstRowSecondColumn" data-expected-width="200" data-expected-height="200"></div>
<div class="secondRowFirstColumn" data-expected-width="200" data-expected-height="200"></div>
<div id="fromFixedWidth" class="secondRowSecondColumn" data-expected-width="200" data-expected-height="200"></div>
</div>
-<div class="grid fit-content" style="-webkit-grid-template: 200px 200px / 200px 200px;">
+<div class="grid fit-content" style="grid-template: 200px 200px / 200px 200px;">
<div id="toMarginAuto" class="firstRowFirstColumn" data-expected-width="150" data-expected-height="100">
<div style="width: 150px; height: 100px"></div>
</div>
diff --git a/LayoutTests/fast/css-grid-layout/grid-justify-content-distribution-vertical-lr.html b/LayoutTests/fast/css-grid-layout/grid-justify-content-distribution-vertical-lr.html
index aa493b5..11f9c8c 100644
--- a/LayoutTests/fast/css-grid-layout/grid-justify-content-distribution-vertical-lr.html
+++ b/LayoutTests/fast/css-grid-layout/grid-justify-content-distribution-vertical-lr.html
@@ -10,15 +10,15 @@
}
.grid {
- -webkit-grid-auto-columns: 20px;
- -webkit-grid-auto-rows: 40px;
+ grid-auto-columns: 20px;
+ grid-auto-rows: 40px;
position: relative;
width: 400px;
height: 300px;
}
.stretchedGrid {
- -webkit-grid-auto-columns: auto;
+ grid-auto-columns: auto;
}
</style>
diff --git a/LayoutTests/fast/css-grid-layout/grid-justify-content-distribution-vertical-rl.html b/LayoutTests/fast/css-grid-layout/grid-justify-content-distribution-vertical-rl.html
index 3dba042..f1944a5 100644
--- a/LayoutTests/fast/css-grid-layout/grid-justify-content-distribution-vertical-rl.html
+++ b/LayoutTests/fast/css-grid-layout/grid-justify-content-distribution-vertical-rl.html
@@ -10,15 +10,15 @@
}
.grid {
- -webkit-grid-auto-columns: 20px;
- -webkit-grid-auto-rows: 40px;
+ grid-auto-columns: 20px;
+ grid-auto-rows: 40px;
position: relative;
width: 400px;
height: 300px;
}
.stretchedGrid {
- -webkit-grid-auto-columns: auto;
+ grid-auto-columns: auto;
}
</style>
diff --git a/LayoutTests/fast/css-grid-layout/grid-justify-content-distribution.html b/LayoutTests/fast/css-grid-layout/grid-justify-content-distribution.html
index 5f68cf6..d5ebb37 100644
--- a/LayoutTests/fast/css-grid-layout/grid-justify-content-distribution.html
+++ b/LayoutTests/fast/css-grid-layout/grid-justify-content-distribution.html
@@ -10,15 +10,15 @@
}
.grid {
- -webkit-grid-auto-columns: 20px;
- -webkit-grid-auto-rows: 40px;
+ grid-auto-columns: 20px;
+ grid-auto-rows: 40px;
position: relative;
width: 300px;
height: 200px;
}
.stretchedGrid {
- -webkit-grid-auto-columns: auto;
+ grid-auto-columns: auto;
}
</style>
</head>
diff --git a/LayoutTests/fast/css-grid-layout/grid-justify-content-vertical-lr.html b/LayoutTests/fast/css-grid-layout/grid-justify-content-vertical-lr.html
index de4d080..4e77a21 100644
--- a/LayoutTests/fast/css-grid-layout/grid-justify-content-vertical-lr.html
+++ b/LayoutTests/fast/css-grid-layout/grid-justify-content-vertical-lr.html
@@ -10,7 +10,7 @@
}
.grid {
- -webkit-grid: 100px 100px / 50px 50px;
+ grid: 100px 100px / 50px 50px;
position: relative;
width: 300px;
height: 200px;
diff --git a/LayoutTests/fast/css-grid-layout/grid-justify-content-vertical-rl.html b/LayoutTests/fast/css-grid-layout/grid-justify-content-vertical-rl.html
index 69d11c3..446b21c 100644
--- a/LayoutTests/fast/css-grid-layout/grid-justify-content-vertical-rl.html
+++ b/LayoutTests/fast/css-grid-layout/grid-justify-content-vertical-rl.html
@@ -10,7 +10,7 @@
}
.grid {
- -webkit-grid: 100px 100px / 50px 50px;
+ grid: 100px 100px / 50px 50px;
position: relative;
width: 300px;
height: 200px;
diff --git a/LayoutTests/fast/css-grid-layout/grid-justify-content.html b/LayoutTests/fast/css-grid-layout/grid-justify-content.html
index bd314c1..22a0a44 100644
--- a/LayoutTests/fast/css-grid-layout/grid-justify-content.html
+++ b/LayoutTests/fast/css-grid-layout/grid-justify-content.html
@@ -10,7 +10,7 @@
}
.grid {
- -webkit-grid: 100px 100px / 50px 50px;
+ grid: 100px 100px / 50px 50px;
position: relative;
width: 200px;
height: 300px;
diff --git a/LayoutTests/fast/css-grid-layout/grid-percent-track-margin-border-padding.html b/LayoutTests/fast/css-grid-layout/grid-percent-track-margin-border-padding.html
index 42832c1..cbaa4025 100644
--- a/LayoutTests/fast/css-grid-layout/grid-percent-track-margin-border-padding.html
+++ b/LayoutTests/fast/css-grid-layout/grid-percent-track-margin-border-padding.html
@@ -6,8 +6,8 @@
.grid {
width: 100px;
height: 100px;
- -webkit-grid-template-columns: 20% 50% 30%;
- -webkit-grid-template-rows: 40% 60%;
+ grid-template-columns: 20% 50% 30%;
+ grid-template-rows: 40% 60%;
}
.margin {
diff --git a/LayoutTests/fast/css-grid-layout/grid-percent-track-scrollbar.html b/LayoutTests/fast/css-grid-layout/grid-percent-track-scrollbar.html
index 45b07cc..e3dac8a 100644
--- a/LayoutTests/fast/css-grid-layout/grid-percent-track-scrollbar.html
+++ b/LayoutTests/fast/css-grid-layout/grid-percent-track-scrollbar.html
@@ -6,8 +6,8 @@
.grid {
width: 100px;
height: 100px;
- -webkit-grid-template-columns: 20% 50% 30%;
- -webkit-grid-template-rows: 40% 60%;
+ grid-template-columns: 20% 50% 30%;
+ grid-template-rows: 40% 60%;
}
.scroll {
diff --git a/LayoutTests/fast/css-grid-layout/grid-positioned-children-writing-modes.html b/LayoutTests/fast/css-grid-layout/grid-positioned-children-writing-modes.html
index 5244a06..3d81c70 100644
--- a/LayoutTests/fast/css-grid-layout/grid-positioned-children-writing-modes.html
+++ b/LayoutTests/fast/css-grid-layout/grid-positioned-children-writing-modes.html
@@ -6,7 +6,7 @@
margin: 5px;
width: 50px;
height: 25px;
- -webkit-grid: 20px / 30px;
+ grid: 20px / 30px;
padding: 5px 10px 15px 20px;
border-style: solid;
border-width: 5px 10px 15px 20px;
@@ -21,8 +21,8 @@
.onlyFirstRowOnlyFirstColumn {
background-color: green;
- -webkit-grid-column: 1 / 2;
- -webkit-grid-row: 1 / 2;
+ grid-column: 1 / 2;
+ grid-row: 1 / 2;
}
.offsets {
diff --git a/LayoutTests/fast/css-grid-layout/grid-positioned-items-background-rtl.html b/LayoutTests/fast/css-grid-layout/grid-positioned-items-background-rtl.html
index cc450c9..3376393 100644
--- a/LayoutTests/fast/css-grid-layout/grid-positioned-items-background-rtl.html
+++ b/LayoutTests/fast/css-grid-layout/grid-positioned-items-background-rtl.html
@@ -3,8 +3,8 @@
<style>
.grid {
- -webkit-grid-template-columns: 100px 200px;
- -webkit-grid-template-rows: 50px 150px;
+ grid-template-columns: 100px 200px;
+ grid-template-rows: 50px 150px;
width: 500px;
height: 300px;
border: 5px solid black;
diff --git a/LayoutTests/fast/css-grid-layout/grid-positioned-items-background.html b/LayoutTests/fast/css-grid-layout/grid-positioned-items-background.html
index 42a3c09..c5eb2f0 100644
--- a/LayoutTests/fast/css-grid-layout/grid-positioned-items-background.html
+++ b/LayoutTests/fast/css-grid-layout/grid-positioned-items-background.html
@@ -4,8 +4,8 @@
<style>
.grid {
- -webkit-grid-template-columns: 100px 200px;
- -webkit-grid-template-rows: 50px 150px;
+ grid-template-columns: 100px 200px;
+ grid-template-rows: 50px 150px;
width: 500px;
height: 300px;
border: 5px solid black;
diff --git a/LayoutTests/fast/css-grid-layout/grid-positioned-items-content-alignment-rtl.html b/LayoutTests/fast/css-grid-layout/grid-positioned-items-content-alignment-rtl.html
index f2b9b3a..d1d77c1 100644
--- a/LayoutTests/fast/css-grid-layout/grid-positioned-items-content-alignment-rtl.html
+++ b/LayoutTests/fast/css-grid-layout/grid-positioned-items-content-alignment-rtl.html
@@ -4,8 +4,8 @@
<style>
.grid {
- -webkit-grid-template-columns: 100px 50px;
- -webkit-grid-template-rows: 70px 30px;
+ grid-template-columns: 100px 50px;
+ grid-template-rows: 70px 30px;
width: 400px;
height: 200px;
margin: 5px;
@@ -32,361 +32,361 @@
<p>This test checks the behavior of the positioned items in a grid using content alignment in RTL.</p>
<div class="grid directionRTL contentStart">
- <div style="-webkit-grid-column: 1 / 2; -webkit-grid-row: 1 / 2;"
+ <div style="grid-column: 1 / 2; grid-row: 1 / 2;"
data-offset-x="300" data-offset-y="0" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid directionRTL contentStart">
- <div class="offsets" style="-webkit-grid-column: 1 / 2; -webkit-grid-row: 1 / 2;"
+ <div class="offsets" style="grid-column: 1 / 2; grid-row: 1 / 2;"
data-offset-x="300" data-offset-y="0" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid directionRTL contentCenter">
- <div style="-webkit-grid-column: 1 / 2; -webkit-grid-row: 1 / 2;"
+ <div style="grid-column: 1 / 2; grid-row: 1 / 2;"
data-offset-x="175" data-offset-y="50" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid directionRTL contentCenter">
- <div class="offsets" style="-webkit-grid-column: 1 / 2; -webkit-grid-row: 1 / 2;"
+ <div class="offsets" style="grid-column: 1 / 2; grid-row: 1 / 2;"
data-offset-x="175" data-offset-y="50" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid directionRTL contentEnd">
- <div style="-webkit-grid-column: 1 / 2; -webkit-grid-row: 1 / 2;"
+ <div style="grid-column: 1 / 2; grid-row: 1 / 2;"
data-offset-x="50" data-offset-y="100" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid directionRTL contentEnd">
- <div class="offsets" style="-webkit-grid-column: 1 / 2; -webkit-grid-row: 1 / 2;"
+ <div class="offsets" style="grid-column: 1 / 2; grid-row: 1 / 2;"
data-offset-x="50" data-offset-y="100" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid directionRTL contentSpaceBetween">
- <div style="-webkit-grid-column: 1 / 2; -webkit-grid-row: 1 / 2;"
+ <div style="grid-column: 1 / 2; grid-row: 1 / 2;"
data-offset-x="300" data-offset-y="0" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid directionRTL contentSpaceBetween">
- <div class="offsets" style="-webkit-grid-column: 1 / 2; -webkit-grid-row: 1 / 2;"
+ <div class="offsets" style="grid-column: 1 / 2; grid-row: 1 / 2;"
data-offset-x="300" data-offset-y="0" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid directionRTL contentSpaceAround">
- <div style="-webkit-grid-column: 1 / 2; -webkit-grid-row: 1 / 2;"
+ <div style="grid-column: 1 / 2; grid-row: 1 / 2;"
data-offset-x="238" data-offset-y="25" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid directionRTL contentSpaceAround">
- <div class="offsets" style="-webkit-grid-column: 1 / 2; -webkit-grid-row: 1 / 2;"
+ <div class="offsets" style="grid-column: 1 / 2; grid-row: 1 / 2;"
data-offset-x="238" data-offset-y="25" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid directionRTL contentSpaceEvenly">
- <div style="-webkit-grid-column: 1 / 2; -webkit-grid-row: 1 / 2;"
+ <div style="grid-column: 1 / 2; grid-row: 1 / 2;"
data-offset-x="217" data-offset-y="33" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid directionRTL contentSpaceEvenly">
- <div class="offsets" style="-webkit-grid-column: 1 / 2; -webkit-grid-row: 1 / 2;"
+ <div class="offsets" style="grid-column: 1 / 2; grid-row: 1 / 2;"
data-offset-x="217" data-offset-y="33" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid directionRTL contentStart">
- <div style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 2 / 3;"
+ <div style="grid-column: 2 / 3; grid-row: 2 / 3;"
data-offset-x="250" data-offset-y="70" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid directionRTL contentStart">
- <div class="offsets" style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 2 / 3;"
+ <div class="offsets" style="grid-column: 2 / 3; grid-row: 2 / 3;"
data-offset-x="250" data-offset-y="70" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid directionRTL contentCenter">
- <div style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 2 / 3;"
+ <div style="grid-column: 2 / 3; grid-row: 2 / 3;"
data-offset-x="125" data-offset-y="120" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid directionRTL contentCenter">
- <div class="offsets" style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 2 / 3;"
+ <div class="offsets" style="grid-column: 2 / 3; grid-row: 2 / 3;"
data-offset-x="125" data-offset-y="120" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid directionRTL contentEnd">
- <div style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 2 / 3;"
+ <div style="grid-column: 2 / 3; grid-row: 2 / 3;"
data-offset-x="0" data-offset-y="170" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid directionRTL contentEnd">
- <div class="offsets" style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 2 / 3;"
+ <div class="offsets" style="grid-column: 2 / 3; grid-row: 2 / 3;"
data-offset-x="0" data-offset-y="170" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid directionRTL contentSpaceBetween">
- <div style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 2 / 3;"
+ <div style="grid-column: 2 / 3; grid-row: 2 / 3;"
data-offset-x="0" data-offset-y="170" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid directionRTL contentSpaceBetween">
- <div class="offsets" style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 2 / 3;"
+ <div class="offsets" style="grid-column: 2 / 3; grid-row: 2 / 3;"
data-offset-x="0" data-offset-y="170" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid directionRTL contentSpaceAround">
- <div style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 2 / 3;"
+ <div style="grid-column: 2 / 3; grid-row: 2 / 3;"
data-offset-x="63" data-offset-y="145" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid directionRTL contentSpaceAround">
- <div class="offsets" style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 2 / 3;"
+ <div class="offsets" style="grid-column: 2 / 3; grid-row: 2 / 3;"
data-offset-x="63" data-offset-y="145" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid directionRTL contentSpaceEvenly">
- <div style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 2 / 3;"
+ <div style="grid-column: 2 / 3; grid-row: 2 / 3;"
data-offset-x="83" data-offset-y="137" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid directionRTL contentSpaceEvenly">
- <div class="offsets" style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 2 / 3;"
+ <div class="offsets" style="grid-column: 2 / 3; grid-row: 2 / 3;"
data-offset-x="83" data-offset-y="137" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid directionRTL contentStart">
- <div style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="300" data-offset-y="0" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid directionRTL contentStart">
- <div class="offsets" style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div class="offsets" style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="300" data-offset-y="0" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid directionRTL contentCenter">
- <div style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="175" data-offset-y="0" data-expected-width="225" data-expected-height="120">
</div>
</div>
<div class="grid directionRTL contentCenter">
- <div class="offsets" style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div class="offsets" style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="175" data-offset-y="0" data-expected-width="225" data-expected-height="120">
</div>
</div>
<div class="grid directionRTL contentEnd">
- <div style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="50" data-offset-y="0" data-expected-width="350" data-expected-height="170">
</div>
</div>
<div class="grid directionRTL contentEnd">
- <div class="offsets" style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div class="offsets" style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="50" data-offset-y="0" data-expected-width="350" data-expected-height="170">
</div>
</div>
<div class="grid directionRTL contentSpaceBetween">
- <div style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="300" data-offset-y="0" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid directionRTL contentSpaceBetween">
- <div class="offsets" style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div class="offsets" style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="300" data-offset-y="0" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid directionRTL contentSpaceAround">
- <div style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="238" data-offset-y="0" data-expected-width="163" data-expected-height="95">
</div>
</div>
<div class="grid directionRTL contentSpaceAround">
- <div class="offsets" style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div class="offsets" style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="238" data-offset-y="0" data-expected-width="163" data-expected-height="95">
</div>
</div>
<div class="grid directionRTL contentSpaceEvenly">
- <div style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="217" data-offset-y="0" data-expected-width="183" data-expected-height="103">
</div>
</div>
<div class="grid directionRTL contentSpaceEvenly">
- <div class="offsets" style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div class="offsets" style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="217" data-offset-y="0" data-expected-width="183" data-expected-height="103">
</div>
</div>
<div class="grid directionRTL contentStart">
- <div style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="0" data-offset-y="70" data-expected-width="300" data-expected-height="130">
</div>
</div>
<div class="grid directionRTL contentStart">
- <div class="offsets" style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div class="offsets" style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="0" data-offset-y="70" data-expected-width="300" data-expected-height="130">
</div>
</div>
<div class="grid directionRTL contentCenter">
- <div style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="0" data-offset-y="120" data-expected-width="175" data-expected-height="80">
</div>
</div>
<div class="grid directionRTL contentCenter">
- <div class="offsets" style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div class="offsets" style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="0" data-offset-y="120" data-expected-width="175" data-expected-height="80">
</div>
</div>
<div class="grid directionRTL contentEnd">
- <div style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="0" data-offset-y="170" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid directionRTL contentEnd">
- <div class="offsets" style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div class="offsets" style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="0" data-offset-y="170" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid directionRTL contentSpaceBetween">
- <div style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="0" data-offset-y="170" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid directionRTL contentSpaceBetween">
- <div class="offsets" style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div class="offsets" style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="0" data-offset-y="170" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid directionRTL contentSpaceAround">
- <div style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="0" data-offset-y="145" data-expected-width="113" data-expected-height="55">
</div>
</div>
<div class="grid directionRTL contentSpaceAround">
- <div class="offsets" style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div class="offsets" style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="0" data-offset-y="145" data-expected-width="113" data-expected-height="55">
</div>
</div>
<div class="grid directionRTL contentSpaceEvenly">
- <div style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="0" data-offset-y="137" data-expected-width="133" data-expected-height="63">
</div>
</div>
<div class="grid directionRTL contentSpaceEvenly">
- <div class="offsets" style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div class="offsets" style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="0" data-offset-y="137" data-expected-width="133" data-expected-height="63">
</div>
</div>
<div class="grid directionRTL contentStart">
- <div style="-webkit-grid-column: auto / auto; -webkit-grid-row: auto / auto;"
+ <div style="grid-column: auto / auto; grid-row: auto / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="400" data-expected-height="200">
</div>
</div>
<div class="grid directionRTL contentStart">
- <div class="offsets" style="-webkit-grid-column: auto / auto; -webkit-grid-row: auto / auto;"
+ <div class="offsets" style="grid-column: auto / auto; grid-row: auto / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="400" data-expected-height="200">
</div>
</div>
<div class="grid directionRTL contentCenter">
- <div style="-webkit-grid-column: auto / auto; -webkit-grid-row: auto / auto;"
+ <div style="grid-column: auto / auto; grid-row: auto / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="400" data-expected-height="200">
</div>
</div>
<div class="grid directionRTL contentCenter">
- <div class="offsets" style="-webkit-grid-column: auto / auto; -webkit-grid-row: auto / auto;"
+ <div class="offsets" style="grid-column: auto / auto; grid-row: auto / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="400" data-expected-height="200">
</div>
</div>
<div class="grid directionRTL contentEnd">
- <div style="-webkit-grid-column: auto / auto; -webkit-grid-row: auto / auto;"
+ <div style="grid-column: auto / auto; grid-row: auto / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="400" data-expected-height="200">
</div>
</div>
<div class="grid directionRTL contentEnd">
- <div class="offsets" style="-webkit-grid-column: auto / auto; -webkit-grid-row: auto / auto;"
+ <div class="offsets" style="grid-column: auto / auto; grid-row: auto / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="400" data-expected-height="200">
</div>
</div>
<div class="grid directionRTL contentSpaceBetween">
- <div style="-webkit-grid-column: auto / auto; -webkit-grid-row: auto / auto;"
+ <div style="grid-column: auto / auto; grid-row: auto / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="400" data-expected-height="200">
</div>
</div>
<div class="grid directionRTL contentSpaceBetween">
- <div class="offsets" style="-webkit-grid-column: auto / auto; -webkit-grid-row: auto / auto;"
+ <div class="offsets" style="grid-column: auto / auto; grid-row: auto / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="400" data-expected-height="200">
</div>
</div>
<div class="grid directionRTL contentSpaceAround">
- <div style="-webkit-grid-column: auto / auto; -webkit-grid-row: auto / auto;"
+ <div style="grid-column: auto / auto; grid-row: auto / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="400" data-expected-height="200">
</div>
</div>
<div class="grid directionRTL contentSpaceAround">
- <div class="offsets" style="-webkit-grid-column: auto / auto; -webkit-grid-row: auto / auto;"
+ <div class="offsets" style="grid-column: auto / auto; grid-row: auto / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="400" data-expected-height="200">
</div>
</div>
<div class="grid directionRTL contentSpaceEvenly">
- <div style="-webkit-grid-column: auto / auto; -webkit-grid-row: auto / auto;"
+ <div style="grid-column: auto / auto; grid-row: auto / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="400" data-expected-height="200">
</div>
</div>
<div class="grid directionRTL contentSpaceEvenly">
- <div class="offsets" style="-webkit-grid-column: auto / auto; -webkit-grid-row: auto / auto;"
+ <div class="offsets" style="grid-column: auto / auto; grid-row: auto / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="400" data-expected-height="200">
</div>
</div>
diff --git a/LayoutTests/fast/css-grid-layout/grid-positioned-items-content-alignment.html b/LayoutTests/fast/css-grid-layout/grid-positioned-items-content-alignment.html
index 98dbe91..4036a238 100644
--- a/LayoutTests/fast/css-grid-layout/grid-positioned-items-content-alignment.html
+++ b/LayoutTests/fast/css-grid-layout/grid-positioned-items-content-alignment.html
@@ -4,8 +4,8 @@
<style>
.grid {
- -webkit-grid-template-columns: 100px 50px;
- -webkit-grid-template-rows: 70px 30px;
+ grid-template-columns: 100px 50px;
+ grid-template-rows: 70px 30px;
width: 400px;
height: 200px;
margin: 5px;
@@ -32,361 +32,361 @@
<p>This test checks the behavior of the positioned items in a grid using content alignment.</p>
<div class="grid contentStart">
- <div style="-webkit-grid-column: 1 / 2; -webkit-grid-row: 1 / 2;"
+ <div style="grid-column: 1 / 2; grid-row: 1 / 2;"
data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid contentStart">
- <div class="offsets" style="-webkit-grid-column: 1 / 2; -webkit-grid-row: 1 / 2;"
+ <div class="offsets" style="grid-column: 1 / 2; grid-row: 1 / 2;"
data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid contentCenter">
- <div style="-webkit-grid-column: 1 / 2; -webkit-grid-row: 1 / 2;"
+ <div style="grid-column: 1 / 2; grid-row: 1 / 2;"
data-offset-x="125" data-offset-y="50" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid contentCenter">
- <div class="offsets" style="-webkit-grid-column: 1 / 2; -webkit-grid-row: 1 / 2;"
+ <div class="offsets" style="grid-column: 1 / 2; grid-row: 1 / 2;"
data-offset-x="125" data-offset-y="50" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid contentEnd">
- <div style="-webkit-grid-column: 1 / 2; -webkit-grid-row: 1 / 2;"
+ <div style="grid-column: 1 / 2; grid-row: 1 / 2;"
data-offset-x="250" data-offset-y="100" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid contentEnd">
- <div class="offsets" style="-webkit-grid-column: 1 / 2; -webkit-grid-row: 1 / 2;"
+ <div class="offsets" style="grid-column: 1 / 2; grid-row: 1 / 2;"
data-offset-x="250" data-offset-y="100" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid contentSpaceBetween">
- <div style="-webkit-grid-column: 1 / 2; -webkit-grid-row: 1 / 2;"
+ <div style="grid-column: 1 / 2; grid-row: 1 / 2;"
data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid contentSpaceBetween">
- <div class="offsets" style="-webkit-grid-column: 1 / 2; -webkit-grid-row: 1 / 2;"
+ <div class="offsets" style="grid-column: 1 / 2; grid-row: 1 / 2;"
data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid contentSpaceAround">
- <div style="-webkit-grid-column: 1 / 2; -webkit-grid-row: 1 / 2;"
+ <div style="grid-column: 1 / 2; grid-row: 1 / 2;"
data-offset-x="63" data-offset-y="25" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid contentSpaceAround">
- <div class="offsets" style="-webkit-grid-column: 1 / 2; -webkit-grid-row: 1 / 2;"
+ <div class="offsets" style="grid-column: 1 / 2; grid-row: 1 / 2;"
data-offset-x="63" data-offset-y="25" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid contentSpaceEvenly">
- <div style="-webkit-grid-column: 1 / 2; -webkit-grid-row: 1 / 2;"
+ <div style="grid-column: 1 / 2; grid-row: 1 / 2;"
data-offset-x="83" data-offset-y="33" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid contentSpaceEvenly">
- <div class="offsets" style="-webkit-grid-column: 1 / 2; -webkit-grid-row: 1 / 2;"
+ <div class="offsets" style="grid-column: 1 / 2; grid-row: 1 / 2;"
data-offset-x="83" data-offset-y="33" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid contentStart">
- <div style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 2 / 3;"
+ <div style="grid-column: 2 / 3; grid-row: 2 / 3;"
data-offset-x="100" data-offset-y="70" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid contentStart">
- <div class="offsets" style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 2 / 3;"
+ <div class="offsets" style="grid-column: 2 / 3; grid-row: 2 / 3;"
data-offset-x="100" data-offset-y="70" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid contentCenter">
- <div style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 2 / 3;"
+ <div style="grid-column: 2 / 3; grid-row: 2 / 3;"
data-offset-x="225" data-offset-y="120" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid contentCenter">
- <div class="offsets" style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 2 / 3;"
+ <div class="offsets" style="grid-column: 2 / 3; grid-row: 2 / 3;"
data-offset-x="225" data-offset-y="120" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid contentEnd">
- <div style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 2 / 3;"
+ <div style="grid-column: 2 / 3; grid-row: 2 / 3;"
data-offset-x="350" data-offset-y="170" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid contentEnd">
- <div class="offsets" style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 2 / 3;"
+ <div class="offsets" style="grid-column: 2 / 3; grid-row: 2 / 3;"
data-offset-x="350" data-offset-y="170" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid contentSpaceBetween">
- <div style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 2 / 3;"
+ <div style="grid-column: 2 / 3; grid-row: 2 / 3;"
data-offset-x="350" data-offset-y="170" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid contentSpaceBetween">
- <div class="offsets" style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 2 / 3;"
+ <div class="offsets" style="grid-column: 2 / 3; grid-row: 2 / 3;"
data-offset-x="350" data-offset-y="170" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid contentSpaceAround">
- <div style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 2 / 3;"
+ <div style="grid-column: 2 / 3; grid-row: 2 / 3;"
data-offset-x="288" data-offset-y="145" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid contentSpaceAround">
- <div class="offsets" style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 2 / 3;"
+ <div class="offsets" style="grid-column: 2 / 3; grid-row: 2 / 3;"
data-offset-x="288" data-offset-y="145" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid contentSpaceEvenly">
- <div style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 2 / 3;"
+ <div style="grid-column: 2 / 3; grid-row: 2 / 3;"
data-offset-x="267" data-offset-y="137" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid contentSpaceEvenly">
- <div class="offsets" style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 2 / 3;"
+ <div class="offsets" style="grid-column: 2 / 3; grid-row: 2 / 3;"
data-offset-x="267" data-offset-y="137" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid contentStart">
- <div style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid contentStart">
- <div class="offsets" style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div class="offsets" style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid contentCenter">
- <div style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="0" data-offset-y="0" data-expected-width="225" data-expected-height="120">
</div>
</div>
<div class="grid contentCenter">
- <div class="offsets" style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div class="offsets" style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="0" data-offset-y="0" data-expected-width="225" data-expected-height="120">
</div>
</div>
<div class="grid contentEnd">
- <div style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="0" data-offset-y="0" data-expected-width="350" data-expected-height="170">
</div>
</div>
<div class="grid contentEnd">
- <div class="offsets" style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div class="offsets" style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="0" data-offset-y="0" data-expected-width="350" data-expected-height="170">
</div>
</div>
<div class="grid contentSpaceBetween">
- <div style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid contentSpaceBetween">
- <div class="offsets" style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div class="offsets" style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="70">
</div>
</div>
<div class="grid contentSpaceAround">
- <div style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="0" data-offset-y="0" data-expected-width="163" data-expected-height="95">
</div>
</div>
<div class="grid contentSpaceAround">
- <div class="offsets" style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div class="offsets" style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="0" data-offset-y="0" data-expected-width="163" data-expected-height="95">
</div>
</div>
<div class="grid contentSpaceEvenly">
- <div style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="0" data-offset-y="0" data-expected-width="183" data-expected-height="103">
</div>
</div>
<div class="grid contentSpaceEvenly">
- <div class="offsets" style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div class="offsets" style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="0" data-offset-y="0" data-expected-width="183" data-expected-height="103">
</div>
</div>
<div class="grid contentStart">
- <div style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="100" data-offset-y="70" data-expected-width="300" data-expected-height="130">
</div>
</div>
<div class="grid contentStart">
- <div class="offsets" style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div class="offsets" style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="100" data-offset-y="70" data-expected-width="300" data-expected-height="130">
</div>
</div>
<div class="grid contentCenter">
- <div style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="225" data-offset-y="120" data-expected-width="175" data-expected-height="80">
</div>
</div>
<div class="grid contentCenter">
- <div class="offsets" style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div class="offsets" style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="225" data-offset-y="120" data-expected-width="175" data-expected-height="80">
</div>
</div>
<div class="grid contentEnd">
- <div style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="350" data-offset-y="170" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid contentEnd">
- <div class="offsets" style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div class="offsets" style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="350" data-offset-y="170" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid contentSpaceBetween">
- <div style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="350" data-offset-y="170" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid contentSpaceBetween">
- <div class="offsets" style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div class="offsets" style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="350" data-offset-y="170" data-expected-width="50" data-expected-height="30">
</div>
</div>
<div class="grid contentSpaceAround">
- <div style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="288" data-offset-y="145" data-expected-width="113" data-expected-height="55">
</div>
</div>
<div class="grid contentSpaceAround">
- <div class="offsets" style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div class="offsets" style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="288" data-offset-y="145" data-expected-width="113" data-expected-height="55">
</div>
</div>
<div class="grid contentSpaceEvenly">
- <div style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="267" data-offset-y="137" data-expected-width="133" data-expected-height="63">
</div>
</div>
<div class="grid contentSpaceEvenly">
- <div class="offsets" style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div class="offsets" style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="267" data-offset-y="137" data-expected-width="133" data-expected-height="63">
</div>
</div>
<div class="grid contentStart">
- <div style="-webkit-grid-column: auto / auto; -webkit-grid-row: auto / auto;"
+ <div style="grid-column: auto / auto; grid-row: auto / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="400" data-expected-height="200">
</div>
</div>
<div class="grid contentStart">
- <div class="offsets" style="-webkit-grid-column: auto / auto; -webkit-grid-row: auto / auto;"
+ <div class="offsets" style="grid-column: auto / auto; grid-row: auto / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="400" data-expected-height="200">
</div>
</div>
<div class="grid contentCenter">
- <div style="-webkit-grid-column: auto / auto; -webkit-grid-row: auto / auto;"
+ <div style="grid-column: auto / auto; grid-row: auto / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="400" data-expected-height="200">
</div>
</div>
<div class="grid contentCenter">
- <div class="offsets" style="-webkit-grid-column: auto / auto; -webkit-grid-row: auto / auto;"
+ <div class="offsets" style="grid-column: auto / auto; grid-row: auto / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="400" data-expected-height="200">
</div>
</div>
<div class="grid contentEnd">
- <div style="-webkit-grid-column: auto / auto; -webkit-grid-row: auto / auto;"
+ <div style="grid-column: auto / auto; grid-row: auto / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="400" data-expected-height="200">
</div>
</div>
<div class="grid contentEnd">
- <div class="offsets" style="-webkit-grid-column: auto / auto; -webkit-grid-row: auto / auto;"
+ <div class="offsets" style="grid-column: auto / auto; grid-row: auto / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="400" data-expected-height="200">
</div>
</div>
<div class="grid contentSpaceBetween">
- <div style="-webkit-grid-column: auto / auto; -webkit-grid-row: auto / auto;"
+ <div style="grid-column: auto / auto; grid-row: auto / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="400" data-expected-height="200">
</div>
</div>
<div class="grid contentSpaceBetween">
- <div class="offsets" style="-webkit-grid-column: auto / auto; -webkit-grid-row: auto / auto;"
+ <div class="offsets" style="grid-column: auto / auto; grid-row: auto / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="400" data-expected-height="200">
</div>
</div>
<div class="grid contentSpaceAround">
- <div style="-webkit-grid-column: auto / auto; -webkit-grid-row: auto / auto;"
+ <div style="grid-column: auto / auto; grid-row: auto / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="400" data-expected-height="200">
</div>
</div>
<div class="grid contentSpaceAround">
- <div class="offsets" style="-webkit-grid-column: auto / auto; -webkit-grid-row: auto / auto;"
+ <div class="offsets" style="grid-column: auto / auto; grid-row: auto / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="400" data-expected-height="200">
</div>
</div>
<div class="grid contentSpaceEvenly">
- <div style="-webkit-grid-column: auto / auto; -webkit-grid-row: auto / auto;"
+ <div style="grid-column: auto / auto; grid-row: auto / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="400" data-expected-height="200">
</div>
</div>
<div class="grid contentSpaceEvenly">
- <div class="offsets" style="-webkit-grid-column: auto / auto; -webkit-grid-row: auto / auto;"
+ <div class="offsets" style="grid-column: auto / auto; grid-row: auto / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="400" data-expected-height="200">
</div>
</div>
diff --git a/LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps-rtl.html b/LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps-rtl.html
index b4329d6..6922d83 100644
--- a/LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps-rtl.html
+++ b/LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps-rtl.html
@@ -3,9 +3,9 @@
<style>
.grid {
- -webkit-grid-template-columns: 100px 100px 100px 100px;
- -webkit-grid-template-rows: 50px 50px;
- -webkit-grid-gap: 25px 50px;
+ grid-template-columns: 100px 100px 100px 100px;
+ grid-template-rows: 50px 50px;
+ grid-gap: 25px 50px;
width: 800px;
height: 200px;
border: 5px solid black;
@@ -34,265 +34,265 @@
<p>This test checks the behavior of the positioned items in a grid container with gaps in RTL.</p>
<div class="grid directionRTL">
- <div style="-webkit-grid-column: auto / auto; -webkit-grid-row: auto / auto;"
+ <div style="grid-column: auto / auto; grid-row: auto / auto;"
data-offset-x="-15" data-offset-y="15" data-expected-width="830" data-expected-height="230">
</div>
</div>
<div class="grid directionRTL">
- <div class="offsets" style="-webkit-grid-column: auto / auto; -webkit-grid-row: auto / auto;"
+ <div class="offsets" style="grid-column: auto / auto; grid-row: auto / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="830" data-expected-height="230">
</div>
</div>
<div class="grid directionRTL">
- <div style="-webkit-grid-column: 1 / auto; -webkit-grid-row: 1 / auto;"
+ <div style="grid-column: 1 / auto; grid-row: 1 / auto;"
data-offset-x="0" data-offset-y="15" data-expected-width="815" data-expected-height="215">
</div>
</div>
<div class="grid directionRTL">
- <div class="offsets" style="-webkit-grid-column: 1 / auto; -webkit-grid-row: 1 / auto;"
+ <div class="offsets" style="grid-column: 1 / auto; grid-row: 1 / auto;"
data-offset-x="0" data-offset-y="15" data-expected-width="815" data-expected-height="215">
</div>
</div>
<div class="grid directionRTL">
- <div style="-webkit-grid-column: 1 / 2; -webkit-grid-row: 1 / 2;"
+ <div style="grid-column: 1 / 2; grid-row: 1 / 2;"
data-offset-x="715" data-offset-y="15" data-expected-width="100" data-expected-height="50">
</div>
</div>
<div class="grid directionRTL">
- <div class="offsets" style="-webkit-grid-column: 1 / 2; -webkit-grid-row: 1 / 2;"
+ <div class="offsets" style="grid-column: 1 / 2; grid-row: 1 / 2;"
data-offset-x="715" data-offset-y="15" data-expected-width="100" data-expected-height="50">
</div>
</div>
<div class="grid directionRTL">
- <div style="-webkit-grid-column: 1 / 3; -webkit-grid-row: 1 / 3;"
+ <div style="grid-column: 1 / 3; grid-row: 1 / 3;"
data-offset-x="565" data-offset-y="15" data-expected-width="250" data-expected-height="125">
</div>
</div>
<div class="grid directionRTL">
- <div class="offsets" style="-webkit-grid-column: 1 / 3; -webkit-grid-row: 1 / 3;"
+ <div class="offsets" style="grid-column: 1 / 3; grid-row: 1 / 3;"
data-offset-x="565" data-offset-y="15" data-expected-width="250" data-expected-height="125">
</div>
</div>
<div class="grid directionRTL">
- <div style="-webkit-grid-column: 1 / 4; -webkit-grid-row: 1 / 4;"
+ <div style="grid-column: 1 / 4; grid-row: 1 / 4;"
data-offset-x="415" data-offset-y="15" data-expected-width="400" data-expected-height="215">
</div>
</div>
<div class="grid directionRTL">
- <div class="offsets" style="-webkit-grid-column: 1 / 4; -webkit-grid-row: 1 / 4;"
+ <div class="offsets" style="grid-column: 1 / 4; grid-row: 1 / 4;"
data-offset-x="415" data-offset-y="15" data-expected-width="400" data-expected-height="215">
</div>
</div>
<div class="grid directionRTL">
- <div style="-webkit-grid-column: 1 / 5; -webkit-grid-row: 1 / 5;"
+ <div style="grid-column: 1 / 5; grid-row: 1 / 5;"
data-offset-x="265" data-offset-y="15" data-expected-width="550" data-expected-height="215">
</div>
</div>
<div class="grid directionRTL">
- <div class="offsets" style="-webkit-grid-column: 1 / 5; -webkit-grid-row: 1 / 5;"
+ <div class="offsets" style="grid-column: 1 / 5; grid-row: 1 / 5;"
data-offset-x="265" data-offset-y="15" data-expected-width="550" data-expected-height="215">
</div>
</div>
<div class="grid directionRTL">
- <div style="-webkit-grid-column: 1 / 6; -webkit-grid-row: 1 / 6;"
+ <div style="grid-column: 1 / 6; grid-row: 1 / 6;"
data-offset-x="0" data-offset-y="15" data-expected-width="815" data-expected-height="215">
</div>
</div>
<div class="grid directionRTL">
- <div class="offsets" style="-webkit-grid-column: 1 / 6; -webkit-grid-row: 1 / 6;"
+ <div class="offsets" style="grid-column: 1 / 6; grid-row: 1 / 6;"
data-offset-x="0" data-offset-y="15" data-expected-width="815" data-expected-height="215">
</div>
</div>
<div class="grid directionRTL">
- <div style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="0" data-offset-y="90" data-expected-width="665" data-expected-height="140">
</div>
</div>
<div class="grid directionRTL">
- <div class="offsets" style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div class="offsets" style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="0" data-offset-y="90" data-expected-width="665" data-expected-height="140">
</div>
</div>
<div class="grid directionRTL">
- <div style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 2 / 3;"
+ <div style="grid-column: 2 / 3; grid-row: 2 / 3;"
data-offset-x="565" data-offset-y="90" data-expected-width="100" data-expected-height="50">
</div>
</div>
<div class="grid directionRTL">
- <div class="offsets" style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 2 / 3;"
+ <div class="offsets" style="grid-column: 2 / 3; grid-row: 2 / 3;"
data-offset-x="565" data-offset-y="90" data-expected-width="100" data-expected-height="50">
</div>
</div>
<div class="grid directionRTL">
- <div style="-webkit-grid-column: 2 / 4; -webkit-grid-row: 2 / 4;"
+ <div style="grid-column: 2 / 4; grid-row: 2 / 4;"
data-offset-x="415" data-offset-y="90" data-expected-width="250" data-expected-height="140">
</div>
</div>
<div class="grid directionRTL">
- <div class="offsets" style="-webkit-grid-column: 2 / 4; -webkit-grid-row: 2 / 4;"
+ <div class="offsets" style="grid-column: 2 / 4; grid-row: 2 / 4;"
data-offset-x="415" data-offset-y="90" data-expected-width="250" data-expected-height="140">
</div>
</div>
<div class="grid directionRTL">
- <div style="-webkit-grid-column: 2 / 5; -webkit-grid-row: 2 / 5;"
+ <div style="grid-column: 2 / 5; grid-row: 2 / 5;"
data-offset-x="265" data-offset-y="90" data-expected-width="400" data-expected-height="140">
</div>
</div>
<div class="grid directionRTL">
- <div class="offsets" style="-webkit-grid-column: 2 / 5; -webkit-grid-row: 2 / 5;"
+ <div class="offsets" style="grid-column: 2 / 5; grid-row: 2 / 5;"
data-offset-x="265" data-offset-y="90" data-expected-width="400" data-expected-height="140">
</div>
</div>
<div class="grid directionRTL">
- <div style="-webkit-grid-column: 2 / 6; -webkit-grid-row: 2 / 6;"
+ <div style="grid-column: 2 / 6; grid-row: 2 / 6;"
data-offset-x="0" data-offset-y="90" data-expected-width="665" data-expected-height="140">
</div>
</div>
<div class="grid directionRTL">
- <div class="offsets" style="-webkit-grid-column: 2 / 6; -webkit-grid-row: 2 / 6;"
+ <div class="offsets" style="grid-column: 2 / 6; grid-row: 2 / 6;"
data-offset-x="0" data-offset-y="90" data-expected-width="665" data-expected-height="140">
</div>
</div>
<div class="grid directionRTL">
- <div style="-webkit-grid-column: 3 / auto; -webkit-grid-row: 3 / auto;"
+ <div style="grid-column: 3 / auto; grid-row: 3 / auto;"
data-offset-x="0" data-offset-y="140" data-expected-width="515" data-expected-height="90">
</div>
</div>
<div class="grid directionRTL">
- <div class="offsets" style="-webkit-grid-column: 3 / auto; -webkit-grid-row: 3 / auto;"
+ <div class="offsets" style="grid-column: 3 / auto; grid-row: 3 / auto;"
data-offset-x="0" data-offset-y="140" data-expected-width="515" data-expected-height="90">
</div>
</div>
<div class="grid directionRTL">
- <div style="-webkit-grid-column: 4 / auto; -webkit-grid-row: 4 / auto;"
+ <div style="grid-column: 4 / auto; grid-row: 4 / auto;"
data-offset-x="0" data-offset-y="15" data-expected-width="365" data-expected-height="230">
</div>
</div>
<div class="grid directionRTL">
- <div class="offsets" style="-webkit-grid-column: 4 / auto; -webkit-grid-row: 4 / auto;"
+ <div class="offsets" style="grid-column: 4 / auto; grid-row: 4 / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="365" data-expected-height="230">
</div>
</div>
<div class="grid directionRTL">
- <div style="-webkit-grid-column: 5 / auto; -webkit-grid-row: 5 / auto;"
+ <div style="grid-column: 5 / auto; grid-row: 5 / auto;"
data-offset-x="0" data-offset-y="15" data-expected-width="265" data-expected-height="230">
</div>
</div>
<div class="grid directionRTL">
- <div class="offsets" style="-webkit-grid-column: 5 / auto; -webkit-grid-row: 5 / auto;"
+ <div class="offsets" style="grid-column: 5 / auto; grid-row: 5 / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="265" data-expected-height="230">
</div>
</div>
<div class="grid directionRTL">
- <div style="-webkit-grid-column: 6 / auto; -webkit-grid-row: 6 / auto;"
+ <div style="grid-column: 6 / auto; grid-row: 6 / auto;"
data-offset-x="-15" data-offset-y="15" data-expected-width="830" data-expected-height="230">
</div>
</div>
<div class="grid directionRTL">
- <div class="offsets" style="-webkit-grid-column: 6 / auto; -webkit-grid-row: 6 / auto;"
+ <div class="offsets" style="grid-column: 6 / auto; grid-row: 6 / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="830" data-expected-height="230">
</div>
</div>
<div class="grid directionRTL">
- <div style="-webkit-grid-column: auto / 1; -webkit-grid-row: auto / 1;"
+ <div style="grid-column: auto / 1; grid-row: auto / 1;"
data-offset-x="800" data-offset-y="15" data-expected-width="15" data-expected-height="15">
</div>
</div>
<div class="grid directionRTL">
- <div class="offsets" style="-webkit-grid-column: auto / 1; -webkit-grid-row: auto / 1;"
+ <div class="offsets" style="grid-column: auto / 1; grid-row: auto / 1;"
data-offset-x="815" data-offset-y="0" data-expected-width="15" data-expected-height="15">
</div>
</div>
<div class="grid directionRTL">
- <div style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="700" data-offset-y="15" data-expected-width="115" data-expected-height="65">
</div>
</div>
<div class="grid directionRTL">
- <div class="offsets" style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div class="offsets" style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="715" data-offset-y="0" data-expected-width="115" data-expected-height="65">
</div>
</div>
<div class="grid directionRTL">
- <div style="-webkit-grid-column: auto / 3; -webkit-grid-row: auto / 3;"
+ <div style="grid-column: auto / 3; grid-row: auto / 3;"
data-offset-x="550" data-offset-y="15" data-expected-width="265" data-expected-height="140">
</div>
</div>
<div class="grid directionRTL">
- <div class="offsets" style="-webkit-grid-column: auto / 3; -webkit-grid-row: auto / 3;"
+ <div class="offsets" style="grid-column: auto / 3; grid-row: auto / 3;"
data-offset-x="565" data-offset-y="0" data-expected-width="265" data-expected-height="140">
</div>
</div>
<div class="grid directionRTL">
- <div style="-webkit-grid-column: auto / 4; -webkit-grid-row: auto / 4;"
+ <div style="grid-column: auto / 4; grid-row: auto / 4;"
data-offset-x="400" data-offset-y="15" data-expected-width="415" data-expected-height="230">
</div>
</div>
<div class="grid directionRTL">
- <div class="offsets" style="-webkit-grid-column: auto / 4; -webkit-grid-row: auto / 4;"
+ <div class="offsets" style="grid-column: auto / 4; grid-row: auto / 4;"
data-offset-x="415" data-offset-y="0" data-expected-width="415" data-expected-height="230">
</div>
</div>
<div class="grid directionRTL">
- <div style="-webkit-grid-column: auto / 5; -webkit-grid-row: auto / 5;"
+ <div style="grid-column: auto / 5; grid-row: auto / 5;"
data-offset-x="250" data-offset-y="15" data-expected-width="565" data-expected-height="230">
</div>
</div>
<div class="grid directionRTL">
- <div class="offsets" style="-webkit-grid-column: auto / 5; -webkit-grid-row: auto / 5;"
+ <div class="offsets" style="grid-column: auto / 5; grid-row: auto / 5;"
data-offset-x="265" data-offset-y="0" data-expected-width="565" data-expected-height="230">
</div>
</div>
<div class="grid directionRTL">
- <div style="-webkit-grid-column: auto / 6; -webkit-grid-row: auto / 6;"
+ <div style="grid-column: auto / 6; grid-row: auto / 6;"
data-offset-x="-15" data-offset-y="15" data-expected-width="830" data-expected-height="230">
</div>
</div>
<div class="grid directionRTL">
- <div class="offsets" style="-webkit-grid-column: auto / 6; -webkit-grid-row: auto / 6;"
+ <div class="offsets" style="grid-column: auto / 6; grid-row: auto / 6;"
data-offset-x="0" data-offset-y="0" data-expected-width="830" data-expected-height="230">
</div>
</div>
diff --git a/LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps.html b/LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps.html
index 57ee146..89035ea 100644
--- a/LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps.html
+++ b/LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps.html
@@ -3,9 +3,9 @@
<style>
.grid {
- -webkit-grid-template-columns: 100px 100px 100px 100px;
- -webkit-grid-template-rows: 50px 50px;
- -webkit-grid-gap: 25px 50px;
+ grid-template-columns: 100px 100px 100px 100px;
+ grid-template-rows: 50px 50px;
+ grid-gap: 25px 50px;
width: 800px;
height: 200px;
border: 5px solid black;
@@ -34,265 +34,265 @@
<p>This test checks the behavior of the positioned items in a grid container with gaps.</p>
<div class="grid">
- <div style="-webkit-grid-column: auto / auto; -webkit-grid-row: auto / auto;"
+ <div style="grid-column: auto / auto; grid-row: auto / auto;"
data-offset-x="15" data-offset-y="15" data-expected-width="830" data-expected-height="230">
</div>
</div>
<div class="grid">
- <div class="offsets" style="-webkit-grid-column: auto / auto; -webkit-grid-row: auto / auto;"
+ <div class="offsets" style="grid-column: auto / auto; grid-row: auto / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="830" data-expected-height="230">
</div>
</div>
<div class="grid">
- <div style="-webkit-grid-column: 1 / auto; -webkit-grid-row: 1 / auto;"
+ <div style="grid-column: 1 / auto; grid-row: 1 / auto;"
data-offset-x="15" data-offset-y="15" data-expected-width="815" data-expected-height="215">
</div>
</div>
<div class="grid">
- <div class="offsets" style="-webkit-grid-column: 1 / auto; -webkit-grid-row: 1 / auto;"
+ <div class="offsets" style="grid-column: 1 / auto; grid-row: 1 / auto;"
data-offset-x="15" data-offset-y="15" data-expected-width="815" data-expected-height="215">
</div>
</div>
<div class="grid">
- <div style="-webkit-grid-column: 1 / 2; -webkit-grid-row: 1 / 2;"
+ <div style="grid-column: 1 / 2; grid-row: 1 / 2;"
data-offset-x="15" data-offset-y="15" data-expected-width="100" data-expected-height="50">
</div>
</div>
<div class="grid">
- <div class="offsets" style="-webkit-grid-column: 1 / 2; -webkit-grid-row: 1 / 2;"
+ <div class="offsets" style="grid-column: 1 / 2; grid-row: 1 / 2;"
data-offset-x="15" data-offset-y="15" data-expected-width="100" data-expected-height="50">
</div>
</div>
<div class="grid">
- <div style="-webkit-grid-column: 1 / 3; -webkit-grid-row: 1 / 3;"
+ <div style="grid-column: 1 / 3; grid-row: 1 / 3;"
data-offset-x="15" data-offset-y="15" data-expected-width="250" data-expected-height="125">
</div>
</div>
<div class="grid">
- <div class="offsets" style="-webkit-grid-column: 1 / 3; -webkit-grid-row: 1 / 3;"
+ <div class="offsets" style="grid-column: 1 / 3; grid-row: 1 / 3;"
data-offset-x="15" data-offset-y="15" data-expected-width="250" data-expected-height="125">
</div>
</div>
<div class="grid">
- <div style="-webkit-grid-column: 1 / 4; -webkit-grid-row: 1 / 4;"
+ <div style="grid-column: 1 / 4; grid-row: 1 / 4;"
data-offset-x="15" data-offset-y="15" data-expected-width="400" data-expected-height="215">
</div>
</div>
<div class="grid">
- <div class="offsets" style="-webkit-grid-column: 1 / 4; -webkit-grid-row: 1 / 4;"
+ <div class="offsets" style="grid-column: 1 / 4; grid-row: 1 / 4;"
data-offset-x="15" data-offset-y="15" data-expected-width="400" data-expected-height="215">
</div>
</div>
<div class="grid">
- <div style="-webkit-grid-column: 1 / 5; -webkit-grid-row: 1 / 5;"
+ <div style="grid-column: 1 / 5; grid-row: 1 / 5;"
data-offset-x="15" data-offset-y="15" data-expected-width="550" data-expected-height="215">
</div>
</div>
<div class="grid">
- <div class="offsets" style="-webkit-grid-column: 1 / 5; -webkit-grid-row: 1 / 5;"
+ <div class="offsets" style="grid-column: 1 / 5; grid-row: 1 / 5;"
data-offset-x="15" data-offset-y="15" data-expected-width="550" data-expected-height="215">
</div>
</div>
<div class="grid">
- <div style="-webkit-grid-column: 1 / 6; -webkit-grid-row: 1 / 6;"
+ <div style="grid-column: 1 / 6; grid-row: 1 / 6;"
data-offset-x="15" data-offset-y="15" data-expected-width="815" data-expected-height="215">
</div>
</div>
<div class="grid">
- <div class="offsets" style="-webkit-grid-column: 1 / 6; -webkit-grid-row: 1 / 6;"
+ <div class="offsets" style="grid-column: 1 / 6; grid-row: 1 / 6;"
data-offset-x="15" data-offset-y="15" data-expected-width="815" data-expected-height="215">
</div>
</div>
<div class="grid">
- <div style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="165" data-offset-y="90" data-expected-width="665" data-expected-height="140">
</div>
</div>
<div class="grid">
- <div class="offsets" style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div class="offsets" style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="165" data-offset-y="90" data-expected-width="665" data-expected-height="140">
</div>
</div>
<div class="grid">
- <div style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 2 / 3;"
+ <div style="grid-column: 2 / 3; grid-row: 2 / 3;"
data-offset-x="165" data-offset-y="90" data-expected-width="100" data-expected-height="50">
</div>
</div>
<div class="grid">
- <div class="offsets" style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 2 / 3;"
+ <div class="offsets" style="grid-column: 2 / 3; grid-row: 2 / 3;"
data-offset-x="165" data-offset-y="90" data-expected-width="100" data-expected-height="50">
</div>
</div>
<div class="grid">
- <div style="-webkit-grid-column: 2 / 4; -webkit-grid-row: 2 / 4;"
+ <div style="grid-column: 2 / 4; grid-row: 2 / 4;"
data-offset-x="165" data-offset-y="90" data-expected-width="250" data-expected-height="140">
</div>
</div>
<div class="grid">
- <div class="offsets" style="-webkit-grid-column: 2 / 4; -webkit-grid-row: 2 / 4;"
+ <div class="offsets" style="grid-column: 2 / 4; grid-row: 2 / 4;"
data-offset-x="165" data-offset-y="90" data-expected-width="250" data-expected-height="140">
</div>
</div>
<div class="grid">
- <div style="-webkit-grid-column: 2 / 5; -webkit-grid-row: 2 / 5;"
+ <div style="grid-column: 2 / 5; grid-row: 2 / 5;"
data-offset-x="165" data-offset-y="90" data-expected-width="400" data-expected-height="140">
</div>
</div>
<div class="grid">
- <div class="offsets" style="-webkit-grid-column: 2 / 5; -webkit-grid-row: 2 / 5;"
+ <div class="offsets" style="grid-column: 2 / 5; grid-row: 2 / 5;"
data-offset-x="165" data-offset-y="90" data-expected-width="400" data-expected-height="140">
</div>
</div>
<div class="grid">
- <div style="-webkit-grid-column: 2 / 6; -webkit-grid-row: 2 / 6;"
+ <div style="grid-column: 2 / 6; grid-row: 2 / 6;"
data-offset-x="165" data-offset-y="90" data-expected-width="665" data-expected-height="140">
</div>
</div>
<div class="grid">
- <div class="offsets" style="-webkit-grid-column: 2 / 6; -webkit-grid-row: 2 / 6;"
+ <div class="offsets" style="grid-column: 2 / 6; grid-row: 2 / 6;"
data-offset-x="165" data-offset-y="90" data-expected-width="665" data-expected-height="140">
</div>
</div>
<div class="grid">
- <div style="-webkit-grid-column: 3 / auto; -webkit-grid-row: 3 / auto;"
+ <div style="grid-column: 3 / auto; grid-row: 3 / auto;"
data-offset-x="315" data-offset-y="140" data-expected-width="515" data-expected-height="90">
</div>
</div>
<div class="grid">
- <div class="offsets" style="-webkit-grid-column: 3 / auto; -webkit-grid-row: 3 / auto;"
+ <div class="offsets" style="grid-column: 3 / auto; grid-row: 3 / auto;"
data-offset-x="315" data-offset-y="140" data-expected-width="515" data-expected-height="90">
</div>
</div>
<div class="grid">
- <div style="-webkit-grid-column: 4 / auto; -webkit-grid-row: 4 / auto;"
+ <div style="grid-column: 4 / auto; grid-row: 4 / auto;"
data-offset-x="465" data-offset-y="15" data-expected-width="365" data-expected-height="230">
</div>
</div>
<div class="grid">
- <div class="offsets" style="-webkit-grid-column: 4 / auto; -webkit-grid-row: 4 / auto;"
+ <div class="offsets" style="grid-column: 4 / auto; grid-row: 4 / auto;"
data-offset-x="465" data-offset-y="0" data-expected-width="365" data-expected-height="230">
</div>
</div>
<div class="grid">
- <div style="-webkit-grid-column: 5 / auto; -webkit-grid-row: 5 / auto;"
+ <div style="grid-column: 5 / auto; grid-row: 5 / auto;"
data-offset-x="565" data-offset-y="15" data-expected-width="265" data-expected-height="230">
</div>
</div>
<div class="grid">
- <div class="offsets" style="-webkit-grid-column: 5 / auto; -webkit-grid-row: 5 / auto;"
+ <div class="offsets" style="grid-column: 5 / auto; grid-row: 5 / auto;"
data-offset-x="565" data-offset-y="0" data-expected-width="265" data-expected-height="230">
</div>
</div>
<div class="grid">
- <div style="-webkit-grid-column: 6 / auto; -webkit-grid-row: 6 / auto;"
+ <div style="grid-column: 6 / auto; grid-row: 6 / auto;"
data-offset-x="15" data-offset-y="15" data-expected-width="830" data-expected-height="230">
</div>
</div>
<div class="grid">
- <div class="offsets" style="-webkit-grid-column: 6 / auto; -webkit-grid-row: 6 / auto;"
+ <div class="offsets" style="grid-column: 6 / auto; grid-row: 6 / auto;"
data-offset-x="0" data-offset-y="0" data-expected-width="830" data-expected-height="230">
</div>
</div>
<div class="grid">
- <div style="-webkit-grid-column: auto / 1; -webkit-grid-row: auto / 1;"
+ <div style="grid-column: auto / 1; grid-row: auto / 1;"
data-offset-x="15" data-offset-y="15" data-expected-width="15" data-expected-height="15">
</div>
</div>
<div class="grid">
- <div class="offsets" style="-webkit-grid-column: auto / 1; -webkit-grid-row: auto / 1;"
+ <div class="offsets" style="grid-column: auto / 1; grid-row: auto / 1;"
data-offset-x="0" data-offset-y="0" data-expected-width="15" data-expected-height="15">
</div>
</div>
<div class="grid">
- <div style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="15" data-offset-y="15" data-expected-width="115" data-expected-height="65">
</div>
</div>
<div class="grid">
- <div class="offsets" style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div class="offsets" style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="0" data-offset-y="0" data-expected-width="115" data-expected-height="65">
</div>
</div>
<div class="grid">
- <div style="-webkit-grid-column: auto / 3; -webkit-grid-row: auto / 3;"
+ <div style="grid-column: auto / 3; grid-row: auto / 3;"
data-offset-x="15" data-offset-y="15" data-expected-width="265" data-expected-height="140">
</div>
</div>
<div class="grid">
- <div class="offsets" style="-webkit-grid-column: auto / 3; -webkit-grid-row: auto / 3;"
+ <div class="offsets" style="grid-column: auto / 3; grid-row: auto / 3;"
data-offset-x="0" data-offset-y="0" data-expected-width="265" data-expected-height="140">
</div>
</div>
<div class="grid">
- <div style="-webkit-grid-column: auto / 4; -webkit-grid-row: auto / 4;"
+ <div style="grid-column: auto / 4; grid-row: auto / 4;"
data-offset-x="15" data-offset-y="15" data-expected-width="415" data-expected-height="230">
</div>
</div>
<div class="grid">
- <div class="offsets" style="-webkit-grid-column: auto / 4; -webkit-grid-row: auto / 4;"
+ <div class="offsets" style="grid-column: auto / 4; grid-row: auto / 4;"
data-offset-x="0" data-offset-y="0" data-expected-width="415" data-expected-height="230">
</div>
</div>
<div class="grid">
- <div style="-webkit-grid-column: auto / 5; -webkit-grid-row: auto / 5;"
+ <div style="grid-column: auto / 5; grid-row: auto / 5;"
data-offset-x="15" data-offset-y="15" data-expected-width="565" data-expected-height="230">
</div>
</div>
<div class="grid">
- <div class="offsets" style="-webkit-grid-column: auto / 5; -webkit-grid-row: auto / 5;"
+ <div class="offsets" style="grid-column: auto / 5; grid-row: auto / 5;"
data-offset-x="0" data-offset-y="0" data-expected-width="565" data-expected-height="230">
</div>
</div>
<div class="grid">
- <div style="-webkit-grid-column: auto / 6; -webkit-grid-row: auto / 6;"
+ <div style="grid-column: auto / 6; grid-row: auto / 6;"
data-offset-x="15" data-offset-y="15" data-expected-width="830" data-expected-height="230">
</div>
</div>
<div class="grid">
- <div class="offsets" style="-webkit-grid-column: auto / 6; -webkit-grid-row: auto / 6;"
+ <div class="offsets" style="grid-column: auto / 6; grid-row: auto / 6;"
data-offset-x="0" data-offset-y="0" data-expected-width="830" data-expected-height="230">
</div>
</div>
diff --git a/LayoutTests/fast/css-grid-layout/grid-positioned-items-implicit-grid-line.html b/LayoutTests/fast/css-grid-layout/grid-positioned-items-implicit-grid-line.html
index 8299b7f..873e812 100644
--- a/LayoutTests/fast/css-grid-layout/grid-positioned-items-implicit-grid-line.html
+++ b/LayoutTests/fast/css-grid-layout/grid-positioned-items-implicit-grid-line.html
@@ -3,8 +3,8 @@
<style>
.grid {
- -webkit-grid-template-columns: 100px 200px;
- -webkit-grid-template-rows: 50px 150px;
+ grid-template-columns: 100px 200px;
+ grid-template-rows: 50px 150px;
width: 500px;
height: 300px;
border: 5px solid black;
@@ -20,26 +20,26 @@
.startImplicitLine {
background-color: blue;
- -webkit-grid-column: 5;
- -webkit-grid-row: 8;
+ grid-column: 5;
+ grid-row: 8;
}
.endImplicitLine {
background-color: orange;
- -webkit-grid-column: 1 / 5;
- -webkit-grid-row: 1 / 8;
+ grid-column: 1 / 5;
+ grid-row: 1 / 8;
}
.startImplicitLineSpan {
background-color: blue;
- -webkit-grid-column: span 5;
- -webkit-grid-row: span 8;
+ grid-column: span 5;
+ grid-row: span 8;
}
.endImplicitLineSpan {
background-color: orange;
- -webkit-grid-column: 1 / span 5;
- -webkit-grid-row: 1 / span 8;
+ grid-column: 1 / span 5;
+ grid-row: 1 / span 8;
}
</style>
diff --git a/LayoutTests/fast/css-grid-layout/grid-positioned-items-implicit-grid.html b/LayoutTests/fast/css-grid-layout/grid-positioned-items-implicit-grid.html
index b0264ef..f6cfa05 100644
--- a/LayoutTests/fast/css-grid-layout/grid-positioned-items-implicit-grid.html
+++ b/LayoutTests/fast/css-grid-layout/grid-positioned-items-implicit-grid.html
@@ -14,8 +14,8 @@
}
.grid-columns-rows {
- -webkit-grid-template-columns: 100px;
- -webkit-grid-template-rows: 50px;
+ grid-template-columns: 100px;
+ grid-template-rows: 50px;
}
.absolute {
diff --git a/LayoutTests/fast/css-grid-layout/grid-positioned-items-padding.html b/LayoutTests/fast/css-grid-layout/grid-positioned-items-padding.html
index edc6c9f..9b3ba8d 100644
--- a/LayoutTests/fast/css-grid-layout/grid-positioned-items-padding.html
+++ b/LayoutTests/fast/css-grid-layout/grid-positioned-items-padding.html
@@ -3,8 +3,8 @@
<style>
.grid {
- -webkit-grid-template-columns: 100px 200px;
- -webkit-grid-template-rows: 50px 150px;
+ grid-template-columns: 100px 200px;
+ grid-template-rows: 50px 150px;
width: 500px;
height: 300px;
border: 5px solid black;
@@ -30,169 +30,169 @@
<p>This test checks that positioned grid items can be placed directly on the padding.</p>
<div class="grid">
- <div class="absolute" style="-webkit-grid-column: auto / 1; -webkit-grid-row: auto / 1;"
+ <div class="absolute" style="grid-column: auto / 1; grid-row: auto / 1;"
data-offset-x="0" data-offset-y="0" data-expected-width="15" data-expected-height="15">
</div>
- <div class="absolute" style="-webkit-grid-column: 1 / 2; -webkit-grid-row: auto / 1;"
+ <div class="absolute" style="grid-column: 1 / 2; grid-row: auto / 1;"
data-offset-x="15" data-offset-y="0" data-expected-width="100" data-expected-height="15">
</div>
- <div class="absolute" style="-webkit-grid-column: auto / 1; -webkit-grid-row: 1 / 2;"
+ <div class="absolute" style="grid-column: auto / 1; grid-row: 1 / 2;"
data-offset-x="0" data-offset-y="15" data-expected-width="15" data-expected-height="50">
</div>
- <div class="absolute" style="-webkit-grid-column: 3 / auto; -webkit-grid-row: 3 / auto;"
+ <div class="absolute" style="grid-column: 3 / auto; grid-row: 3 / auto;"
data-offset-x="315" data-offset-y="215" data-expected-width="215" data-expected-height="115">
</div>
- <div class="absolute" style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 3 / auto;"
+ <div class="absolute" style="grid-column: 2 / 3; grid-row: 3 / auto;"
data-offset-x="115" data-offset-y="215" data-expected-width="200" data-expected-height="115">
</div>
- <div class="absolute" style="-webkit-grid-column: 3 / auto; -webkit-grid-row: 2 / 3;"
+ <div class="absolute" style="grid-column: 3 / auto; grid-row: 2 / 3;"
data-offset-x="315" data-offset-y="65" data-expected-width="215" data-expected-height="150">
</div>
</div>
<div class="grid">
- <div class="absolute" style="-webkit-grid-column: -5 / 1; -webkit-grid-row: -5 / 1;"
+ <div class="absolute" style="grid-column: -5 / 1; grid-row: -5 / 1;"
data-offset-x="0" data-offset-y="0" data-expected-width="15" data-expected-height="15">
</div>
- <div class="absolute" style="-webkit-grid-column: 1 / 2; -webkit-grid-row: -5 / 1;"
+ <div class="absolute" style="grid-column: 1 / 2; grid-row: -5 / 1;"
data-offset-x="15" data-offset-y="0" data-expected-width="100" data-expected-height="15">
</div>
- <div class="absolute" style="-webkit-grid-column: -5 / 1; -webkit-grid-row: 1 / 2;"
+ <div class="absolute" style="grid-column: -5 / 1; grid-row: 1 / 2;"
data-offset-x="0" data-offset-y="15" data-expected-width="15" data-expected-height="50">
</div>
- <div class="absolute" style="-webkit-grid-column: 3 / 5; -webkit-grid-row: 3 / 5;"
+ <div class="absolute" style="grid-column: 3 / 5; grid-row: 3 / 5;"
data-offset-x="315" data-offset-y="215" data-expected-width="215" data-expected-height="115">
</div>
- <div class="absolute" style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 3 / 5;"
+ <div class="absolute" style="grid-column: 2 / 3; grid-row: 3 / 5;"
data-offset-x="115" data-offset-y="215" data-expected-width="200" data-expected-height="115">
</div>
- <div class="absolute" style="-webkit-grid-column: 3 / 5; -webkit-grid-row: 2 / 3;"
+ <div class="absolute" style="grid-column: 3 / 5; grid-row: 2 / 3;"
data-offset-x="315" data-offset-y="65" data-expected-width="215" data-expected-height="150">
</div>
</div>
<div class="grid">
- <div class="absolute" style="-webkit-grid-column: span 2 / 1; -webkit-grid-row: span 2 / 1;"
+ <div class="absolute" style="grid-column: span 2 / 1; grid-row: span 2 / 1;"
data-offset-x="0" data-offset-y="0" data-expected-width="15" data-expected-height="15">
</div>
- <div class="absolute" style="-webkit-grid-column: 1 / 2; -webkit-grid-row: span 2 / 1;"
+ <div class="absolute" style="grid-column: 1 / 2; grid-row: span 2 / 1;"
data-offset-x="15" data-offset-y="0" data-expected-width="100" data-expected-height="15">
</div>
- <div class="absolute" style="-webkit-grid-column: span 2 / 1; -webkit-grid-row: 1 / 2;"
+ <div class="absolute" style="grid-column: span 2 / 1; grid-row: 1 / 2;"
data-offset-x="0" data-offset-y="15" data-expected-width="15" data-expected-height="50">
</div>
- <div class="absolute" style="-webkit-grid-column: 3 / span 2; -webkit-grid-row: 3 / span 2;"
+ <div class="absolute" style="grid-column: 3 / span 2; grid-row: 3 / span 2;"
data-offset-x="315" data-offset-y="215" data-expected-width="215" data-expected-height="115">
</div>
- <div class="absolute" style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 3 / span 2;"
+ <div class="absolute" style="grid-column: 2 / 3; grid-row: 3 / span 2;"
data-offset-x="115" data-offset-y="215" data-expected-width="200" data-expected-height="115">
</div>
- <div class="absolute" style="-webkit-grid-column: 3 / span 2; -webkit-grid-row: 2 / 3;"
+ <div class="absolute" style="grid-column: 3 / span 2; grid-row: 2 / 3;"
data-offset-x="315" data-offset-y="65" data-expected-width="215" data-expected-height="150">
</div>
</div>
<div class="grid">
- <div class="absolute" style="-webkit-grid-column: foo / 1; -webkit-grid-row: foo / 1;"
+ <div class="absolute" style="grid-column: foo / 1; grid-row: foo / 1;"
data-offset-x="0" data-offset-y="0" data-expected-width="15" data-expected-height="15">
</div>
- <div class="absolute" style="-webkit-grid-column: 1 / 2; -webkit-grid-row: foo / 1;"
+ <div class="absolute" style="grid-column: 1 / 2; grid-row: foo / 1;"
data-offset-x="15" data-offset-y="0" data-expected-width="100" data-expected-height="15">
</div>
- <div class="absolute" style="-webkit-grid-column: foo / 1; -webkit-grid-row: 1 / 2;"
+ <div class="absolute" style="grid-column: foo / 1; grid-row: 1 / 2;"
data-offset-x="0" data-offset-y="15" data-expected-width="15" data-expected-height="50">
</div>
- <div class="absolute" style="-webkit-grid-column: 3 / foo; -webkit-grid-row: 3 / foo;"
+ <div class="absolute" style="grid-column: 3 / foo; grid-row: 3 / foo;"
data-offset-x="315" data-offset-y="215" data-expected-width="215" data-expected-height="115">
</div>
- <div class="absolute" style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 3 / foo;"
+ <div class="absolute" style="grid-column: 2 / 3; grid-row: 3 / foo;"
data-offset-x="115" data-offset-y="215" data-expected-width="200" data-expected-height="115">
</div>
- <div class="absolute" style="-webkit-grid-column: 3 / foo; -webkit-grid-row: 2 / 3;"
+ <div class="absolute" style="grid-column: 3 / foo; grid-row: 2 / 3;"
data-offset-x="315" data-offset-y="65" data-expected-width="215" data-expected-height="150">
</div>
</div>
<div class="grid directionRTL">
- <div class="absolute" style="-webkit-grid-column: auto / 1; -webkit-grid-row: auto / 1;"
+ <div class="absolute" style="grid-column: auto / 1; grid-row: auto / 1;"
data-offset-x="515" data-offset-y="0" data-expected-width="15" data-expected-height="15">
</div>
- <div class="absolute" style="-webkit-grid-column: 1 / 2; -webkit-grid-row: auto / 1;"
+ <div class="absolute" style="grid-column: 1 / 2; grid-row: auto / 1;"
data-offset-x="415" data-offset-y="0" data-expected-width="100" data-expected-height="15">
</div>
- <div class="absolute" style="-webkit-grid-column: auto / 1; -webkit-grid-row: 1 / 2;"
+ <div class="absolute" style="grid-column: auto / 1; grid-row: 1 / 2;"
data-offset-x="515" data-offset-y="15" data-expected-width="15" data-expected-height="50">
</div>
- <div class="absolute" style="-webkit-grid-column: 3 / auto; -webkit-grid-row: 3 / auto;"
+ <div class="absolute" style="grid-column: 3 / auto; grid-row: 3 / auto;"
data-offset-x="0" data-offset-y="215" data-expected-width="215" data-expected-height="115">
</div>
- <div class="absolute" style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 3 / auto;"
+ <div class="absolute" style="grid-column: 2 / 3; grid-row: 3 / auto;"
data-offset-x="215" data-offset-y="215" data-expected-width="200" data-expected-height="115">
</div>
- <div class="absolute" style="-webkit-grid-column: 3 / auto; -webkit-grid-row: 2 / 3;"
+ <div class="absolute" style="grid-column: 3 / auto; grid-row: 2 / 3;"
data-offset-x="0" data-offset-y="65" data-expected-width="215" data-expected-height="150">
</div>
</div>
<div class="grid directionRTL">
- <div class="absolute" style="-webkit-grid-column: -5 / 1; -webkit-grid-row: -5 / 1;"
+ <div class="absolute" style="grid-column: -5 / 1; grid-row: -5 / 1;"
data-offset-x="515" data-offset-y="0" data-expected-width="15" data-expected-height="15">
</div>
- <div class="absolute" style="-webkit-grid-column: 1 / 2; -webkit-grid-row: -5 / 1;"
+ <div class="absolute" style="grid-column: 1 / 2; grid-row: -5 / 1;"
data-offset-x="415" data-offset-y="0" data-expected-width="100" data-expected-height="15">
</div>
- <div class="absolute" style="-webkit-grid-column: -5 / 1; -webkit-grid-row: 1 / 2;"
+ <div class="absolute" style="grid-column: -5 / 1; grid-row: 1 / 2;"
data-offset-x="515" data-offset-y="15" data-expected-width="15" data-expected-height="50">
</div>
- <div class="absolute" style="-webkit-grid-column: 3 / 5; -webkit-grid-row: 3 / 5;"
+ <div class="absolute" style="grid-column: 3 / 5; grid-row: 3 / 5;"
data-offset-x="0" data-offset-y="215" data-expected-width="215" data-expected-height="115">
</div>
- <div class="absolute" style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 3 / 5;"
+ <div class="absolute" style="grid-column: 2 / 3; grid-row: 3 / 5;"
data-offset-x="215" data-offset-y="215" data-expected-width="200" data-expected-height="115">
</div>
- <div class="absolute" style="-webkit-grid-column: 3 / 5; -webkit-grid-row: 2 / 3;"
+ <div class="absolute" style="grid-column: 3 / 5; grid-row: 2 / 3;"
data-offset-x="0" data-offset-y="65" data-expected-width="215" data-expected-height="150">
</div>
</div>
<div class="grid directionRTL">
- <div class="absolute" style="-webkit-grid-column: span 2 / 1; -webkit-grid-row: span 2 / 1;"
+ <div class="absolute" style="grid-column: span 2 / 1; grid-row: span 2 / 1;"
data-offset-x="515" data-offset-y="0" data-expected-width="15" data-expected-height="15">
</div>
- <div class="absolute" style="-webkit-grid-column: 1 / 2; -webkit-grid-row: span 2 / 1;"
+ <div class="absolute" style="grid-column: 1 / 2; grid-row: span 2 / 1;"
data-offset-x="415" data-offset-y="0" data-expected-width="100" data-expected-height="15">
</div>
- <div class="absolute" style="-webkit-grid-column: span 2 / 1; -webkit-grid-row: 1 / 2;"
+ <div class="absolute" style="grid-column: span 2 / 1; grid-row: 1 / 2;"
data-offset-x="515" data-offset-y="15" data-expected-width="15" data-expected-height="50">
</div>
- <div class="absolute" style="-webkit-grid-column: 3 / span 2; -webkit-grid-row: 3 / span 2;"
+ <div class="absolute" style="grid-column: 3 / span 2; grid-row: 3 / span 2;"
data-offset-x="0" data-offset-y="215" data-expected-width="215" data-expected-height="115">
</div>
- <div class="absolute" style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 3 / span 2;"
+ <div class="absolute" style="grid-column: 2 / 3; grid-row: 3 / span 2;"
data-offset-x="215" data-offset-y="215" data-expected-width="200" data-expected-height="115">
</div>
- <div class="absolute" style="-webkit-grid-column: 3 / span 2; -webkit-grid-row: 2 / 3;"
+ <div class="absolute" style="grid-column: 3 / span 2; grid-row: 2 / 3;"
data-offset-x="0" data-offset-y="65" data-expected-width="215" data-expected-height="150">
</div>
</div>
<div class="grid directionRTL">
- <div class="absolute" style="-webkit-grid-column: foo / 1; -webkit-grid-row: foo / 1;"
+ <div class="absolute" style="grid-column: foo / 1; grid-row: foo / 1;"
data-offset-x="515" data-offset-y="0" data-expected-width="15" data-expected-height="15">
</div>
- <div class="absolute" style="-webkit-grid-column: 1 / 2; -webkit-grid-row: foo / 1;"
+ <div class="absolute" style="grid-column: 1 / 2; grid-row: foo / 1;"
data-offset-x="415" data-offset-y="0" data-expected-width="100" data-expected-height="15">
</div>
- <div class="absolute" style="-webkit-grid-column: foo / 1; -webkit-grid-row: 1 / 2;"
+ <div class="absolute" style="grid-column: foo / 1; grid-row: 1 / 2;"
data-offset-x="515" data-offset-y="15" data-expected-width="15" data-expected-height="50">
</div>
- <div class="absolute" style="-webkit-grid-column: 3 / foo; -webkit-grid-row: 3 / foo;"
+ <div class="absolute" style="grid-column: 3 / foo; grid-row: 3 / foo;"
data-offset-x="0" data-offset-y="215" data-expected-width="215" data-expected-height="115">
</div>
- <div class="absolute" style="-webkit-grid-column: 2 / 3; -webkit-grid-row: 3 / foo;"
+ <div class="absolute" style="grid-column: 2 / 3; grid-row: 3 / foo;"
data-offset-x="215" data-offset-y="215" data-expected-width="200" data-expected-height="115">
</div>
- <div class="absolute" style="-webkit-grid-column: 3 / foo; -webkit-grid-row: 2 / 3;"
+ <div class="absolute" style="grid-column: 3 / foo; grid-row: 2 / 3;"
data-offset-x="0" data-offset-y="65" data-expected-width="215" data-expected-height="150">
</div>
</div>
diff --git a/LayoutTests/fast/css-grid-layout/grid-positioned-items-unknown-named-grid-line.html b/LayoutTests/fast/css-grid-layout/grid-positioned-items-unknown-named-grid-line.html
index 17d3cbe..995c3b6 100644
--- a/LayoutTests/fast/css-grid-layout/grid-positioned-items-unknown-named-grid-line.html
+++ b/LayoutTests/fast/css-grid-layout/grid-positioned-items-unknown-named-grid-line.html
@@ -3,8 +3,8 @@
<style>
.grid {
- -webkit-grid-template-columns: 100px 200px;
- -webkit-grid-template-rows: 50px 150px;
+ grid-template-columns: 100px 200px;
+ grid-template-rows: 50px 150px;
width: 500px;
height: 300px;
border: 5px solid black;
@@ -20,20 +20,20 @@
.startUnknownLine {
background-color: blue;
- -webkit-grid-column: foo / 3;
- -webkit-grid-row: bar / 3;
+ grid-column: foo / 3;
+ grid-row: bar / 3;
}
.endUnknownLine {
background-color: orange;
- -webkit-grid-column: 1 / foo;
- -webkit-grid-row: 1 / bar;
+ grid-column: 1 / foo;
+ grid-row: 1 / bar;
}
.startAndEndUnknownLines {
background-color: green;
- -webkit-grid-column: foo / bar;
- -webkit-grid-row: foo / bar;
+ grid-column: foo / bar;
+ grid-row: foo / bar;
}
</style>
diff --git a/LayoutTests/fast/css-grid-layout/grid-positioned-items-within-grid-implicit-track.html b/LayoutTests/fast/css-grid-layout/grid-positioned-items-within-grid-implicit-track.html
index 89d48aa..4458508 100644
--- a/LayoutTests/fast/css-grid-layout/grid-positioned-items-within-grid-implicit-track.html
+++ b/LayoutTests/fast/css-grid-layout/grid-positioned-items-within-grid-implicit-track.html
@@ -3,10 +3,10 @@
<style>
.grid {
- -webkit-grid-template-columns: 200px 300px;
- -webkit-grid-template-rows: 150px 250px;
- -webkit-grid-auto-columns: 100px;
- -webkit-grid-auto-rows: 50px;
+ grid-template-columns: 200px 300px;
+ grid-template-rows: 150px 250px;
+ grid-auto-columns: 100px;
+ grid-auto-rows: 50px;
width: 800px;
height: 600px;
border: 5px solid black;
@@ -27,8 +27,8 @@
.sixRowsAndSixColumns {
background: magenta;
- -webkit-grid-row: -5 / 5;
- -webkit-grid-column: -5 / 5;
+ grid-row: -5 / 5;
+ grid-column: -5 / 5;
}
</style>
@@ -41,7 +41,7 @@
<div class="sixRowsAndSixColumns"
data-offset-x="15" data-offset-y="15" data-expected-width="900" data-expected-height="600">
</div>
- <div class="absolute" style="-webkit-grid-column: auto / 1; -webkit-grid-row: auto / 1;"
+ <div class="absolute" style="grid-column: auto / 1; grid-row: auto / 1;"
data-offset-x="0" data-offset-y="0" data-expected-width="215" data-expected-height="115">
</div>
</div>
@@ -50,7 +50,7 @@
<div class="sixRowsAndSixColumns"
data-offset-x="15" data-offset-y="15" data-expected-width="900" data-expected-height="600">
</div>
- <div class="absolute" style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div class="absolute" style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="0" data-offset-y="0" data-expected-width="415" data-expected-height="265">
</div>
</div>
@@ -59,7 +59,7 @@
<div class="sixRowsAndSixColumns"
data-offset-x="15" data-offset-y="15" data-expected-width="900" data-expected-height="600">
</div>
- <div class="absolute" style="-webkit-grid-column: 3 / auto; -webkit-grid-row: 3 / auto;"
+ <div class="absolute" style="grid-column: 3 / auto; grid-row: 3 / auto;"
data-offset-x="715" data-offset-y="515" data-expected-width="115" data-expected-height="115">
</div>
</div>
@@ -68,7 +68,7 @@
<div class="sixRowsAndSixColumns"
data-offset-x="15" data-offset-y="15" data-expected-width="900" data-expected-height="600">
</div>
- <div class="absolute" style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div class="absolute" style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="415" data-offset-y="265" data-expected-width="415" data-expected-height="365">
</div>
</div>
@@ -77,7 +77,7 @@
<div class="sixRowsAndSixColumns"
data-offset-x="15" data-offset-y="15" data-expected-width="900" data-expected-height="600">
</div>
- <div class="absolute" style="-webkit-grid-column: -4 / 1; -webkit-grid-row: -4 / 1;"
+ <div class="absolute" style="grid-column: -4 / 1; grid-row: -4 / 1;"
data-offset-x="0" data-offset-y="0" data-expected-width="215" data-expected-height="115">
</div>
</div>
@@ -86,7 +86,7 @@
<div class="sixRowsAndSixColumns"
data-offset-x="15" data-offset-y="15" data-expected-width="900" data-expected-height="600">
</div>
- <div class="absolute" style="-webkit-grid-column: -4 / 2; -webkit-grid-row: -4 / 2;"
+ <div class="absolute" style="grid-column: -4 / 2; grid-row: -4 / 2;"
data-offset-x="0" data-offset-y="0" data-expected-width="415" data-expected-height="265">
</div>
</div>
@@ -95,7 +95,7 @@
<div class="sixRowsAndSixColumns"
data-offset-x="15" data-offset-y="15" data-expected-width="900" data-expected-height="600">
</div>
- <div class="absolute" style="-webkit-grid-column: 3 / 4; -webkit-grid-row: 3 / 4;"
+ <div class="absolute" style="grid-column: 3 / 4; grid-row: 3 / 4;"
data-offset-x="715" data-offset-y="515" data-expected-width="115" data-expected-height="115">
</div>
</div>
@@ -104,7 +104,7 @@
<div class="sixRowsAndSixColumns"
data-offset-x="15" data-offset-y="15" data-expected-width="900" data-expected-height="600">
</div>
- <div class="absolute" style="-webkit-grid-column: 2 / 4; -webkit-grid-row: 2 / 4;"
+ <div class="absolute" style="grid-column: 2 / 4; grid-row: 2 / 4;"
data-offset-x="415" data-offset-y="265" data-expected-width="415" data-expected-height="365">
</div>
</div>
@@ -113,7 +113,7 @@
<div class="sixRowsAndSixColumns"
data-offset-x="-85" data-offset-y="15" data-expected-width="900" data-expected-height="600">
</div>
- <div class="absolute" style="-webkit-grid-column: auto / 1; -webkit-grid-row: auto / 1;"
+ <div class="absolute" style="grid-column: auto / 1; grid-row: auto / 1;"
data-offset-x="615" data-offset-y="0" data-expected-width="215" data-expected-height="115">
</div>
</div>
@@ -122,7 +122,7 @@
<div class="sixRowsAndSixColumns"
data-offset-x="-85" data-offset-y="15" data-expected-width="900" data-expected-height="600">
</div>
- <div class="absolute" style="-webkit-grid-column: auto / 2; -webkit-grid-row: auto / 2;"
+ <div class="absolute" style="grid-column: auto / 2; grid-row: auto / 2;"
data-offset-x="415" data-offset-y="0" data-expected-width="415" data-expected-height="265">
</div>
</div>
@@ -131,7 +131,7 @@
<div class="sixRowsAndSixColumns"
data-offset-x="-85" data-offset-y="15" data-expected-width="900" data-expected-height="600">
</div>
- <div class="absolute" style="-webkit-grid-column: 3 / auto; -webkit-grid-row: 3 / auto;"
+ <div class="absolute" style="grid-column: 3 / auto; grid-row: 3 / auto;"
data-offset-x="0" data-offset-y="515" data-expected-width="115" data-expected-height="115">
</div>
</div>
@@ -140,7 +140,7 @@
<div class="sixRowsAndSixColumns"
data-offset-x="-85" data-offset-y="15" data-expected-width="900" data-expected-height="600">
</div>
- <div class="absolute" style="-webkit-grid-column: 2 / auto; -webkit-grid-row: 2 / auto;"
+ <div class="absolute" style="grid-column: 2 / auto; grid-row: 2 / auto;"
data-offset-x="0" data-offset-y="265" data-expected-width="415" data-expected-height="365">
</div>
</div>
@@ -149,7 +149,7 @@
<div class="sixRowsAndSixColumns"
data-offset-x="-85" data-offset-y="15" data-expected-width="900" data-expected-height="600">
</div>
- <div class="absolute" style="-webkit-grid-column: -4 / 1; -webkit-grid-row: -4 / 1;"
+ <div class="absolute" style="grid-column: -4 / 1; grid-row: -4 / 1;"
data-offset-x="615" data-offset-y="0" data-expected-width="215" data-expected-height="115">
</div>
</div>
@@ -158,7 +158,7 @@
<div class="sixRowsAndSixColumns"
data-offset-x="-85" data-offset-y="15" data-expected-width="900" data-expected-height="600">
</div>
- <div class="absolute" style="-webkit-grid-column: -4 / 2; -webkit-grid-row: -4 / 2;"
+ <div class="absolute" style="grid-column: -4 / 2; grid-row: -4 / 2;"
data-offset-x="415" data-offset-y="0" data-expected-width="415" data-expected-height="265">
</div>
</div>
@@ -167,7 +167,7 @@
<div class="sixRowsAndSixColumns"
data-offset-x="-85" data-offset-y="15" data-expected-width="900" data-expected-height="600">
</div>
- <div class="absolute" style="-webkit-grid-column: 3 / 4; -webkit-grid-row: 3 / 4;"
+ <div class="absolute" style="grid-column: 3 / 4; grid-row: 3 / 4;"
data-offset-x="0" data-offset-y="515" data-expected-width="115" data-expected-height="115">
</div>
</div>
@@ -176,7 +176,7 @@
<div class="sixRowsAndSixColumns"
data-offset-x="-85" data-offset-y="15" data-expected-width="900" data-expected-height="600">
</div>
- <div class="absolute" style="-webkit-grid-column: 2 / 4; -webkit-grid-row: 2 / 4;"
+ <div class="absolute" style="grid-column: 2 / 4; grid-row: 2 / 4;"
data-offset-x="0" data-offset-y="265" data-expected-width="415" data-expected-height="365">
</div>
</div>
diff --git a/LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths.html b/LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths.html
index ad16ee3..8fbc02c 100644
--- a/LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths.html
+++ b/LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths.html
@@ -10,33 +10,33 @@
}
.gridMinContentFixed {
- -webkit-grid-template-columns: minmax(-webkit-min-content, 40px) minmax(-webkit-min-content, 40px);
- -webkit-grid-template-rows: 10px;
+ grid-template-columns: minmax(-webkit-min-content, 40px) minmax(-webkit-min-content, 40px);
+ grid-template-rows: 10px;
}
.gridFixedMinContent {
- -webkit-grid-template-columns: minmax(30px, -webkit-min-content) minmax(30px, -webkit-min-content);
- -webkit-grid-template-rows: 10px;
+ grid-template-columns: minmax(30px, -webkit-min-content) minmax(30px, -webkit-min-content);
+ grid-template-rows: 10px;
}
.gridFixedMaxContent {
- -webkit-grid-template-columns: minmax(40px, -webkit-max-content) minmax(40px, -webkit-max-content);
- -webkit-grid-template-rows: 10px;
+ grid-template-columns: minmax(40px, -webkit-max-content) minmax(40px, -webkit-max-content);
+ grid-template-rows: 10px;
}
.gridFixedFixed {
- -webkit-grid-template-columns: minmax(30px, 40px) minmax(30px, 40px);
- -webkit-grid-template-rows: 10px;
+ grid-template-columns: minmax(30px, 40px) minmax(30px, 40px);
+ grid-template-rows: 10px;
}
.gridAutoContent {
- -webkit-grid-template-columns: auto auto;
- -webkit-grid-template-rows: 10px;
+ grid-template-columns: auto auto;
+ grid-template-rows: 10px;
}
.gridFixedFraction {
- -webkit-grid-template-columns: minmax(10px, 1fr) minmax(2fr, 20px);
- -webkit-grid-template-rows: 10px;
+ grid-template-columns: minmax(10px, 1fr) minmax(2fr, 20px);
+ grid-template-rows: 10px;
}
.margins {
diff --git a/LayoutTests/fast/css-grid-layout/grid-repeat-calc-expected.txt b/LayoutTests/fast/css-grid-layout/grid-repeat-calc-expected.txt
index 8c76149..6ff2906 100644
--- a/LayoutTests/fast/css-grid-layout/grid-repeat-calc-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/grid-repeat-calc-expected.txt
@@ -1,12 +1,12 @@
-Tests using calculated value in function() for '-webkit-grid-template-rows' CSS property works.
+Tests using calculated value in function() for 'grid-template-rows' CSS property works.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS testDiv.style['-webkit-grid-template-rows'] is ""
-testDiv.style['-webkit-grid-template-rows'] = 'repeat(calc(1 + 1), 18px)'
-PASS testDiv.style['-webkit-grid-template-rows'] is "18px 18px"
-PASS window.getComputedStyle(testDiv).getPropertyValue('-webkit-grid-template-rows') is "18px 18px"
+PASS testDiv.style['grid-template-rows'] is ""
+testDiv.style['grid-template-rows'] = 'repeat(calc(1 + 1), 18px)'
+PASS testDiv.style['grid-template-rows'] is "18px 18px"
+PASS window.getComputedStyle(testDiv).getPropertyValue('grid-template-rows') is "18px 18px"
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/grid-repeat-calc.html b/LayoutTests/fast/css-grid-layout/grid-repeat-calc.html
index 78cd311..3f9dccf 100644
--- a/LayoutTests/fast/css-grid-layout/grid-repeat-calc.html
+++ b/LayoutTests/fast/css-grid-layout/grid-repeat-calc.html
@@ -3,15 +3,15 @@
<script src="../../resources/js-test-pre.js"></script>
<div id="testDiv" style="width: 400px; height: 400px"></div>
<script>
-description("Tests using calculated value in function() for '-webkit-grid-template-rows' CSS property works.");
+description("Tests using calculated value in function() for 'grid-template-rows' CSS property works.");
var testDiv = document.getElementById("testDiv");
-//-webkit-grid-template-rows: repeat(1, 18px);
-// -webkit-grid-template-columns: repeat(1, 15%);
-shouldBeEmptyString("testDiv.style['-webkit-grid-template-rows']");
-evalAndLog("testDiv.style['-webkit-grid-template-rows'] = 'repeat(calc(1 + 1), 18px)'");
-shouldBeEqualToString("testDiv.style['-webkit-grid-template-rows']", "18px 18px");
-shouldBeEqualToString("window.getComputedStyle(testDiv).getPropertyValue('-webkit-grid-template-rows')", "18px 18px");
+//grid-template-rows: repeat(1, 18px);
+// grid-template-columns: repeat(1, 15%);
+shouldBeEmptyString("testDiv.style['grid-template-rows']");
+evalAndLog("testDiv.style['grid-template-rows'] = 'repeat(calc(1 + 1), 18px)'");
+shouldBeEqualToString("testDiv.style['grid-template-rows']", "18px 18px");
+shouldBeEqualToString("window.getComputedStyle(testDiv).getPropertyValue('grid-template-rows')", "18px 18px");
</script>
<script src="../../resources/js-test-post.js"></script>
diff --git a/LayoutTests/fast/css-grid-layout/grid-shorthand-computed-style-crash.html b/LayoutTests/fast/css-grid-layout/grid-shorthand-computed-style-crash.html
index 37a219c..834a39e 100644
--- a/LayoutTests/fast/css-grid-layout/grid-shorthand-computed-style-crash.html
+++ b/LayoutTests/fast/css-grid-layout/grid-shorthand-computed-style-crash.html
@@ -6,7 +6,7 @@
</script>
<style>
.grid {
- -webkit-grid: 100px / 50px;
+ grid: 100px / 50px;
}
</style>
<p>This test checks that getting computed style of grid shorthand does not crash.</p>
@@ -14,5 +14,5 @@
</div>
<script>
var grid = document.getElementById("grid");
- getComputedStyle(grid).webkitGrid;
+ getComputedStyle(grid).grid;
</script>
diff --git a/LayoutTests/fast/css-grid-layout/grid-shorthand-get-set-expected.txt b/LayoutTests/fast/css-grid-layout/grid-shorthand-get-set-expected.txt
index c318da8..efc1f67 100644
--- a/LayoutTests/fast/css-grid-layout/grid-shorthand-get-set-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/grid-shorthand-get-set-expected.txt
@@ -4,266 +4,266 @@
Test getting the longhand values when shorthand is set through CSS.
-PASS window.getComputedStyle(gridWithDense, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithDense, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithDense, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithDense, '').getPropertyValue('-webkit-grid-auto-flow') is "row dense"
-PASS window.getComputedStyle(gridWithDense, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
-PASS window.getComputedStyle(gridWithDense, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
-PASS window.getComputedStyle(gridWithTemplate, '').getPropertyValue('-webkit-grid-template-columns') is "15px"
-PASS window.getComputedStyle(gridWithTemplate, '').getPropertyValue('-webkit-grid-template-rows') is "10px"
-PASS window.getComputedStyle(gridWithTemplate, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithTemplate, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
-PASS window.getComputedStyle(gridWithTemplate, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
-PASS window.getComputedStyle(gridWithTemplate, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
-PASS window.getComputedStyle(gridWithTemplate1, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithTemplate1, '').getPropertyValue('-webkit-grid-template-rows') is "10px"
-PASS window.getComputedStyle(gridWithTemplate1, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithTemplate1, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
-PASS window.getComputedStyle(gridWithTemplate1, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
-PASS window.getComputedStyle(gridWithTemplate1, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
-PASS window.getComputedStyle(gridWithTemplateNone, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithTemplateNone, '').getPropertyValue('-webkit-grid-template-rows') is "10px"
-PASS window.getComputedStyle(gridWithTemplateNone, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithTemplateNone, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
-PASS window.getComputedStyle(gridWithTemplateNone, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
-PASS window.getComputedStyle(gridWithTemplateNone, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
-PASS window.getComputedStyle(gridWithAutoFlowDenseAndRowsAndColumns, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowDenseAndRowsAndColumns, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowDenseAndRowsAndColumns, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowDenseAndRowsAndColumns, '').getPropertyValue('-webkit-grid-auto-flow') is "row dense"
-PASS window.getComputedStyle(gridWithAutoFlowDenseAndRowsAndColumns, '').getPropertyValue('-webkit-grid-auto-columns') is "20px"
-PASS window.getComputedStyle(gridWithAutoFlowDenseAndRowsAndColumns, '').getPropertyValue('-webkit-grid-auto-rows') is "10px"
-PASS window.getComputedStyle(gridWithAutoFlowAndRows, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowAndRows, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowAndRows, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowAndRows, '').getPropertyValue('-webkit-grid-auto-flow') is "column"
-PASS window.getComputedStyle(gridWithAutoFlowAndRows, '').getPropertyValue('-webkit-grid-auto-columns') is "10px"
-PASS window.getComputedStyle(gridWithAutoFlowAndRows, '').getPropertyValue('-webkit-grid-auto-rows') is "10px"
-PASS window.getComputedStyle(gridWithAutoFlowDense, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowDense, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowDense, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowDense, '').getPropertyValue('-webkit-grid-auto-flow') is "row dense"
-PASS window.getComputedStyle(gridWithAutoFlowDense, '').getPropertyValue('-webkit-grid-auto-columns') is "10px"
-PASS window.getComputedStyle(gridWithAutoFlowDense, '').getPropertyValue('-webkit-grid-auto-rows') is "10px"
-PASS window.getComputedStyle(gridWithAutoFlowColumnDense, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowColumnDense, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowColumnDense, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowColumnDense, '').getPropertyValue('-webkit-grid-auto-flow') is "column dense"
-PASS window.getComputedStyle(gridWithAutoFlowColumnDense, '').getPropertyValue('-webkit-grid-auto-columns') is "10px"
-PASS window.getComputedStyle(gridWithAutoFlowColumnDense, '').getPropertyValue('-webkit-grid-auto-rows') is "10px"
-PASS window.getComputedStyle(gridWithAutoFlowDenseRow, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowDenseRow, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowDenseRow, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowDenseRow, '').getPropertyValue('-webkit-grid-auto-flow') is "row dense"
-PASS window.getComputedStyle(gridWithAutoFlowDenseRow, '').getPropertyValue('-webkit-grid-auto-columns') is "10px"
-PASS window.getComputedStyle(gridWithAutoFlowDenseRow, '').getPropertyValue('-webkit-grid-auto-rows') is "10px"
-PASS window.getComputedStyle(gridWithAutoFlowAndRowsAndColumns, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowAndRowsAndColumns, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowAndRowsAndColumns, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowAndRowsAndColumns, '').getPropertyValue('-webkit-grid-auto-flow') is "column"
-PASS window.getComputedStyle(gridWithAutoFlowAndRowsAndColumns, '').getPropertyValue('-webkit-grid-auto-columns') is "20px"
-PASS window.getComputedStyle(gridWithAutoFlowAndRowsAndColumns, '').getPropertyValue('-webkit-grid-auto-rows') is "10px"
+PASS window.getComputedStyle(gridWithDense, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithDense, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithDense, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithDense, '').getPropertyValue('grid-auto-flow') is "row dense"
+PASS window.getComputedStyle(gridWithDense, '').getPropertyValue('grid-auto-columns') is "auto"
+PASS window.getComputedStyle(gridWithDense, '').getPropertyValue('grid-auto-rows') is "auto"
+PASS window.getComputedStyle(gridWithTemplate, '').getPropertyValue('grid-template-columns') is "15px"
+PASS window.getComputedStyle(gridWithTemplate, '').getPropertyValue('grid-template-rows') is "10px"
+PASS window.getComputedStyle(gridWithTemplate, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithTemplate, '').getPropertyValue('grid-auto-flow') is "row"
+PASS window.getComputedStyle(gridWithTemplate, '').getPropertyValue('grid-auto-columns') is "auto"
+PASS window.getComputedStyle(gridWithTemplate, '').getPropertyValue('grid-auto-rows') is "auto"
+PASS window.getComputedStyle(gridWithTemplate1, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithTemplate1, '').getPropertyValue('grid-template-rows') is "10px"
+PASS window.getComputedStyle(gridWithTemplate1, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithTemplate1, '').getPropertyValue('grid-auto-flow') is "row"
+PASS window.getComputedStyle(gridWithTemplate1, '').getPropertyValue('grid-auto-columns') is "auto"
+PASS window.getComputedStyle(gridWithTemplate1, '').getPropertyValue('grid-auto-rows') is "auto"
+PASS window.getComputedStyle(gridWithTemplateNone, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithTemplateNone, '').getPropertyValue('grid-template-rows') is "10px"
+PASS window.getComputedStyle(gridWithTemplateNone, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithTemplateNone, '').getPropertyValue('grid-auto-flow') is "row"
+PASS window.getComputedStyle(gridWithTemplateNone, '').getPropertyValue('grid-auto-columns') is "auto"
+PASS window.getComputedStyle(gridWithTemplateNone, '').getPropertyValue('grid-auto-rows') is "auto"
+PASS window.getComputedStyle(gridWithAutoFlowDenseAndRowsAndColumns, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowDenseAndRowsAndColumns, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowDenseAndRowsAndColumns, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowDenseAndRowsAndColumns, '').getPropertyValue('grid-auto-flow') is "row dense"
+PASS window.getComputedStyle(gridWithAutoFlowDenseAndRowsAndColumns, '').getPropertyValue('grid-auto-columns') is "20px"
+PASS window.getComputedStyle(gridWithAutoFlowDenseAndRowsAndColumns, '').getPropertyValue('grid-auto-rows') is "10px"
+PASS window.getComputedStyle(gridWithAutoFlowAndRows, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowAndRows, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowAndRows, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowAndRows, '').getPropertyValue('grid-auto-flow') is "column"
+PASS window.getComputedStyle(gridWithAutoFlowAndRows, '').getPropertyValue('grid-auto-columns') is "10px"
+PASS window.getComputedStyle(gridWithAutoFlowAndRows, '').getPropertyValue('grid-auto-rows') is "10px"
+PASS window.getComputedStyle(gridWithAutoFlowDense, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowDense, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowDense, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowDense, '').getPropertyValue('grid-auto-flow') is "row dense"
+PASS window.getComputedStyle(gridWithAutoFlowDense, '').getPropertyValue('grid-auto-columns') is "10px"
+PASS window.getComputedStyle(gridWithAutoFlowDense, '').getPropertyValue('grid-auto-rows') is "10px"
+PASS window.getComputedStyle(gridWithAutoFlowColumnDense, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowColumnDense, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowColumnDense, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowColumnDense, '').getPropertyValue('grid-auto-flow') is "column dense"
+PASS window.getComputedStyle(gridWithAutoFlowColumnDense, '').getPropertyValue('grid-auto-columns') is "10px"
+PASS window.getComputedStyle(gridWithAutoFlowColumnDense, '').getPropertyValue('grid-auto-rows') is "10px"
+PASS window.getComputedStyle(gridWithAutoFlowDenseRow, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowDenseRow, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowDenseRow, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowDenseRow, '').getPropertyValue('grid-auto-flow') is "row dense"
+PASS window.getComputedStyle(gridWithAutoFlowDenseRow, '').getPropertyValue('grid-auto-columns') is "10px"
+PASS window.getComputedStyle(gridWithAutoFlowDenseRow, '').getPropertyValue('grid-auto-rows') is "10px"
+PASS window.getComputedStyle(gridWithAutoFlowAndRowsAndColumns, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowAndRowsAndColumns, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowAndRowsAndColumns, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowAndRowsAndColumns, '').getPropertyValue('grid-auto-flow') is "column"
+PASS window.getComputedStyle(gridWithAutoFlowAndRowsAndColumns, '').getPropertyValue('grid-auto-columns') is "20px"
+PASS window.getComputedStyle(gridWithAutoFlowAndRowsAndColumns, '').getPropertyValue('grid-auto-rows') is "10px"
Test setting wrong values for 'grid' shorthand through CSS (they should resolve to the default: 'row')
-PASS window.getComputedStyle(gridWithNone, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithNone, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithNone, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithNone, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
-PASS window.getComputedStyle(gridWithNone, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
-PASS window.getComputedStyle(gridWithNone, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
-PASS window.getComputedStyle(gridWithAutoFlowNoneAndRowsAndColumns, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowNoneAndRowsAndColumns, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowNoneAndRowsAndColumns, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowNoneAndRowsAndColumns, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
-PASS window.getComputedStyle(gridWithAutoFlowNoneAndRowsAndColumns, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
-PASS window.getComputedStyle(gridWithAutoFlowNoneAndRowsAndColumns, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
-PASS window.getComputedStyle(gridWithAutoFlowNone, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowNone, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowNone, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowNone, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
-PASS window.getComputedStyle(gridWithAutoFlowNone, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
-PASS window.getComputedStyle(gridWithAutoFlowNone, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
-PASS window.getComputedStyle(gridWithExplicitAndImplicit, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithExplicitAndImplicit, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithExplicitAndImplicit, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithExplicitAndImplicit, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
-PASS window.getComputedStyle(gridWithExplicitAndImplicit, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
-PASS window.getComputedStyle(gridWithExplicitAndImplicit, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
-PASS window.getComputedStyle(gridWithMisplacedNone1, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithMisplacedNone1, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithMisplacedNone1, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithMisplacedNone1, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
-PASS window.getComputedStyle(gridWithMisplacedNone1, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
-PASS window.getComputedStyle(gridWithMisplacedNone1, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
-PASS window.getComputedStyle(gridWithMisplacedNone2, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithMisplacedNone2, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithMisplacedNone2, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithMisplacedNone2, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
-PASS window.getComputedStyle(gridWithMisplacedNone2, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
-PASS window.getComputedStyle(gridWithMisplacedNone2, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
-PASS window.getComputedStyle(gridWithMisplacedDense, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithMisplacedDense, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithMisplacedDense, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithMisplacedDense, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
-PASS window.getComputedStyle(gridWithMisplacedDense, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
-PASS window.getComputedStyle(gridWithMisplacedDense, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
-PASS window.getComputedStyle(gridWithWrongSlash1, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithWrongSlash1, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithWrongSlash1, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithWrongSlash1, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
-PASS window.getComputedStyle(gridWithWrongSlash1, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
-PASS window.getComputedStyle(gridWithWrongSlash1, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
-PASS window.getComputedStyle(gridWithWrongSlash2, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithWrongSlash2, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithWrongSlash2, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithWrongSlash2, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
-PASS window.getComputedStyle(gridWithWrongSlash2, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
-PASS window.getComputedStyle(gridWithWrongSlash2, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
-PASS window.getComputedStyle(gridWithWrongSlash3, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithWrongSlash3, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithWrongSlash3, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithWrongSlash3, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
-PASS window.getComputedStyle(gridWithWrongSlash3, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
-PASS window.getComputedStyle(gridWithWrongSlash3, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
-PASS window.getComputedStyle(gridWithAutoFlowRowAndColumn, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowRowAndColumn, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowRowAndColumn, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowRowAndColumn, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
-PASS window.getComputedStyle(gridWithAutoFlowRowAndColumn, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
-PASS window.getComputedStyle(gridWithAutoFlowRowAndColumn, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
-PASS window.getComputedStyle(gridWithoutAutoFlowAndExtraBreath, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithoutAutoFlowAndExtraBreath, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithoutAutoFlowAndExtraBreath, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithoutAutoFlowAndExtraBreath, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
-PASS window.getComputedStyle(gridWithoutAutoFlowAndExtraBreath, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
-PASS window.getComputedStyle(gridWithoutAutoFlowAndExtraBreath, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
-PASS window.getComputedStyle(gridWithAutoFlowString1, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowString1, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowString1, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowString1, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
-PASS window.getComputedStyle(gridWithAutoFlowString1, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
-PASS window.getComputedStyle(gridWithAutoFlowString1, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
-PASS window.getComputedStyle(gridWithAutoFlowString2, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowString2, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowString2, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowString2, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
-PASS window.getComputedStyle(gridWithAutoFlowString2, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
-PASS window.getComputedStyle(gridWithAutoFlowString2, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
-PASS window.getComputedStyle(gridWithAutoFlowString3, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowString3, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowString3, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowString3, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
-PASS window.getComputedStyle(gridWithAutoFlowString3, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
-PASS window.getComputedStyle(gridWithAutoFlowString3, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
-PASS window.getComputedStyle(gridWithTemplateAndAutoFlow, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithTemplateAndAutoFlow, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithTemplateAndAutoFlow, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithTemplateAndAutoFlow, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
-PASS window.getComputedStyle(gridWithTemplateAndAutoFlow, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
-PASS window.getComputedStyle(gridWithTemplateAndAutoFlow, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
-PASS window.getComputedStyle(gridWithTemplateAndMisplacedString1, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithTemplateAndMisplacedString1, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithTemplateAndMisplacedString1, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithTemplateAndMisplacedString1, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
-PASS window.getComputedStyle(gridWithTemplateAndMisplacedString1, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
-PASS window.getComputedStyle(gridWithTemplateAndMisplacedString1, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
+PASS window.getComputedStyle(gridWithNone, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithNone, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithNone, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithNone, '').getPropertyValue('grid-auto-flow') is "row"
+PASS window.getComputedStyle(gridWithNone, '').getPropertyValue('grid-auto-columns') is "auto"
+PASS window.getComputedStyle(gridWithNone, '').getPropertyValue('grid-auto-rows') is "auto"
+PASS window.getComputedStyle(gridWithAutoFlowNoneAndRowsAndColumns, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowNoneAndRowsAndColumns, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowNoneAndRowsAndColumns, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowNoneAndRowsAndColumns, '').getPropertyValue('grid-auto-flow') is "row"
+PASS window.getComputedStyle(gridWithAutoFlowNoneAndRowsAndColumns, '').getPropertyValue('grid-auto-columns') is "auto"
+PASS window.getComputedStyle(gridWithAutoFlowNoneAndRowsAndColumns, '').getPropertyValue('grid-auto-rows') is "auto"
+PASS window.getComputedStyle(gridWithAutoFlowNone, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowNone, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowNone, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowNone, '').getPropertyValue('grid-auto-flow') is "row"
+PASS window.getComputedStyle(gridWithAutoFlowNone, '').getPropertyValue('grid-auto-columns') is "auto"
+PASS window.getComputedStyle(gridWithAutoFlowNone, '').getPropertyValue('grid-auto-rows') is "auto"
+PASS window.getComputedStyle(gridWithExplicitAndImplicit, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithExplicitAndImplicit, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithExplicitAndImplicit, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithExplicitAndImplicit, '').getPropertyValue('grid-auto-flow') is "row"
+PASS window.getComputedStyle(gridWithExplicitAndImplicit, '').getPropertyValue('grid-auto-columns') is "auto"
+PASS window.getComputedStyle(gridWithExplicitAndImplicit, '').getPropertyValue('grid-auto-rows') is "auto"
+PASS window.getComputedStyle(gridWithMisplacedNone1, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithMisplacedNone1, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithMisplacedNone1, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithMisplacedNone1, '').getPropertyValue('grid-auto-flow') is "row"
+PASS window.getComputedStyle(gridWithMisplacedNone1, '').getPropertyValue('grid-auto-columns') is "auto"
+PASS window.getComputedStyle(gridWithMisplacedNone1, '').getPropertyValue('grid-auto-rows') is "auto"
+PASS window.getComputedStyle(gridWithMisplacedNone2, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithMisplacedNone2, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithMisplacedNone2, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithMisplacedNone2, '').getPropertyValue('grid-auto-flow') is "row"
+PASS window.getComputedStyle(gridWithMisplacedNone2, '').getPropertyValue('grid-auto-columns') is "auto"
+PASS window.getComputedStyle(gridWithMisplacedNone2, '').getPropertyValue('grid-auto-rows') is "auto"
+PASS window.getComputedStyle(gridWithMisplacedDense, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithMisplacedDense, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithMisplacedDense, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithMisplacedDense, '').getPropertyValue('grid-auto-flow') is "row"
+PASS window.getComputedStyle(gridWithMisplacedDense, '').getPropertyValue('grid-auto-columns') is "auto"
+PASS window.getComputedStyle(gridWithMisplacedDense, '').getPropertyValue('grid-auto-rows') is "auto"
+PASS window.getComputedStyle(gridWithWrongSlash1, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithWrongSlash1, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithWrongSlash1, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithWrongSlash1, '').getPropertyValue('grid-auto-flow') is "row"
+PASS window.getComputedStyle(gridWithWrongSlash1, '').getPropertyValue('grid-auto-columns') is "auto"
+PASS window.getComputedStyle(gridWithWrongSlash1, '').getPropertyValue('grid-auto-rows') is "auto"
+PASS window.getComputedStyle(gridWithWrongSlash2, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithWrongSlash2, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithWrongSlash2, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithWrongSlash2, '').getPropertyValue('grid-auto-flow') is "row"
+PASS window.getComputedStyle(gridWithWrongSlash2, '').getPropertyValue('grid-auto-columns') is "auto"
+PASS window.getComputedStyle(gridWithWrongSlash2, '').getPropertyValue('grid-auto-rows') is "auto"
+PASS window.getComputedStyle(gridWithWrongSlash3, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithWrongSlash3, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithWrongSlash3, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithWrongSlash3, '').getPropertyValue('grid-auto-flow') is "row"
+PASS window.getComputedStyle(gridWithWrongSlash3, '').getPropertyValue('grid-auto-columns') is "auto"
+PASS window.getComputedStyle(gridWithWrongSlash3, '').getPropertyValue('grid-auto-rows') is "auto"
+PASS window.getComputedStyle(gridWithAutoFlowRowAndColumn, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowRowAndColumn, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowRowAndColumn, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowRowAndColumn, '').getPropertyValue('grid-auto-flow') is "row"
+PASS window.getComputedStyle(gridWithAutoFlowRowAndColumn, '').getPropertyValue('grid-auto-columns') is "auto"
+PASS window.getComputedStyle(gridWithAutoFlowRowAndColumn, '').getPropertyValue('grid-auto-rows') is "auto"
+PASS window.getComputedStyle(gridWithoutAutoFlowAndExtraBreath, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithoutAutoFlowAndExtraBreath, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithoutAutoFlowAndExtraBreath, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithoutAutoFlowAndExtraBreath, '').getPropertyValue('grid-auto-flow') is "row"
+PASS window.getComputedStyle(gridWithoutAutoFlowAndExtraBreath, '').getPropertyValue('grid-auto-columns') is "auto"
+PASS window.getComputedStyle(gridWithoutAutoFlowAndExtraBreath, '').getPropertyValue('grid-auto-rows') is "auto"
+PASS window.getComputedStyle(gridWithAutoFlowString1, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowString1, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowString1, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowString1, '').getPropertyValue('grid-auto-flow') is "row"
+PASS window.getComputedStyle(gridWithAutoFlowString1, '').getPropertyValue('grid-auto-columns') is "auto"
+PASS window.getComputedStyle(gridWithAutoFlowString1, '').getPropertyValue('grid-auto-rows') is "auto"
+PASS window.getComputedStyle(gridWithAutoFlowString2, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowString2, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowString2, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowString2, '').getPropertyValue('grid-auto-flow') is "row"
+PASS window.getComputedStyle(gridWithAutoFlowString2, '').getPropertyValue('grid-auto-columns') is "auto"
+PASS window.getComputedStyle(gridWithAutoFlowString2, '').getPropertyValue('grid-auto-rows') is "auto"
+PASS window.getComputedStyle(gridWithAutoFlowString3, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowString3, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowString3, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowString3, '').getPropertyValue('grid-auto-flow') is "row"
+PASS window.getComputedStyle(gridWithAutoFlowString3, '').getPropertyValue('grid-auto-columns') is "auto"
+PASS window.getComputedStyle(gridWithAutoFlowString3, '').getPropertyValue('grid-auto-rows') is "auto"
+PASS window.getComputedStyle(gridWithTemplateAndAutoFlow, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithTemplateAndAutoFlow, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithTemplateAndAutoFlow, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithTemplateAndAutoFlow, '').getPropertyValue('grid-auto-flow') is "row"
+PASS window.getComputedStyle(gridWithTemplateAndAutoFlow, '').getPropertyValue('grid-auto-columns') is "auto"
+PASS window.getComputedStyle(gridWithTemplateAndAutoFlow, '').getPropertyValue('grid-auto-rows') is "auto"
+PASS window.getComputedStyle(gridWithTemplateAndMisplacedString1, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithTemplateAndMisplacedString1, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithTemplateAndMisplacedString1, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithTemplateAndMisplacedString1, '').getPropertyValue('grid-auto-flow') is "row"
+PASS window.getComputedStyle(gridWithTemplateAndMisplacedString1, '').getPropertyValue('grid-auto-columns') is "auto"
+PASS window.getComputedStyle(gridWithTemplateAndMisplacedString1, '').getPropertyValue('grid-auto-rows') is "auto"
Test getting and setting 'grid' shorthand through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "10px"
-PASS element.style.webkitGridTemplateColumns is "10px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "20px"
-PASS element.style.webkitGridTemplateRows is "20px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS element.style.webkitGridTemplateAreas is "none"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
-PASS element.style.webkitGridAutoFlow is "initial"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
-PASS element.style.webkitGridAutoColumns is "initial"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
-PASS element.style.webkitGridAutoRows is "initial"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "10px"
-PASS element.style.webkitGridTemplateColumns is "10px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "[line] 20px"
-PASS element.style.webkitGridTemplateRows is "[line] 20px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-areas') is "\"a\""
-PASS element.style.webkitGridTemplateAreas is "\"a\""
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
-PASS element.style.webkitGridAutoFlow is "initial"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
-PASS element.style.webkitGridAutoColumns is "initial"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
-PASS element.style.webkitGridAutoRows is "initial"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS element.style.webkitGridTemplateColumns is "initial"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS element.style.webkitGridTemplateRows is "initial"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS element.style.webkitGridTemplateAreas is "initial"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is "row dense"
-PASS element.style.webkitGridAutoFlow is "row dense"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns') is "20px"
-PASS element.style.webkitGridAutoColumns is "20px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows') is "20px"
-PASS element.style.webkitGridAutoRows is "20px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS element.style.webkitGridTemplateColumns is "initial"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS element.style.webkitGridTemplateRows is "initial"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS element.style.webkitGridTemplateAreas is "initial"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is "column"
-PASS element.style.webkitGridAutoFlow is "column"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns') is "10px"
-PASS element.style.webkitGridAutoColumns is "10px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows') is "20px"
-PASS element.style.webkitGridAutoRows is "20px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "10px"
+PASS element.style.gridTemplateColumns is "10px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "20px"
+PASS element.style.gridTemplateRows is "20px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-areas') is "none"
+PASS element.style.gridTemplateAreas is "none"
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is "row"
+PASS element.style.gridAutoFlow is "initial"
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is "auto"
+PASS element.style.gridAutoColumns is "initial"
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is "auto"
+PASS element.style.gridAutoRows is "initial"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "10px"
+PASS element.style.gridTemplateColumns is "10px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "[line] 20px"
+PASS element.style.gridTemplateRows is "[line] 20px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-areas') is "\"a\""
+PASS element.style.gridTemplateAreas is "\"a\""
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is "row"
+PASS element.style.gridAutoFlow is "initial"
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is "auto"
+PASS element.style.gridAutoColumns is "initial"
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is "auto"
+PASS element.style.gridAutoRows is "initial"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS element.style.gridTemplateColumns is "initial"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS element.style.gridTemplateRows is "initial"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-areas') is "none"
+PASS element.style.gridTemplateAreas is "initial"
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is "row dense"
+PASS element.style.gridAutoFlow is "row dense"
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is "20px"
+PASS element.style.gridAutoColumns is "20px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is "20px"
+PASS element.style.gridAutoRows is "20px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS element.style.gridTemplateColumns is "initial"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS element.style.gridTemplateRows is "initial"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-areas') is "none"
+PASS element.style.gridTemplateAreas is "initial"
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is "column"
+PASS element.style.gridAutoFlow is "column"
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is "10px"
+PASS element.style.gridAutoColumns is "10px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is "20px"
+PASS element.style.gridAutoRows is "20px"
Test the initial value
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is 'none'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is 'none'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-areas') is 'none'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns') is 'auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows') is 'auto'
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is "row"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is "auto"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is "auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-areas') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is 'row'
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is 'auto'
Test setting grid-template-columns and grid-template-rows back to 'none' through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS element.style.webkitGridTemplateColumns is "initial"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS element.style.webkitGridTemplateRows is "initial"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS element.style.webkitGridTemplateAreas is "initial"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is "column"
-PASS element.style.webkitGridAutoFlow is "column"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns') is "20px"
-PASS element.style.webkitGridAutoColumns is "20px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows') is "10px"
-PASS element.style.webkitGridAutoRows is "10px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS element.style.webkitGridTemplateColumns is "none"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS element.style.webkitGridTemplateRows is "none"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS element.style.webkitGridTemplateAreas is "none"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
-PASS element.style.webkitGridAutoFlow is "initial"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
-PASS element.style.webkitGridAutoColumns is "initial"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
-PASS element.style.webkitGridAutoRows is "initial"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS element.style.gridTemplateColumns is "initial"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS element.style.gridTemplateRows is "initial"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-areas') is "none"
+PASS element.style.gridTemplateAreas is "initial"
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is "column"
+PASS element.style.gridAutoFlow is "column"
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is "20px"
+PASS element.style.gridAutoColumns is "20px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is "10px"
+PASS element.style.gridAutoRows is "10px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS element.style.gridTemplateColumns is "none"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS element.style.gridTemplateRows is "none"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-areas') is "none"
+PASS element.style.gridTemplateAreas is "none"
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is "row"
+PASS element.style.gridAutoFlow is "initial"
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is "auto"
+PASS element.style.gridAutoColumns is "initial"
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is "auto"
+PASS element.style.gridAutoRows is "initial"
Test the inherit value on reset-only subproperties (grid-*-gap)
-PASS getComputedStyle(anotherElement, '').getPropertyValue('-webkit-grid-column-gap') is "0px"
-PASS getComputedStyle(anotherElement, '').getPropertyValue('-webkit-grid-row-gap') is "0px"
-PASS getComputedStyle(anotherElement, '').getPropertyValue('-webkit-grid-column-gap') is "20px"
-PASS getComputedStyle(anotherElement, '').getPropertyValue('-webkit-grid-row-gap') is "100px"
+PASS getComputedStyle(anotherElement, '').getPropertyValue('grid-column-gap') is "0px"
+PASS getComputedStyle(anotherElement, '').getPropertyValue('grid-row-gap') is "0px"
+PASS getComputedStyle(anotherElement, '').getPropertyValue('grid-column-gap') is "20px"
+PASS getComputedStyle(anotherElement, '').getPropertyValue('grid-row-gap') is "100px"
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/grid-shorthand-get-set.html b/LayoutTests/fast/css-grid-layout/grid-shorthand-get-set.html
index eecb588..2150658 100644
--- a/LayoutTests/fast/css-grid-layout/grid-shorthand-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/grid-shorthand-get-set.html
@@ -4,88 +4,88 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
#gridWithDense {
- -webkit-grid: dense;
+ grid: dense;
}
#gridWithTemplate {
- -webkit-grid: 10px / 15px;
+ grid: 10px / 15px;
}
#gridWithTemplate1 {
- -webkit-grid: 10px / none;
+ grid: 10px / none;
}
#gridWithTemplateNone {
- -webkit-grid: 10px / none;
+ grid: 10px / none;
}
#gridWithAutoFlowDenseAndRowsAndColumns {
- -webkit-grid: dense 10px / 20px;
+ grid: dense 10px / 20px;
}
#gridWithAutoFlowAndRows {
- -webkit-grid: column 10px;
+ grid: column 10px;
}
#gridWithAutoFlowDense {
- -webkit-grid: dense 10px;
+ grid: dense 10px;
}
#gridWithAutoFlowColumnDense {
- -webkit-grid: column dense 10px;
+ grid: column dense 10px;
}
#gridWithAutoFlowDenseRow {
- -webkit-grid: dense row 10px;
+ grid: dense row 10px;
}
#gridWithAutoFlowAndRowsAndColumns {
- -webkit-grid: column 10px / 20px;
+ grid: column 10px / 20px;
}
/* Bad values. */
#gridWithNone {
- -webkit-grid: none;
+ grid: none;
}
#gridWithAutoFlowNoneAndRowsAndColumns {
- -webkit-grid: none 10px / 20px;
+ grid: none 10px / 20px;
}
#gridWithAutoFlowNone {
- -webkit-grid: none 10px;
+ grid: none 10px;
}
#gridWithExplicitAndImplicit {
- -webkit-grid: 10px / 20px column;
+ grid: 10px / 20px column;
}
#gridWithMisplacedNone1 {
- -webkit-grid: column 10px / none 20px;
+ grid: column 10px / none 20px;
}
#gridWithMisplacedNone2 {
- -webkit-grid: 10px / 20px none;
+ grid: 10px / 20px none;
}
#gridWithWrongSlash1 {
- -webkit-grid: column / 10px;
+ grid: column / 10px;
}
#gridWithWrongSlash2 {
- -webkit-grid: column 10px 20px;
+ grid: column 10px 20px;
}
#gridWithWrongSlash3 {
- -webkit-grid: 5x / 10px / 20px;
+ grid: 5x / 10px / 20px;
}
#gridWithAutoFlowRowAndColumn {
- -webkit-grid: row column 10px;
+ grid: row column 10px;
}
#gridWithoutAutoFlowAndExtraBreath {
- -webkit-grid: row 10px / 20px 30px;
+ grid: row 10px / 20px 30px;
}
#gridWithAutoFlowString1 {
- -webkit-grid: row 10px "a";
+ grid: row 10px "a";
}
#gridWithAutoFlowString2 {
- -webkit-grid: row "a" 10px;
+ grid: row "a" 10px;
}
#gridWithAutoFlowString3 {
- -webkit-grid: row "a";
+ grid: row "a";
}
#gridWithTemplateAndAutoFlow {
- -webkit-grid: 10px / 10px row;
+ grid: 10px / 10px row;
}
#gridWithTemplateAndMisplacedString1 {
- -webkit-grid: 10px / 10px "a";
+ grid: 10px / 10px "a";
}
#gridWithMisplacedDense {
- -webkit-grid: dense column dense;
+ grid: dense column dense;
}
</style>
<script src="../../resources/js-test.js"></script>
@@ -166,12 +166,12 @@
var element = document.createElement("div");
document.body.appendChild(element);
testGridDefinitionsValues(element, "none", "none", "none", "row", "auto", "auto");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "'none'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", "'none'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-areas')", "'none'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow')", "'row'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns')", "'auto'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows')", "'auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "'none'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", "'none'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-areas')", "'none'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-auto-flow')", "'row'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-auto-columns')", "'auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-auto-rows')", "'auto'");
debug("");
debug("Test setting grid-template-columns and grid-template-rows back to 'none' through JS");
@@ -180,15 +180,15 @@
debug("");
debug("Test the inherit value on reset-only subproperties (grid-*-gap)");
- document.body.style.webkitGridRowGap = "100px";
- document.body.style.webkitGridColumnGap = "20px";
+ document.body.style.gridRowGap = "100px";
+ document.body.style.gridColumnGap = "20px";
var anotherElement = document.createElement("div");
document.body.appendChild(anotherElement);
- shouldBeEqualToString("getComputedStyle(anotherElement, '').getPropertyValue('-webkit-grid-column-gap')", "0px");
- shouldBeEqualToString("getComputedStyle(anotherElement, '').getPropertyValue('-webkit-grid-row-gap')", "0px");
- anotherElement.style.webkitGrid = "inherit";
- shouldBeEqualToString("getComputedStyle(anotherElement, '').getPropertyValue('-webkit-grid-column-gap')", "20px");
- shouldBeEqualToString("getComputedStyle(anotherElement, '').getPropertyValue('-webkit-grid-row-gap')", "100px");
+ shouldBeEqualToString("getComputedStyle(anotherElement, '').getPropertyValue('grid-column-gap')", "0px");
+ shouldBeEqualToString("getComputedStyle(anotherElement, '').getPropertyValue('grid-row-gap')", "0px");
+ anotherElement.style.grid = "inherit";
+ shouldBeEqualToString("getComputedStyle(anotherElement, '').getPropertyValue('grid-column-gap')", "20px");
+ shouldBeEqualToString("getComputedStyle(anotherElement, '').getPropertyValue('grid-row-gap')", "100px");
</script>
</body>
</html>
diff --git a/LayoutTests/fast/css-grid-layout/grid-sizing-positioned-items.html b/LayoutTests/fast/css-grid-layout/grid-sizing-positioned-items.html
index 83d6b71..5eeabb1 100644
--- a/LayoutTests/fast/css-grid-layout/grid-sizing-positioned-items.html
+++ b/LayoutTests/fast/css-grid-layout/grid-sizing-positioned-items.html
@@ -4,8 +4,8 @@
<style>
.grid {
- -webkit-grid-template-columns: 100px 200px;
- -webkit-grid-template-rows: 50px 150px;
+ grid-template-columns: 100px 200px;
+ grid-template-rows: 50px 150px;
width: 100%;
height: 100%;
border: 5px solid black;
diff --git a/LayoutTests/fast/css-grid-layout/grid-strict-ordering-crash.html b/LayoutTests/fast/css-grid-layout/grid-strict-ordering-crash.html
index 6bfe5ba..98df32d 100644
--- a/LayoutTests/fast/css-grid-layout/grid-strict-ordering-crash.html
+++ b/LayoutTests/fast/css-grid-layout/grid-strict-ordering-crash.html
@@ -8,6 +8,6 @@
<p><a href="https://bugs.webkit.org/show_bug.cgi?id=108834">Bug 108834</a>: [CSS Grid Layout] Heap-buffer-overflow in std::sort</p>
<p>This test has PASSED if it doesn't CRASH.</p>
<div class="grid">
- <div style="-webkit-grid-column: 100;"></div>
- <div style="-webkit-grid-row: 30;"></div>
+ <div style="grid-column: 100;"></div>
+ <div style="grid-row: 30;"></div>
</div>
diff --git a/LayoutTests/fast/css-grid-layout/grid-template-areas-empty-string-crash.html b/LayoutTests/fast/css-grid-layout/grid-template-areas-empty-string-crash.html
index 3769808..29c92e3 100644
--- a/LayoutTests/fast/css-grid-layout/grid-template-areas-empty-string-crash.html
+++ b/LayoutTests/fast/css-grid-layout/grid-template-areas-empty-string-crash.html
@@ -8,22 +8,22 @@
</script>
<style>
.space {
- -webkit-grid-template-areas: "\0020";
+ grid-template-areas: "\0020";
}
.tab {
- -webkit-grid-template-areas: "\0009";
+ grid-template-areas: "\0009";
}
.lineFeed {
- -webkit-grid-template-areas: "\000A";
+ grid-template-areas: "\000A";
}
.carriageReturn {
- -webkit-grid-template-areas: "\000D";
+ grid-template-areas: "\000D";
}
.formFeed {
- -webkit-grid-template-areas: "\000C";
+ grid-template-areas: "\000C";
}
.multipleSpace {
- -webkit-grid-template-areas: " ";
+ grid-template-areas: " ";
}
</style>
</head>
diff --git a/LayoutTests/fast/css-grid-layout/grid-template-areas-get-set-expected.txt b/LayoutTests/fast/css-grid-layout/grid-template-areas-get-set-expected.txt
index 1e6bb5f..5403b75 100644
--- a/LayoutTests/fast/css-grid-layout/grid-template-areas-get-set-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/grid-template-areas-get-set-expected.txt
@@ -4,43 +4,43 @@
Test getting grid-template-areas set through CSS.
-PASS getComputedStyle(gridWithDefaultTemplate).getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS getComputedStyle(gridWithSingleStringTemplate).getPropertyValue('-webkit-grid-template-areas') is "\"area\""
-PASS getComputedStyle(gridWithTwoColumnsTemplate).getPropertyValue('-webkit-grid-template-areas') is "\"first second\""
-PASS getComputedStyle(gridWithTwoRowsTemplate).getPropertyValue('-webkit-grid-template-areas') is "\"first\" \"second\""
-PASS getComputedStyle(gridWithSpanningColumnsTemplate).getPropertyValue('-webkit-grid-template-areas') is "\"span span\""
-PASS getComputedStyle(gridWithSpanningRowsDotTemplate).getPropertyValue('-webkit-grid-template-areas') is "\"span\" \".\""
-PASS getComputedStyle(gridWithSpanningRowsDotsTemplate).getPropertyValue('-webkit-grid-template-areas') is "\"span\" \".\""
-PASS getComputedStyle(gridWithDotColumn).getPropertyValue('-webkit-grid-template-areas') is "\"header .\" \"footer .\""
-PASS getComputedStyle(gridWithDotsColumn).getPropertyValue('-webkit-grid-template-areas') is "\"header .\" \"footer .\""
-PASS getComputedStyle(gridWithDotCells).getPropertyValue('-webkit-grid-template-areas') is "\"first .\" \". second\""
-PASS getComputedStyle(gridWithDotsCells).getPropertyValue('-webkit-grid-template-areas') is "\"first .\" \". second\""
-PASS getComputedStyle(gridWithComplexDotAreas).getPropertyValue('-webkit-grid-template-areas') is "\". header header .\" \". . . .\" \"nav main main aside\" \"nav main main aside\" \". . . aside\" \". footer footer aside\""
-PASS getComputedStyle(gridWithComplexDotsAreas).getPropertyValue('-webkit-grid-template-areas') is "\". header header .\" \". . . .\" \"nav main main aside\" \"nav main main aside\" \". . . aside\" \". footer footer aside\""
-PASS getComputedStyle(gridWithMixedDotAndDotsAreas).getPropertyValue('-webkit-grid-template-areas') is "\". title .\" \". main main\" \"nav . aside\" \". footer .\""
-PASS getComputedStyle(gridWithDotsNoSpaceTwoColumns).getPropertyValue('-webkit-grid-template-areas') is "\". A\" \". A\" \"B .\" \"B .\""
-PASS getComputedStyle(gridWithDotsNoSpaceThreeColumns).getPropertyValue('-webkit-grid-template-areas') is "\". A .\" \". A .\" \"B . C\" \"B . C\""
-PASS getComputedStyle(gridWithDotsNoSpaceFourColumns).getPropertyValue('-webkit-grid-template-areas') is "\". A . B\" \". A . B\" \". A . B\" \". A . B\" \"C . D .\" \"C . D .\" \"C . D .\" \"C . D .\""
-PASS getComputedStyle(gridWithDotsNoSpaceComplex).getPropertyValue('-webkit-grid-template-areas') is "\". title . nav . . main test\" \". title . nav . . main test\" \". title . nav . . main test\" \". title . nav . . main test\""
-PASS getComputedStyle(gridWithHorizontalRectangle).getPropertyValue('-webkit-grid-template-areas') is "\"a a a\" \"a a a\""
-PASS getComputedStyle(gridWithVerticalRectangle).getPropertyValue('-webkit-grid-template-areas') is "\"a a\" \"a a\" \"a a\""
+PASS getComputedStyle(gridWithDefaultTemplate).getPropertyValue('grid-template-areas') is "none"
+PASS getComputedStyle(gridWithSingleStringTemplate).getPropertyValue('grid-template-areas') is "\"area\""
+PASS getComputedStyle(gridWithTwoColumnsTemplate).getPropertyValue('grid-template-areas') is "\"first second\""
+PASS getComputedStyle(gridWithTwoRowsTemplate).getPropertyValue('grid-template-areas') is "\"first\" \"second\""
+PASS getComputedStyle(gridWithSpanningColumnsTemplate).getPropertyValue('grid-template-areas') is "\"span span\""
+PASS getComputedStyle(gridWithSpanningRowsDotTemplate).getPropertyValue('grid-template-areas') is "\"span\" \".\""
+PASS getComputedStyle(gridWithSpanningRowsDotsTemplate).getPropertyValue('grid-template-areas') is "\"span\" \".\""
+PASS getComputedStyle(gridWithDotColumn).getPropertyValue('grid-template-areas') is "\"header .\" \"footer .\""
+PASS getComputedStyle(gridWithDotsColumn).getPropertyValue('grid-template-areas') is "\"header .\" \"footer .\""
+PASS getComputedStyle(gridWithDotCells).getPropertyValue('grid-template-areas') is "\"first .\" \". second\""
+PASS getComputedStyle(gridWithDotsCells).getPropertyValue('grid-template-areas') is "\"first .\" \". second\""
+PASS getComputedStyle(gridWithComplexDotAreas).getPropertyValue('grid-template-areas') is "\". header header .\" \". . . .\" \"nav main main aside\" \"nav main main aside\" \". . . aside\" \". footer footer aside\""
+PASS getComputedStyle(gridWithComplexDotsAreas).getPropertyValue('grid-template-areas') is "\". header header .\" \". . . .\" \"nav main main aside\" \"nav main main aside\" \". . . aside\" \". footer footer aside\""
+PASS getComputedStyle(gridWithMixedDotAndDotsAreas).getPropertyValue('grid-template-areas') is "\". title .\" \". main main\" \"nav . aside\" \". footer .\""
+PASS getComputedStyle(gridWithDotsNoSpaceTwoColumns).getPropertyValue('grid-template-areas') is "\". A\" \". A\" \"B .\" \"B .\""
+PASS getComputedStyle(gridWithDotsNoSpaceThreeColumns).getPropertyValue('grid-template-areas') is "\". A .\" \". A .\" \"B . C\" \"B . C\""
+PASS getComputedStyle(gridWithDotsNoSpaceFourColumns).getPropertyValue('grid-template-areas') is "\". A . B\" \". A . B\" \". A . B\" \". A . B\" \"C . D .\" \"C . D .\" \"C . D .\" \"C . D .\""
+PASS getComputedStyle(gridWithDotsNoSpaceComplex).getPropertyValue('grid-template-areas') is "\". title . nav . . main test\" \". title . nav . . main test\" \". title . nav . . main test\" \". title . nav . . main test\""
+PASS getComputedStyle(gridWithHorizontalRectangle).getPropertyValue('grid-template-areas') is "\"a a a\" \"a a a\""
+PASS getComputedStyle(gridWithVerticalRectangle).getPropertyValue('grid-template-areas') is "\"a a\" \"a a\" \"a a\""
Test grid-template-areas: initial
-PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') is "\"foobar\""
-PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') is "\"foobar\""
-PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') is "none"
+PASS getComputedStyle(element).getPropertyValue('grid-template-areas') is "\"foobar\""
+PASS getComputedStyle(element).getPropertyValue('grid-template-areas') is "none"
+PASS getComputedStyle(element).getPropertyValue('grid-template-areas') is "\"foobar\""
+PASS getComputedStyle(element).getPropertyValue('grid-template-areas') is "none"
Test grid-template-areas: inherit
-PASS getComputedStyle(parentElement).getPropertyValue('-webkit-grid-template-areas') is "\"foo bar\""
-PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') is "\"foo bar\""
+PASS getComputedStyle(parentElement).getPropertyValue('grid-template-areas') is "\"foo bar\""
+PASS getComputedStyle(element).getPropertyValue('grid-template-areas') is "\"foo bar\""
Test invalid grid-template-areas values.
-PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') is "none"
+PASS getComputedStyle(element).getPropertyValue('grid-template-areas') is "none"
+PASS getComputedStyle(element).getPropertyValue('grid-template-areas') is "none"
+PASS getComputedStyle(element).getPropertyValue('grid-template-areas') is "none"
+PASS getComputedStyle(element).getPropertyValue('grid-template-areas') is "none"
+PASS getComputedStyle(element).getPropertyValue('grid-template-areas') is "none"
FIXME: We currently don't validate that the named grid areas are <indent>.
-FAIL getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') should be none. Was "nav-up".
+FAIL getComputedStyle(element).getPropertyValue('grid-template-areas') should be none. Was "nav-up".
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/grid-template-areas-get-set.html b/LayoutTests/fast/css-grid-layout/grid-template-areas-get-set.html
index c3a2133..d54a1db 100644
--- a/LayoutTests/fast/css-grid-layout/grid-template-areas-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/grid-template-areas-get-set.html
@@ -4,54 +4,54 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
#gridWithSingleStringTemplate {
- -webkit-grid-template-areas: "area";
+ grid-template-areas: "area";
}
#gridWithTwoColumnsTemplate {
- -webkit-grid-template-areas: "first second";
+ grid-template-areas: "first second";
}
#gridWithTwoRowsTemplate {
- -webkit-grid-template-areas: "first"
+ grid-template-areas: "first"
"second";
}
#gridWithSpanningColumnsTemplate {
- -webkit-grid-template-areas: "span span";
+ grid-template-areas: "span span";
}
#gridWithSpanningRowsDotTemplate {
- -webkit-grid-template-areas: "span"
+ grid-template-areas: "span"
".";
}
#gridWithSpanningRowsDotsTemplate {
- -webkit-grid-template-areas: "span"
+ grid-template-areas: "span"
"....";
}
#gridWithDotColumn {
- -webkit-grid-template-areas: "header ."
+ grid-template-areas: "header ."
"footer .";
}
#gridWithDotsColumn {
- -webkit-grid-template-areas: "header ......"
+ grid-template-areas: "header ......"
"footer ......";
}
#gridWithDotCells {
- -webkit-grid-template-areas: "first ."
+ grid-template-areas: "first ."
". second";
}
#gridWithDotsCells {
- -webkit-grid-template-areas: "first ......"
+ grid-template-areas: "first ......"
"..... second";
}
#gridWithComplexDotAreas {
- -webkit-grid-template-areas: ". header header ."
+ grid-template-areas: ". header header ."
". . . ."
"nav main main aside"
"nav main main aside"
@@ -60,7 +60,7 @@
}
#gridWithComplexDotsAreas {
- -webkit-grid-template-areas: "... header header ....."
+ grid-template-areas: "... header header ....."
"... ...... ...... ....."
"nav main main aside"
"nav main main aside"
@@ -69,28 +69,28 @@
}
#gridWithMixedDotAndDotsAreas {
- -webkit-grid-template-areas: "... title ."
+ grid-template-areas: "... title ."
".. main main"
"nav ................... aside"
". footer ......";
}
#gridWithDotsNoSpaceTwoColumns {
- -webkit-grid-template-areas: "...A"
+ grid-template-areas: "...A"
".A"
"B.."
"B.";
}
#gridWithDotsNoSpaceThreeColumns {
- -webkit-grid-template-areas: "...A.."
+ grid-template-areas: "...A.."
".A."
"B..C"
"B.C";
}
#gridWithDotsNoSpaceFourColumns {
- -webkit-grid-template-areas: "...A..B"
+ grid-template-areas: "...A..B"
".A.B"
"..A.B"
".A...B"
@@ -101,7 +101,7 @@
}
#gridWithDotsNoSpaceComplex {
- -webkit-grid-template-areas: ".title...nav. ..main test"
+ grid-template-areas: ".title...nav. ..main test"
"... title.nav... .main test"
"..title .. nav . .. main test"
". title .nav... . main test";
@@ -109,12 +109,12 @@
}
#gridWithHorizontalRectangle {
- -webkit-grid-template-areas: "a a a"
+ grid-template-areas: "a a a"
"a a a";
}
#gridWithVerticalRectangle {
- -webkit-grid-template-areas: "a a"
+ grid-template-areas: "a a"
"a a"
"a a";
}
@@ -147,12 +147,12 @@
description("This test checks that grid-template-areas is properly parsed.");
function testGridTemplateAreas(gridItemID, expectedResult) {
- shouldBeEqualToString("getComputedStyle(" + gridItemID + ").getPropertyValue('-webkit-grid-template-areas')", expectedResult);
+ shouldBeEqualToString("getComputedStyle(" + gridItemID + ").getPropertyValue('grid-template-areas')", expectedResult);
}
function testJSGridTemplateAreas(element, expectedResult) {
this.element = element;
- shouldBeEqualToString("getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas')", expectedResult);
+ shouldBeEqualToString("getComputedStyle(element).getPropertyValue('grid-template-areas')", expectedResult);
}
debug("Test getting grid-template-areas set through CSS.");
@@ -180,25 +180,25 @@
debug("Test grid-template-areas: initial");
var element = document.createElement("div");
document.body.appendChild(element);
- element.style.webkitGridTemplateAreas = "'foobar'";
+ element.style.gridTemplateAreas = "'foobar'";
testJSGridTemplateAreas(element, '"foobar"');
- element.style.webkitGridTemplateAreas = "initial";
+ element.style.gridTemplateAreas = "initial";
testJSGridTemplateAreas(element, 'none');
- element.style.webkitGridTemplateAreas = "'foobar'";
+ element.style.gridTemplateAreas = "'foobar'";
testJSGridTemplateAreas(element, '"foobar"');
- element.style.webkitGridTemplateAreas = "none";
+ element.style.gridTemplateAreas = "none";
testJSGridTemplateAreas(element, 'none');
document.body.removeChild(element);
debug("Test grid-template-areas: inherit");
var parentElement = document.createElement("div");
document.body.appendChild(parentElement);
- parentElement.style.webkitGridTemplateAreas = "'foo bar'";
- shouldBeEqualToString("getComputedStyle(parentElement).getPropertyValue('-webkit-grid-template-areas')", '"foo bar"');
+ parentElement.style.gridTemplateAreas = "'foo bar'";
+ shouldBeEqualToString("getComputedStyle(parentElement).getPropertyValue('grid-template-areas')", '"foo bar"');
var element = document.createElement("div");
parentElement.appendChild(element);
- element.style.webkitGridTemplateAreas = "inherit";
+ element.style.gridTemplateAreas = "inherit";
testJSGridTemplateAreas(element, '"foo bar"');
document.body.removeChild(parentElement);
@@ -207,29 +207,29 @@
document.body.appendChild(element);
// 'nav' is not a rectangular definition.
- element.style.webkitGridTemplateAreas = "'nav head' 'nav nav'";
+ element.style.gridTemplateAreas = "'nav head' 'nav nav'";
testJSGridTemplateAreas(element, "none");
// 'nav' is not contiguous in the column direction.
- element.style.webkitGridTemplateAreas = "'nav head nav'";
+ element.style.gridTemplateAreas = "'nav head nav'";
testJSGridTemplateAreas(element, "none");
// 'nav' is not contiguous in the row direction.
- element.style.webkitGridTemplateAreas = "'nav head' 'middle middle' 'nav footer'";
+ element.style.gridTemplateAreas = "'nav head' 'middle middle' 'nav footer'";
testJSGridTemplateAreas(element, "none");
// The rows don't have the same number of columns.
- element.style.webkitGridTemplateAreas = "'nav head' 'foot'";
+ element.style.gridTemplateAreas = "'nav head' 'foot'";
testJSGridTemplateAreas(element, "none");
// Empty rows.
- element.style.webkitGridTemplateAreas = "'' ''";
+ element.style.gridTemplateAreas = "'' ''";
testJSGridTemplateAreas(element, "none");
debug("");
debug("FIXME: We currently don't validate that the named grid areas are <indent>.");
// <ident> only allows a leading '-'.
- element.style.webkitGridTemplateAreas = "'nav-up'";
+ element.style.gridTemplateAreas = "'nav-up'";
testJSGridTemplateAreas(element, "none");
</script>
<script src="../../resources/js-test-post.js"></script>
diff --git a/LayoutTests/fast/css-grid-layout/grid-template-areas-infinite-loop.html b/LayoutTests/fast/css-grid-layout/grid-template-areas-infinite-loop.html
index 00b75ef..f63bdd3 100644
--- a/LayoutTests/fast/css-grid-layout/grid-template-areas-infinite-loop.html
+++ b/LayoutTests/fast/css-grid-layout/grid-template-areas-infinite-loop.html
@@ -10,6 +10,6 @@
</div>
<script>
var grid = document.getElementById("grid");
- grid.style.webkitGridTemplateAreas = '"a"';
- grid.style.webkitGridTemplateAreas = '"b"';
+ grid.style.gridTemplateAreas = '"a"';
+ grid.style.gridTemplateAreas = '"b"';
</script>
diff --git a/LayoutTests/fast/css-grid-layout/grid-template-columns-rows-computed-style-gaps-content-alignment-expected.txt b/LayoutTests/fast/css-grid-layout/grid-template-columns-rows-computed-style-gaps-content-alignment-expected.txt
index 0a9542d..16ecae3 100644
--- a/LayoutTests/fast/css-grid-layout/grid-template-columns-rows-computed-style-gaps-content-alignment-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/grid-template-columns-rows-computed-style-gaps-content-alignment-expected.txt
@@ -3,34 +3,34 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS window.getComputedStyle(gridContentStart, '').getPropertyValue('-webkit-grid-template-columns') is "300px 200px 100px"
-PASS window.getComputedStyle(gridContentStart, '').getPropertyValue('-webkit-grid-template-rows') is "150px 100px 50px"
-PASS window.getComputedStyle(gridContentCenter, '').getPropertyValue('-webkit-grid-template-columns') is "300px 200px 100px"
-PASS window.getComputedStyle(gridContentCenter, '').getPropertyValue('-webkit-grid-template-rows') is "150px 100px 50px"
-PASS window.getComputedStyle(gridContentEnd, '').getPropertyValue('-webkit-grid-template-columns') is "300px 200px 100px"
-PASS window.getComputedStyle(gridContentEnd, '').getPropertyValue('-webkit-grid-template-rows') is "150px 100px 50px"
-PASS window.getComputedStyle(gridContentSpaceBetween, '').getPropertyValue('-webkit-grid-template-columns') is "300px 200px 100px"
-PASS window.getComputedStyle(gridContentSpaceBetween, '').getPropertyValue('-webkit-grid-template-rows') is "150px 100px 50px"
-PASS window.getComputedStyle(gridContentSpaceAround, '').getPropertyValue('-webkit-grid-template-columns') is "300px 200px 100px"
-PASS window.getComputedStyle(gridContentSpaceAround, '').getPropertyValue('-webkit-grid-template-rows') is "150px 100px 50px"
-PASS window.getComputedStyle(gridContentSpaceEvenly, '').getPropertyValue('-webkit-grid-template-columns') is "300px 200px 100px"
-PASS window.getComputedStyle(gridContentSpaceEvenly, '').getPropertyValue('-webkit-grid-template-rows') is "150px 100px 50px"
-PASS window.getComputedStyle(gridContentStretch, '').getPropertyValue('-webkit-grid-template-columns') is "300px 200px 100px"
-PASS window.getComputedStyle(gridContentStretch, '').getPropertyValue('-webkit-grid-template-rows') is "150px 100px 50px"
-PASS window.getComputedStyle(gridGapsContentStart, '').getPropertyValue('-webkit-grid-template-columns') is "300px 200px 100px"
-PASS window.getComputedStyle(gridGapsContentStart, '').getPropertyValue('-webkit-grid-template-rows') is "150px 100px 50px"
-PASS window.getComputedStyle(gridGapsContentCenter, '').getPropertyValue('-webkit-grid-template-columns') is "300px 200px 100px"
-PASS window.getComputedStyle(gridGapsContentCenter, '').getPropertyValue('-webkit-grid-template-rows') is "150px 100px 50px"
-PASS window.getComputedStyle(gridGapsContentEnd, '').getPropertyValue('-webkit-grid-template-columns') is "300px 200px 100px"
-PASS window.getComputedStyle(gridGapsContentEnd, '').getPropertyValue('-webkit-grid-template-rows') is "150px 100px 50px"
-PASS window.getComputedStyle(gridGapsContentSpaceBetween, '').getPropertyValue('-webkit-grid-template-columns') is "300px 200px 100px"
-PASS window.getComputedStyle(gridGapsContentSpaceBetween, '').getPropertyValue('-webkit-grid-template-rows') is "150px 100px 50px"
-PASS window.getComputedStyle(gridGapsContentSpaceAround, '').getPropertyValue('-webkit-grid-template-columns') is "300px 200px 100px"
-PASS window.getComputedStyle(gridGapsContentSpaceAround, '').getPropertyValue('-webkit-grid-template-rows') is "150px 100px 50px"
-PASS window.getComputedStyle(gridGapsContentSpaceEvenly, '').getPropertyValue('-webkit-grid-template-columns') is "300px 200px 100px"
-PASS window.getComputedStyle(gridGapsContentSpaceEvenly, '').getPropertyValue('-webkit-grid-template-rows') is "150px 100px 50px"
-PASS window.getComputedStyle(gridGapsContentStretch, '').getPropertyValue('-webkit-grid-template-columns') is "300px 200px 100px"
-PASS window.getComputedStyle(gridGapsContentStretch, '').getPropertyValue('-webkit-grid-template-rows') is "150px 100px 50px"
+PASS window.getComputedStyle(gridContentStart, '').getPropertyValue('grid-template-columns') is "300px 200px 100px"
+PASS window.getComputedStyle(gridContentStart, '').getPropertyValue('grid-template-rows') is "150px 100px 50px"
+PASS window.getComputedStyle(gridContentCenter, '').getPropertyValue('grid-template-columns') is "300px 200px 100px"
+PASS window.getComputedStyle(gridContentCenter, '').getPropertyValue('grid-template-rows') is "150px 100px 50px"
+PASS window.getComputedStyle(gridContentEnd, '').getPropertyValue('grid-template-columns') is "300px 200px 100px"
+PASS window.getComputedStyle(gridContentEnd, '').getPropertyValue('grid-template-rows') is "150px 100px 50px"
+PASS window.getComputedStyle(gridContentSpaceBetween, '').getPropertyValue('grid-template-columns') is "300px 200px 100px"
+PASS window.getComputedStyle(gridContentSpaceBetween, '').getPropertyValue('grid-template-rows') is "150px 100px 50px"
+PASS window.getComputedStyle(gridContentSpaceAround, '').getPropertyValue('grid-template-columns') is "300px 200px 100px"
+PASS window.getComputedStyle(gridContentSpaceAround, '').getPropertyValue('grid-template-rows') is "150px 100px 50px"
+PASS window.getComputedStyle(gridContentSpaceEvenly, '').getPropertyValue('grid-template-columns') is "300px 200px 100px"
+PASS window.getComputedStyle(gridContentSpaceEvenly, '').getPropertyValue('grid-template-rows') is "150px 100px 50px"
+PASS window.getComputedStyle(gridContentStretch, '').getPropertyValue('grid-template-columns') is "300px 200px 100px"
+PASS window.getComputedStyle(gridContentStretch, '').getPropertyValue('grid-template-rows') is "150px 100px 50px"
+PASS window.getComputedStyle(gridGapsContentStart, '').getPropertyValue('grid-template-columns') is "300px 200px 100px"
+PASS window.getComputedStyle(gridGapsContentStart, '').getPropertyValue('grid-template-rows') is "150px 100px 50px"
+PASS window.getComputedStyle(gridGapsContentCenter, '').getPropertyValue('grid-template-columns') is "300px 200px 100px"
+PASS window.getComputedStyle(gridGapsContentCenter, '').getPropertyValue('grid-template-rows') is "150px 100px 50px"
+PASS window.getComputedStyle(gridGapsContentEnd, '').getPropertyValue('grid-template-columns') is "300px 200px 100px"
+PASS window.getComputedStyle(gridGapsContentEnd, '').getPropertyValue('grid-template-rows') is "150px 100px 50px"
+PASS window.getComputedStyle(gridGapsContentSpaceBetween, '').getPropertyValue('grid-template-columns') is "300px 200px 100px"
+PASS window.getComputedStyle(gridGapsContentSpaceBetween, '').getPropertyValue('grid-template-rows') is "150px 100px 50px"
+PASS window.getComputedStyle(gridGapsContentSpaceAround, '').getPropertyValue('grid-template-columns') is "300px 200px 100px"
+PASS window.getComputedStyle(gridGapsContentSpaceAround, '').getPropertyValue('grid-template-rows') is "150px 100px 50px"
+PASS window.getComputedStyle(gridGapsContentSpaceEvenly, '').getPropertyValue('grid-template-columns') is "300px 200px 100px"
+PASS window.getComputedStyle(gridGapsContentSpaceEvenly, '').getPropertyValue('grid-template-rows') is "150px 100px 50px"
+PASS window.getComputedStyle(gridGapsContentStretch, '').getPropertyValue('grid-template-columns') is "300px 200px 100px"
+PASS window.getComputedStyle(gridGapsContentStretch, '').getPropertyValue('grid-template-rows') is "150px 100px 50px"
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/grid-template-columns-rows-computed-style-gaps-content-alignment.html b/LayoutTests/fast/css-grid-layout/grid-template-columns-rows-computed-style-gaps-content-alignment.html
index 7200a28..19af08c 100644
--- a/LayoutTests/fast/css-grid-layout/grid-template-columns-rows-computed-style-gaps-content-alignment.html
+++ b/LayoutTests/fast/css-grid-layout/grid-template-columns-rows-computed-style-gaps-content-alignment.html
@@ -3,14 +3,14 @@
<link href="resources/grid-alignment.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-columns: 300px 200px 100px;
- -webkit-grid-template-rows: 150px 100px 50px;
+ grid-template-columns: 300px 200px 100px;
+ grid-template-rows: 150px 100px 50px;
width: 800px;
height: 500px;
}
.gaps {
- -webkit-grid-gap: 10px 20px;
+ grid-gap: 10px 20px;
}
</style>
diff --git a/LayoutTests/fast/css-grid-layout/grid-template-shorthand-computed-style-crash.html b/LayoutTests/fast/css-grid-layout/grid-template-shorthand-computed-style-crash.html
index 4f198da..0477b99 100644
--- a/LayoutTests/fast/css-grid-layout/grid-template-shorthand-computed-style-crash.html
+++ b/LayoutTests/fast/css-grid-layout/grid-template-shorthand-computed-style-crash.html
@@ -6,7 +6,7 @@
</script>
<style>
.grid {
- -webkit-grid-template: 100px / 50px;
+ grid-template: 100px / 50px;
}
</style>
<p>This test checks that getting computed style of grid-template shorthand does not crash.</p>
@@ -14,5 +14,5 @@
</div>
<script>
var grid = document.getElementById("grid");
- getComputedStyle(grid).webkitGridTemplate;
+ getComputedStyle(grid).gridTemplate;
</script>
diff --git a/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set-expected.txt b/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set-expected.txt
index aaca992..3b4ed20 100644
--- a/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set-expected.txt
@@ -4,199 +4,199 @@
Test getting grid-template-areas set through CSS.
-PASS window.getComputedStyle(gridTemplateWithNone, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridTemplateWithNone, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridTemplateWithNone, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleForm, '').getPropertyValue('-webkit-grid-template-columns') is "10px"
-PASS window.getComputedStyle(gridTemplateSimpleForm, '').getPropertyValue('-webkit-grid-template-rows') is "15px"
-PASS window.getComputedStyle(gridTemplateSimpleForm, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormWithNoneColumns, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormWithNoneColumns, '').getPropertyValue('-webkit-grid-template-rows') is "15px"
-PASS window.getComputedStyle(gridTemplateSimpleFormWithNoneColumns, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormWithNoneRows, '').getPropertyValue('-webkit-grid-template-columns') is "10px"
-PASS window.getComputedStyle(gridTemplateSimpleFormWithNoneRows, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormWithNoneRows, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormWithNone, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormWithNone, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormWithNone, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridTemplateComplexForm, '').getPropertyValue('-webkit-grid-template-columns') is "10px"
-PASS window.getComputedStyle(gridTemplateComplexForm, '').getPropertyValue('-webkit-grid-template-rows') is "15px"
-PASS window.getComputedStyle(gridTemplateComplexForm, '').getPropertyValue('-webkit-grid-template-areas') is "\"a\""
-PASS window.getComputedStyle(gridTemplateComplexFormWithLineNames, '').getPropertyValue('-webkit-grid-template-columns') is "10px"
-PASS window.getComputedStyle(gridTemplateComplexFormWithLineNames, '').getPropertyValue('-webkit-grid-template-rows') is "[head] 15px [tail]"
-PASS window.getComputedStyle(gridTemplateComplexFormWithLineNames, '').getPropertyValue('-webkit-grid-template-areas') is "\"a\""
-PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesWithoutRowSize, '').getPropertyValue('-webkit-grid-template-columns') is "10px"
-PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesWithoutRowSize, '').getPropertyValue('-webkit-grid-template-rows') is "[head] 0px [tail]"
-PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesWithoutRowSize, '').getPropertyValue('-webkit-grid-template-areas') is "\"a\""
-PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleColumns, '').getPropertyValue('-webkit-grid-template-columns') is "10px 20px"
-PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleColumns, '').getPropertyValue('-webkit-grid-template-rows') is "[head] 15px [tail]"
-PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleColumns, '').getPropertyValue('-webkit-grid-template-areas') is "\"a b\""
-PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleColumnsWithoutRowSize, '').getPropertyValue('-webkit-grid-template-columns') is "10px 20px"
-PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleColumnsWithoutRowSize, '').getPropertyValue('-webkit-grid-template-rows') is "[head] 0px [tail]"
-PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleColumnsWithoutRowSize, '').getPropertyValue('-webkit-grid-template-areas') is "\"a b\""
-PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRows, '').getPropertyValue('-webkit-grid-template-columns') is "10px"
-PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRows, '').getPropertyValue('-webkit-grid-template-rows') is "[head1] 15px [tail1 head2] 20px [tail2]"
-PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRows, '').getPropertyValue('-webkit-grid-template-areas') is "\"a\" \"b\""
-PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRowsWithoutRowsSizes, '').getPropertyValue('-webkit-grid-template-columns') is "10px"
-PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRowsWithoutRowsSizes, '').getPropertyValue('-webkit-grid-template-rows') is "[head1] 0px [tail1 head2] 0px [tail2]"
-PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRowsWithoutRowsSizes, '').getPropertyValue('-webkit-grid-template-areas') is "\"a\" \"b\""
-PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRowsAndColumns, '').getPropertyValue('-webkit-grid-template-columns') is "[first] 10px [nav nav2] 15px [nav nav2] 15px"
-PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRowsAndColumns, '').getPropertyValue('-webkit-grid-template-rows') is "100px [nav nav2] 25px [nav nav2] 25px [last]"
-PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRowsAndColumns, '').getPropertyValue('-webkit-grid-template-areas') is "\"a b c\" \"d e f\" \"g h i\""
-PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRowsAndColumnsWithoutRowsSizes, '').getPropertyValue('-webkit-grid-template-columns') is "[first] 10px [nav nav2] 15px [nav nav2] 15px"
-PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRowsAndColumnsWithoutRowsSizes, '').getPropertyValue('-webkit-grid-template-rows') is "0px [nav nav2] 0px [nav nav2] 0px [last]"
-PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRowsAndColumnsWithoutRowsSizes, '').getPropertyValue('-webkit-grid-template-areas') is "\"a b c\" \"d e f\" \"g h i\""
-PASS window.getComputedStyle(gridTemplateComplexFormWithAuto, '').getPropertyValue('-webkit-grid-template-columns') is "10px"
-PASS window.getComputedStyle(gridTemplateComplexFormWithAuto, '').getPropertyValue('-webkit-grid-template-rows') is "0px"
-PASS window.getComputedStyle(gridTemplateComplexFormWithAuto, '').getPropertyValue('-webkit-grid-template-areas') is "\"a\""
-PASS window.getComputedStyle(gridTemplateComplexFormOnlyAreas, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormOnlyAreas, '').getPropertyValue('-webkit-grid-template-rows') is "0px"
-PASS window.getComputedStyle(gridTemplateComplexFormOnlyAreas, '').getPropertyValue('-webkit-grid-template-areas') is "\"a\""
-PASS window.getComputedStyle(gridTemplateNoColumnsRowWithEmptyTrailingLineNames, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridTemplateNoColumnsRowWithEmptyTrailingLineNames, '').getPropertyValue('-webkit-grid-template-rows') is "[first] 0px"
-PASS window.getComputedStyle(gridTemplateNoColumnsRowWithEmptyTrailingLineNames, '').getPropertyValue('-webkit-grid-template-areas') is "\"a\""
+PASS window.getComputedStyle(gridTemplateWithNone, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateWithNone, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridTemplateWithNone, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleForm, '').getPropertyValue('grid-template-columns') is "10px"
+PASS window.getComputedStyle(gridTemplateSimpleForm, '').getPropertyValue('grid-template-rows') is "15px"
+PASS window.getComputedStyle(gridTemplateSimpleForm, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormWithNoneColumns, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormWithNoneColumns, '').getPropertyValue('grid-template-rows') is "15px"
+PASS window.getComputedStyle(gridTemplateSimpleFormWithNoneColumns, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormWithNoneRows, '').getPropertyValue('grid-template-columns') is "10px"
+PASS window.getComputedStyle(gridTemplateSimpleFormWithNoneRows, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormWithNoneRows, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormWithNone, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormWithNone, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormWithNone, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridTemplateComplexForm, '').getPropertyValue('grid-template-columns') is "10px"
+PASS window.getComputedStyle(gridTemplateComplexForm, '').getPropertyValue('grid-template-rows') is "15px"
+PASS window.getComputedStyle(gridTemplateComplexForm, '').getPropertyValue('grid-template-areas') is "\"a\""
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNames, '').getPropertyValue('grid-template-columns') is "10px"
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNames, '').getPropertyValue('grid-template-rows') is "[head] 15px [tail]"
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNames, '').getPropertyValue('grid-template-areas') is "\"a\""
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesWithoutRowSize, '').getPropertyValue('grid-template-columns') is "10px"
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesWithoutRowSize, '').getPropertyValue('grid-template-rows') is "[head] 0px [tail]"
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesWithoutRowSize, '').getPropertyValue('grid-template-areas') is "\"a\""
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleColumns, '').getPropertyValue('grid-template-columns') is "10px 20px"
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleColumns, '').getPropertyValue('grid-template-rows') is "[head] 15px [tail]"
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleColumns, '').getPropertyValue('grid-template-areas') is "\"a b\""
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleColumnsWithoutRowSize, '').getPropertyValue('grid-template-columns') is "10px 20px"
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleColumnsWithoutRowSize, '').getPropertyValue('grid-template-rows') is "[head] 0px [tail]"
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleColumnsWithoutRowSize, '').getPropertyValue('grid-template-areas') is "\"a b\""
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRows, '').getPropertyValue('grid-template-columns') is "10px"
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRows, '').getPropertyValue('grid-template-rows') is "[head1] 15px [tail1 head2] 20px [tail2]"
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRows, '').getPropertyValue('grid-template-areas') is "\"a\" \"b\""
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRowsWithoutRowsSizes, '').getPropertyValue('grid-template-columns') is "10px"
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRowsWithoutRowsSizes, '').getPropertyValue('grid-template-rows') is "[head1] 0px [tail1 head2] 0px [tail2]"
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRowsWithoutRowsSizes, '').getPropertyValue('grid-template-areas') is "\"a\" \"b\""
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRowsAndColumns, '').getPropertyValue('grid-template-columns') is "[first] 10px [nav nav2] 15px [nav nav2] 15px"
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRowsAndColumns, '').getPropertyValue('grid-template-rows') is "100px [nav nav2] 25px [nav nav2] 25px [last]"
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRowsAndColumns, '').getPropertyValue('grid-template-areas') is "\"a b c\" \"d e f\" \"g h i\""
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRowsAndColumnsWithoutRowsSizes, '').getPropertyValue('grid-template-columns') is "[first] 10px [nav nav2] 15px [nav nav2] 15px"
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRowsAndColumnsWithoutRowsSizes, '').getPropertyValue('grid-template-rows') is "0px [nav nav2] 0px [nav nav2] 0px [last]"
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRowsAndColumnsWithoutRowsSizes, '').getPropertyValue('grid-template-areas') is "\"a b c\" \"d e f\" \"g h i\""
+PASS window.getComputedStyle(gridTemplateComplexFormWithAuto, '').getPropertyValue('grid-template-columns') is "10px"
+PASS window.getComputedStyle(gridTemplateComplexFormWithAuto, '').getPropertyValue('grid-template-rows') is "0px"
+PASS window.getComputedStyle(gridTemplateComplexFormWithAuto, '').getPropertyValue('grid-template-areas') is "\"a\""
+PASS window.getComputedStyle(gridTemplateComplexFormOnlyAreas, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormOnlyAreas, '').getPropertyValue('grid-template-rows') is "0px"
+PASS window.getComputedStyle(gridTemplateComplexFormOnlyAreas, '').getPropertyValue('grid-template-areas') is "\"a\""
+PASS window.getComputedStyle(gridTemplateNoColumnsRowWithEmptyTrailingLineNames, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateNoColumnsRowWithEmptyTrailingLineNames, '').getPropertyValue('grid-template-rows') is "[first] 0px"
+PASS window.getComputedStyle(gridTemplateNoColumnsRowWithEmptyTrailingLineNames, '').getPropertyValue('grid-template-areas') is "\"a\""
Test getting wrong values for grid-template shorthand through CSS (they should resolve to the default: 'none')
-PASS window.getComputedStyle(gridTemplateMultipleSlash, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridTemplateMultipleSlash, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridTemplateMultipleSlash, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormJustColumns, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormJustColumns, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormJustColumns, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormNoRows, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormNoRows, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormNoRows, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormNoColumns, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormNoColumns, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormNoColumns, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormNoColumnSize, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormNoColumnSize, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormNoColumnSize, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormWithFitContent, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormWithFitContent, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormWithFitContent, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormWithWrongRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormWithWrongRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormWithWrongRepeat, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormWithMisplacedNone1, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormWithMisplacedNone1, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormWithMisplacedNone1, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormWithMisplacedNone2, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormWithMisplacedNone2, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormWithMisplacedNone2, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormWithMisplacedNone3, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormWithMisplacedNone3, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormWithMisplacedNone3, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormWithMisplacedNone4, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormWithMisplacedNone4, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridTemplateSimpleFormWithMisplacedNone4, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormWithRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormWithRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormWithRepeat, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormWithWrongRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormWithWrongRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormWithWrongRepeat, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(griTemplateComplexFormdWithFitAvailable, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(griTemplateComplexFormdWithFitAvailable, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(griTemplateComplexFormdWithFitAvailable, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormNoColumnSize, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormNoColumnSize, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormNoColumnSize, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize1, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize1, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize1, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize2, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize2, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize2, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize3, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize3, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize3, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize4, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize4, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize4, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormColumnsNotParsing1, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormColumnsNotParsing1, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormColumnsNotParsing1, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormColumnsNotParsing2, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormColumnsNotParsing2, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormColumnsNotParsing2, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormWithNoneColumns, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormWithNoneColumns, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridTemplateComplexFormWithNoneColumns, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridTemplateNoColumnsRowWithTwoEmptyTrailingLineNames, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridTemplateNoColumnsRowWithTwoEmptyTrailingLineNames, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridTemplateNoColumnsRowWithTwoEmptyTrailingLineNames, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridTemplateNoColumnsRowWithEmptyTrailingLineNamesAndNonEmptyLeadingLineNames, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridTemplateNoColumnsRowWithEmptyTrailingLineNamesAndNonEmptyLeadingLineNames, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridTemplateNoColumnsRowWithEmptyTrailingLineNamesAndNonEmptyLeadingLineNames, '').getPropertyValue('-webkit-grid-template-areas') is "none"
+PASS window.getComputedStyle(gridTemplateMultipleSlash, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateMultipleSlash, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridTemplateMultipleSlash, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormJustColumns, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormJustColumns, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormJustColumns, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormNoRows, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormNoRows, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormNoRows, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormNoColumns, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormNoColumns, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormNoColumns, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormNoColumnSize, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormNoColumnSize, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormNoColumnSize, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormWithFitContent, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormWithFitContent, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormWithFitContent, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormWithWrongRepeat, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormWithWrongRepeat, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormWithWrongRepeat, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormWithMisplacedNone1, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormWithMisplacedNone1, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormWithMisplacedNone1, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormWithMisplacedNone2, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormWithMisplacedNone2, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormWithMisplacedNone2, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormWithMisplacedNone3, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormWithMisplacedNone3, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormWithMisplacedNone3, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormWithMisplacedNone4, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormWithMisplacedNone4, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridTemplateSimpleFormWithMisplacedNone4, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormWithRepeat, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormWithRepeat, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormWithRepeat, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormWithWrongRepeat, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormWithWrongRepeat, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormWithWrongRepeat, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(griTemplateComplexFormdWithFitAvailable, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(griTemplateComplexFormdWithFitAvailable, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(griTemplateComplexFormdWithFitAvailable, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormNoColumnSize, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormNoColumnSize, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormNoColumnSize, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize1, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize1, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize1, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize2, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize2, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize2, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize3, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize3, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize3, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize4, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize4, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize4, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormColumnsNotParsing1, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormColumnsNotParsing1, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormColumnsNotParsing1, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormColumnsNotParsing2, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormColumnsNotParsing2, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormColumnsNotParsing2, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormWithNoneColumns, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormWithNoneColumns, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormWithNoneColumns, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridTemplateNoColumnsRowWithTwoEmptyTrailingLineNames, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateNoColumnsRowWithTwoEmptyTrailingLineNames, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridTemplateNoColumnsRowWithTwoEmptyTrailingLineNames, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(gridTemplateNoColumnsRowWithEmptyTrailingLineNamesAndNonEmptyLeadingLineNames, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateNoColumnsRowWithEmptyTrailingLineNamesAndNonEmptyLeadingLineNames, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridTemplateNoColumnsRowWithEmptyTrailingLineNamesAndNonEmptyLeadingLineNames, '').getPropertyValue('grid-template-areas') is "none"
Test the initial value
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is 'none'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is 'none'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-areas') is 'none'
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-areas') is "none"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-areas') is 'none'
Test setting grid-template-columns and grid-template-rows back to 'none' through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "10px"
-PASS element.style.webkitGridTemplateColumns is "10px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "[line] 20px"
-PASS element.style.webkitGridTemplateRows is "[line] 20px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-areas') is "\"a\""
-PASS element.style.webkitGridTemplateAreas is "\"a\""
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS element.style.webkitGridTemplateColumns is "none"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS element.style.webkitGridTemplateRows is "none"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS element.style.webkitGridTemplateAreas is "none"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "10px"
+PASS element.style.gridTemplateColumns is "10px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "[line] 20px"
+PASS element.style.gridTemplateRows is "[line] 20px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-areas') is "\"a\""
+PASS element.style.gridTemplateAreas is "\"a\""
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS element.style.gridTemplateColumns is "none"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS element.style.gridTemplateRows is "none"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-areas') is "none"
+PASS element.style.gridTemplateAreas is "none"
Test getting and setting grid-template shorthand through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "18px"
-PASS element.style.webkitGridTemplateColumns is "18px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "66px"
-PASS element.style.webkitGridTemplateRows is "66px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS element.style.webkitGridTemplateAreas is "none"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "10px"
-PASS element.style.webkitGridTemplateColumns is "10px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "[head] 15px [tail]"
-PASS element.style.webkitGridTemplateRows is "[head] 15px [tail]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-areas') is "\"a\""
-PASS element.style.webkitGridTemplateAreas is "\"a\""
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "100px"
-PASS element.style.webkitGridTemplateColumns is "100px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "[foo1 bar1] 50px [foo2 bar2 foo3 bar3] 50px [foo4 bar4]"
-PASS element.style.webkitGridTemplateRows is "[foo1 bar1] 50px [foo2 bar2 foo3 bar3] 50px [foo4 bar4]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-areas') is "\"a\" \"b\""
-PASS element.style.webkitGridTemplateAreas is "\"a\" \"b\""
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS element.style.webkitGridTemplateColumns is "none"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "0px"
-PASS element.style.webkitGridTemplateRows is "auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-areas') is "\"a\""
-PASS element.style.webkitGridTemplateAreas is "\"a\""
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "18px"
+PASS element.style.gridTemplateColumns is "18px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "66px"
+PASS element.style.gridTemplateRows is "66px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-areas') is "none"
+PASS element.style.gridTemplateAreas is "none"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "10px"
+PASS element.style.gridTemplateColumns is "10px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "[head] 15px [tail]"
+PASS element.style.gridTemplateRows is "[head] 15px [tail]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-areas') is "\"a\""
+PASS element.style.gridTemplateAreas is "\"a\""
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "100px"
+PASS element.style.gridTemplateColumns is "100px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "[foo1 bar1] 50px [foo2 bar2 foo3 bar3] 50px [foo4 bar4]"
+PASS element.style.gridTemplateRows is "[foo1 bar1] 50px [foo2 bar2 foo3 bar3] 50px [foo4 bar4]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-areas') is "\"a\" \"b\""
+PASS element.style.gridTemplateAreas is "\"a\" \"b\""
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS element.style.gridTemplateColumns is "none"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px"
+PASS element.style.gridTemplateRows is "auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-areas') is "\"a\""
+PASS element.style.gridTemplateAreas is "\"a\""
Test setting grid-template shorthand to bad values through JS
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-areas') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-areas') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-areas') is "none"
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set.html b/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set.html
index ff7eb98e..3cd98f7 100644
--- a/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set.html
@@ -4,137 +4,137 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
#gridTemplateWithNone {
- -webkit-grid-template: none;
+ grid-template: none;
}
#gridTemplateSimpleForm {
- -webkit-grid-template: 15px / 10px;
+ grid-template: 15px / 10px;
}
#gridTemplateSimpleFormWithNoneColumns {
- -webkit-grid-template: 15px / none;
+ grid-template: 15px / none;
}
#gridTemplateSimpleFormWithNoneRows {
- -webkit-grid-template: none / 10px;
+ grid-template: none / 10px;
}
#gridTemplateSimpleFormWithNone {
- -webkit-grid-template: none / none;
+ grid-template: none / none;
}
#gridTemplateComplexForm {
- -webkit-grid-template: "a" 15px / 10px;
+ grid-template: "a" 15px / 10px;
}
#gridTemplateComplexFormWithLineNames {
- -webkit-grid-template: [head] "a" 15px [tail] / 10px;
+ grid-template: [head] "a" 15px [tail] / 10px;
}
#gridTemplateComplexFormWithLineNamesWithoutRowSize {
- -webkit-grid-template: [head] "a" [tail] / 10px;
+ grid-template: [head] "a" [tail] / 10px;
}
#gridTemplateComplexFormWithLineNamesMultipleColumns {
- -webkit-grid-template: [head] "a b" 15px [tail] / 10px 20px;
+ grid-template: [head] "a b" 15px [tail] / 10px 20px;
}
#gridTemplateComplexFormWithLineNamesMultipleColumnsWithoutRowSize {
- -webkit-grid-template: [head] "a b" [tail] / 10px 20px;
+ grid-template: [head] "a b" [tail] / 10px 20px;
}
#gridTemplateComplexFormWithLineNamesMultipleRows {
- -webkit-grid-template: [head1] "a" 15px [tail1]
+ grid-template: [head1] "a" 15px [tail1]
[head2] "b" 20px [tail2] / 10px;
}
#gridTemplateComplexFormWithLineNamesMultipleRowsWithoutRowsSizes {
- -webkit-grid-template: [head1] "a" [tail1]
+ grid-template: [head1] "a" [tail1]
[head2] "b" [tail2] / 10px;
}
#gridTemplateComplexFormWithLineNamesMultipleRowsAndColumns {
- -webkit-grid-template: "a b c" 100px [nav]
+ grid-template: "a b c" 100px [nav]
[nav2] "d e f" 25px [nav]
[nav2] "g h i" 25px [last] / [first] 10px repeat(2, [nav nav2] 15px);
}
#gridTemplateComplexFormWithLineNamesMultipleRowsAndColumnsWithoutRowsSizes {
- -webkit-grid-template: "a b c" [nav]
+ grid-template: "a b c" [nav]
[nav2] "d e f" [nav]
[nav2] "g h i" [last] / [first] 10px repeat(2, [nav nav2] 15px);
}
#gridTemplateComplexFormWithAuto {
- -webkit-grid-template: "a" / 10px;
+ grid-template: "a" / 10px;
}
#gridTemplateComplexFormOnlyAreas {
- -webkit-grid-template: "a";
+ grid-template: "a";
}
#gridTemplateNoColumnsRowWithEmptyTrailingLineNames {
- -webkit-grid-template: [first] "a" auto [];
+ grid-template: [first] "a" auto [];
}
/* Bad values. */
#gridTemplateMultipleSlash {
- -webkit-grid-template: 10px / 20px / 30px;
+ grid-template: 10px / 20px / 30px;
}
#gridTemplateSimpleFormJustColumns {
- -webkit-grid-template: 10px;
+ grid-template: 10px;
}
#gridTemplateSimpleFormNoRows {
- -webkit-grid-template: / 10px;
+ grid-template: / 10px;
}
#gridTemplateSimpleFormNoColumns {
- -webkit-grid-template: 10px /;
+ grid-template: 10px /;
}
#gridTemplateSimpleFormNoColumnSize {
- -webkit-grid-template: 10px / [line];
+ grid-template: 10px / [line];
}
#gridTemplateSimpleFormWithFitContent {
- -webkit-grid-template: 10px / -webkit-fit-content;
+ grid-template: 10px / -webkit-fit-content;
}
#gridTemplateSimpleFormWithWrongRepeat {
- -webkit-grid-template: 10px / repeat(2, 50% [title] a);
+ grid-template: 10px / repeat(2, 50% [title] a);
}
#gridTemplateSimpleFormWithMisplacedNone1 {
- -webkit-grid-template: none 20px / 10px;
+ grid-template: none 20px / 10px;
}
#gridTemplateSimpleFormWithMisplacedNone2 {
- -webkit-grid-template: 20px none / 10px;
+ grid-template: 20px none / 10px;
}
#gridTemplateSimpleFormWithMisplacedNone3 {
- -webkit-grid-template: 20px / none 10px;
+ grid-template: 20px / none 10px;
}
#gridTemplateSimpleFormWithMisplacedNone4 {
- -webkit-grid-template: 20px / 10px none;
+ grid-template: 20px / 10px none;
}
#gridTemplateComplexFormWithRepeat {
- -webkit-grid-template: "a" repeat(2, 50% [title]) / 10px;
+ grid-template: "a" repeat(2, 50% [title]) / 10px;
}
#gridTemplateComplexFormWithWrongRepeat {
- -webkit-grid-template: "a" / repeat(2, 50% [title] a);
+ grid-template: "a" / repeat(2, 50% [title] a);
}
#griTemplateComplexFormdWithFitAvailable {
- -webkit-grid-template: "a" / -webkit-fit-available;
+ grid-template: "a" / -webkit-fit-available;
}
#gridTemplateComplexFormNoColumnSize {
- -webkit-grid-template: "a" / [line];
+ grid-template: "a" / [line];
}
#gridTemplateComplexFormMisplacedRowsSize1 {
- -webkit-grid-template: 10px "a" / 25px;
+ grid-template: 10px "a" / 25px;
}
#gridTemplateComplexFormMisplacedRowsSize2 {
- -webkit-grid-template: "a" [name] 10px / 25px;
+ grid-template: "a" [name] 10px / 25px;
}
#gridTemplateComplexFormMisplacedRowsSize3 {
- -webkit-grid-template: [head] "a" [tail] 10px / 10px;
+ grid-template: [head] "a" [tail] 10px / 10px;
}
#gridTemplateComplexFormMisplacedRowsSize4 {
- -webkit-grid-template: [head1] "a" [tail1]
+ grid-template: [head1] "a" [tail1]
[head2] "a" [tail2] 100px / 10px;
}
#gridTemplateComplexFormColumnsNotParsing1 {
- -webkit-grid-template: "a" [name] 10px / a;
+ grid-template: "a" [name] 10px / a;
}
#gridTemplateComplexFormColumnsNotParsing2 {
- -webkit-grid-template: "a" [name] 10px / "B";
+ grid-template: "a" [name] 10px / "B";
}
#gridTemplateComplexFormWithNoneColumns {
- -webkit-grid-template: "a" [name] 10px / none;
+ grid-template: "a" [name] 10px / none;
}
#gridTemplateNoColumnsRowWithTwoEmptyTrailingLineNames {
- -webkit-grid-template: [first] "a" auto [] [];
+ grid-template: [first] "a" auto [] [];
}
#gridTemplateNoColumnsRowWithEmptyTrailingLineNamesAndNonEmptyLeadingLineNames {
- -webkit-grid-template: [first] "a" auto [] [tail];
+ grid-template: [first] "a" auto [] [tail];
}
</style>
@@ -238,9 +238,9 @@
var element = document.createElement("div");
document.body.appendChild(element);
testGridDefinitionsValues(element, "none", "none", "none");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "'none'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", "'none'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-areas')", "'none'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "'none'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", "'none'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-areas')", "'none'");
debug("");
debug("Test setting grid-template-columns and grid-template-rows back to 'none' through JS");
diff --git a/LayoutTests/fast/css-grid-layout/grid-update-sizes-after-distributing-all-expected.txt b/LayoutTests/fast/css-grid-layout/grid-update-sizes-after-distributing-all-expected.txt
index 4c245e9..6e0c540 100644
--- a/LayoutTests/fast/css-grid-layout/grid-update-sizes-after-distributing-all-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/grid-update-sizes-after-distributing-all-expected.txt
@@ -1,15 +1,15 @@
Check that tracks are updated after distributing the extra space for all the items in the same group span.
-PASS window.getComputedStyle(gridAutoAndMaxContent, '').getPropertyValue('-webkit-grid-template-columns') is "25px 65px"
-PASS window.getComputedStyle(gridFixedMinContentAndFixedMaxContent, '').getPropertyValue('-webkit-grid-template-columns') is "25px 85px"
-PASS window.getComputedStyle(gridMinContentAndMaxContent, '').getPropertyValue('-webkit-grid-template-columns') is "15px 85px"
-PASS window.getComputedStyle(gridMinContentAndFixedAndMaxContent, '').getPropertyValue('-webkit-grid-template-columns') is "15px 20px 105px"
-PASS window.getComputedStyle(gridMaxContentAndFixedAndAuto, '').getPropertyValue('-webkit-grid-template-columns') is "105px 20px 15px"
-PASS window.getComputedStyle(gridRepeatTwoMaxContentAndMinContentTwoOverlapping, '').getPropertyValue('-webkit-grid-template-columns') is "115px 25px 85px 15px"
-PASS window.getComputedStyle(gridRepeatTwoMaxContentAndMinContentThreeOverlapping, '').getPropertyValue('-webkit-grid-template-columns') is "65px 25px 115px 15px"
-PASS window.getComputedStyle(gridRepeatTwoMaxContentAndMinContentTwoAndFourOverlapping, '').getPropertyValue('-webkit-grid-template-columns') is "70px 30px 80px 10px"
-PASS window.getComputedStyle(gridRepeatTwoAutoAndMaxContentTwoOverlapping, '').getPropertyValue('-webkit-grid-template-columns') is "25px 115px 15px 85px"
-PASS window.getComputedStyle(gridRepeatTwoAutoAndMaxContentThreeOverlapping, '').getPropertyValue('-webkit-grid-template-columns') is "20px 115px 25px 75px"
-PASS window.getComputedStyle(gridRepeatTwoAutoAndMaxContentTwoAndFourOverlapping, '').getPropertyValue('-webkit-grid-template-columns') is "30px 70px 10px 80px"
+PASS window.getComputedStyle(gridAutoAndMaxContent, '').getPropertyValue('grid-template-columns') is "25px 65px"
+PASS window.getComputedStyle(gridFixedMinContentAndFixedMaxContent, '').getPropertyValue('grid-template-columns') is "25px 85px"
+PASS window.getComputedStyle(gridMinContentAndMaxContent, '').getPropertyValue('grid-template-columns') is "15px 85px"
+PASS window.getComputedStyle(gridMinContentAndFixedAndMaxContent, '').getPropertyValue('grid-template-columns') is "15px 20px 105px"
+PASS window.getComputedStyle(gridMaxContentAndFixedAndAuto, '').getPropertyValue('grid-template-columns') is "105px 20px 15px"
+PASS window.getComputedStyle(gridRepeatTwoMaxContentAndMinContentTwoOverlapping, '').getPropertyValue('grid-template-columns') is "115px 25px 85px 15px"
+PASS window.getComputedStyle(gridRepeatTwoMaxContentAndMinContentThreeOverlapping, '').getPropertyValue('grid-template-columns') is "65px 25px 115px 15px"
+PASS window.getComputedStyle(gridRepeatTwoMaxContentAndMinContentTwoAndFourOverlapping, '').getPropertyValue('grid-template-columns') is "70px 30px 80px 10px"
+PASS window.getComputedStyle(gridRepeatTwoAutoAndMaxContentTwoOverlapping, '').getPropertyValue('grid-template-columns') is "25px 115px 15px 85px"
+PASS window.getComputedStyle(gridRepeatTwoAutoAndMaxContentThreeOverlapping, '').getPropertyValue('grid-template-columns') is "20px 115px 25px 75px"
+PASS window.getComputedStyle(gridRepeatTwoAutoAndMaxContentTwoAndFourOverlapping, '').getPropertyValue('grid-template-columns') is "30px 70px 10px 80px"
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/grid-update-sizes-after-distributing-all.html b/LayoutTests/fast/css-grid-layout/grid-update-sizes-after-distributing-all.html
index 5d3d7b4..9736551 100644
--- a/LayoutTests/fast/css-grid-layout/grid-update-sizes-after-distributing-all.html
+++ b/LayoutTests/fast/css-grid-layout/grid-update-sizes-after-distributing-all.html
@@ -6,36 +6,36 @@
.grid { font: 10px/1 Ahem; }
.gridAutoAndMaxContent {
- -webkit-grid-template-columns: auto -webkit-max-content;
+ grid-template-columns: auto -webkit-max-content;
}
.gridFixedMinContentAndFixedMaxContent {
- -webkit-grid-template-columns: minmax(10px, -webkit-min-content) minmax(10px, -webkit-max-content);
+ grid-template-columns: minmax(10px, -webkit-min-content) minmax(10px, -webkit-max-content);
}
.gridMinContentAndMaxContent {
- -webkit-grid-template-columns: -webkit-min-content -webkit-max-content;
+ grid-template-columns: -webkit-min-content -webkit-max-content;
}
.gridMinContentAndFixedAndMaxContent {
- -webkit-grid-template-columns: -webkit-min-content 20px -webkit-max-content;
+ grid-template-columns: -webkit-min-content 20px -webkit-max-content;
}
.gridMaxContentAndFixedAndAuto {
- -webkit-grid-template-columns: -webkit-max-content 20px auto;
+ grid-template-columns: -webkit-max-content 20px auto;
}
.gridRepeatTwoMaxContentAndMinContent {
- -webkit-grid-template-columns: repeat(2, -webkit-max-content -webkit-min-content);
+ grid-template-columns: repeat(2, -webkit-max-content -webkit-min-content);
}
.gridRepeatTwoAutoAndMaxContent {
- -webkit-grid-template-columns: repeat(2, auto -webkit-max-content);
+ grid-template-columns: repeat(2, auto -webkit-max-content);
}
- .columns1And2 { -webkit-grid-column: 1 / span 2; }
- .columns2And3 { -webkit-grid-column: 2 / span 2; }
- .columns3And4 { -webkit-grid-column: 3 / span 2; }
- .columns1To3 { -webkit-grid-column: 1 / span 3; }
- .columns1To4 { -webkit-grid-column: 1 / span 4; }
+ .columns1And2 { grid-column: 1 / span 2; }
+ .columns2And3 { grid-column: 2 / span 2; }
+ .columns3And4 { grid-column: 3 / span 2; }
+ .columns1To3 { grid-column: 1 / span 3; }
+ .columns1To4 { grid-column: 1 / span 4; }
</style>
<script src="../../resources/js-test.js"></script>
</head>
@@ -115,7 +115,7 @@
<script>
function testGridColumnsValues(id, computedColumnValue)
{
- shouldBeEqualToString("window.getComputedStyle(" + id + ", '').getPropertyValue('-webkit-grid-template-columns')", computedColumnValue);
+ shouldBeEqualToString("window.getComputedStyle(" + id + ", '').getPropertyValue('grid-template-columns')", computedColumnValue);
}
debug("Check that tracks are updated after distributing the extra space for all the items in the same group span.");
diff --git a/LayoutTests/fast/css-grid-layout/grid-was-populated-assert.html b/LayoutTests/fast/css-grid-layout/grid-was-populated-assert.html
index 8906ed6..63cd042 100644
--- a/LayoutTests/fast/css-grid-layout/grid-was-populated-assert.html
+++ b/LayoutTests/fast/css-grid-layout/grid-was-populated-assert.html
@@ -8,11 +8,11 @@
</script>
<style>
details {
- display: -webkit-grid;
+ display: grid;
-webkit-columns: 5;
}
div {
- display: -webkit-grid;
+ display: grid;
}
input {
-webkit-columns: 5;
diff --git a/LayoutTests/fast/css-grid-layout/grid-with-relative-font-length-crash.html b/LayoutTests/fast/css-grid-layout/grid-with-relative-font-length-crash.html
index 3d762a7..c2b5d99 100644
--- a/LayoutTests/fast/css-grid-layout/grid-with-relative-font-length-crash.html
+++ b/LayoutTests/fast/css-grid-layout/grid-with-relative-font-length-crash.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<style>
title {
- -webkit-grid: dense row 1ex;
+ grid: dense row 1ex;
}
</style>
<title>
diff --git a/LayoutTests/fast/css-grid-layout/implicit-columns-auto-resolution.html b/LayoutTests/fast/css-grid-layout/implicit-columns-auto-resolution.html
index ec7ccf0..c4bf951 100644
--- a/LayoutTests/fast/css-grid-layout/implicit-columns-auto-resolution.html
+++ b/LayoutTests/fast/css-grid-layout/implicit-columns-auto-resolution.html
@@ -4,8 +4,8 @@
<link href="resources/grid-alignment.css" rel="stylesheet">
<style>
.gridAutoContent {
- /* -webkit-grid-template-columns is left unset so that the grid item's column is implicit. */
- -webkit-grid-template-rows: 50px;
+ /* grid-template-columns is left unset so that the grid item's column is implicit. */
+ grid-template-rows: 50px;
}
.firstRowFirstColumn {
diff --git a/LayoutTests/fast/css-grid-layout/implicit-position-dynamic-change-expected.txt b/LayoutTests/fast/css-grid-layout/implicit-position-dynamic-change-expected.txt
index 8786713..e7e508a 100644
--- a/LayoutTests/fast/css-grid-layout/implicit-position-dynamic-change-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/implicit-position-dynamic-change-expected.txt
@@ -1,4 +1,4 @@
-This test checks that we properly recompute our grid tracks' sizes when a grid item changes its -webkit-grid-row or -webkit-grid-column.
+This test checks that we properly recompute our grid tracks' sizes when a grid item changes its grid-row or grid-column.
XXXX XXXX XXXX
PASS
diff --git a/LayoutTests/fast/css-grid-layout/implicit-position-dynamic-change.html b/LayoutTests/fast/css-grid-layout/implicit-position-dynamic-change.html
index 96950bd..9a4aa54 100644
--- a/LayoutTests/fast/css-grid-layout/implicit-position-dynamic-change.html
+++ b/LayoutTests/fast/css-grid-layout/implicit-position-dynamic-change.html
@@ -4,8 +4,8 @@
<link href="resources/grid-alignment.css" rel="stylesheet">
<style>
.gridFixedContent {
- -webkit-grid-template-columns: 50px minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 50px) minmax(50px, -webkit-min-content);
- -webkit-grid-template-rows: 70px minmax(-webkit-max-content, 70px) minmax(50px, -webkit-min-content) minmax(65px, -webkit-max-content);
+ grid-template-columns: 50px minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 50px) minmax(50px, -webkit-min-content);
+ grid-template-rows: 70px minmax(-webkit-max-content, 70px) minmax(50px, -webkit-min-content) minmax(65px, -webkit-max-content);
}
</style>
<script src="../../resources/check-layout.js"></script>
@@ -13,8 +13,8 @@
function testPosition(gridElementID, position, size)
{
gridItem = document.getElementById(gridElementID).firstChild;
- gridItem.style.webkitGridColumn = position.column;
- gridItem.style.webkitGridRow = position.row;
+ gridItem.style.gridColumn = position.column;
+ gridItem.style.gridRow = position.row;
gridItem.setAttribute("data-expected-width", size.width);
gridItem.setAttribute("data-expected-height", size.height);
checkLayout("#" + gridElementID);
@@ -104,7 +104,7 @@
</script>
<body>
-<p>This test checks that we properly recompute our grid tracks' sizes when a grid item changes its -webkit-grid-row or -webkit-grid-column.</p>
+<p>This test checks that we properly recompute our grid tracks' sizes when a grid item changes its grid-row or grid-column.</p>
<div class="constrainedContainer">
<div class="grid gridFixedContent" id="constrainedGrid" style="height: 100%"><div class="sizedToGridArea">XXXX XXXX XXXX</div></div>
diff --git a/LayoutTests/fast/css-grid-layout/implicit-rows-auto-resolution.html b/LayoutTests/fast/css-grid-layout/implicit-rows-auto-resolution.html
index 9ad5833..3edcccdd 100644
--- a/LayoutTests/fast/css-grid-layout/implicit-rows-auto-resolution.html
+++ b/LayoutTests/fast/css-grid-layout/implicit-rows-auto-resolution.html
@@ -3,8 +3,8 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.gridAutoContent {
- -webkit-grid-template-columns: 50px;
- /* -webkit-grid-template-rows is left unset so that the grid item's row is implicit. */
+ grid-template-columns: 50px;
+ /* grid-template-rows is left unset so that the grid item's row is implicit. */
}
.firstRowFirstColumn {
diff --git a/LayoutTests/fast/css-grid-layout/implicit-tracks-before-explicit.html b/LayoutTests/fast/css-grid-layout/implicit-tracks-before-explicit.html
index 769c62c..00762c0 100644
--- a/LayoutTests/fast/css-grid-layout/implicit-tracks-before-explicit.html
+++ b/LayoutTests/fast/css-grid-layout/implicit-tracks-before-explicit.html
@@ -4,7 +4,7 @@
<link href="resources/grid-alignment.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid: 50px / 100px;
+ grid: 50px / 100px;
font: 10px/1 Ahem;
position: relative;
margin: 25px;
@@ -12,44 +12,44 @@
.firstNegativeRowFirstColumn {
background-color: purple;
- -webkit-grid-row: -3;
- -webkit-grid-column: 1;
+ grid-row: -3;
+ grid-column: 1;
}
.firstNegativeRowFirstNegativeColumn {
background-color: navy;
- -webkit-grid-row: -3;
- -webkit-grid-column: -3;
+ grid-row: -3;
+ grid-column: -3;
}
.secondNegativeRowFirstColumn {
background-color: lime;
- -webkit-grid-row: -4;
- -webkit-grid-column: 1;
+ grid-row: -4;
+ grid-column: 1;
}
.secondNegativeRowSecondNegativeColumn {
background-color: orange;
- -webkit-grid-row: -4;
- -webkit-grid-column: -4;
+ grid-row: -4;
+ grid-column: -4;
}
.firstRowFirstNegativeColumn {
background-color: magenta;
- -webkit-grid-row: 1;
- -webkit-grid-column: -3;
+ grid-row: 1;
+ grid-column: -3;
}
.firstNegativeRowFirstNegativeColumn {
background-color: maroon;
- -webkit-grid-row: -3;
- -webkit-grid-column: -3;
+ grid-row: -3;
+ grid-column: -3;
}
.firstRowSecondNegativeColumn {
background-color: aqua;
- -webkit-grid-row: 1;
- -webkit-grid-column: -4;
+ grid-row: 1;
+ grid-column: -4;
}
</style>
diff --git a/LayoutTests/fast/css-grid-layout/justify-self-cell.html b/LayoutTests/fast/css-grid-layout/justify-self-cell.html
index ca101ba..a4f2173 100644
--- a/LayoutTests/fast/css-grid-layout/justify-self-cell.html
+++ b/LayoutTests/fast/css-grid-layout/justify-self-cell.html
@@ -5,8 +5,8 @@
<link href="resources/grid-alignment.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-columns: 100px 100px;
- -webkit-grid-template-rows: 200px 200px;
+ grid-template-columns: 100px 100px;
+ grid-template-rows: 200px 200px;
}
.cell {
diff --git a/LayoutTests/fast/css-grid-layout/mark-as-infinitely-growable-expected.txt b/LayoutTests/fast/css-grid-layout/mark-as-infinitely-growable-expected.txt
index 58119ad..287f066 100644
--- a/LayoutTests/fast/css-grid-layout/mark-as-infinitely-growable-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/mark-as-infinitely-growable-expected.txt
@@ -1,7 +1,7 @@
-PASS window.getComputedStyle(gridAutoAndAuto, '').getPropertyValue('-webkit-grid-template-columns') is "30px 70px"
-PASS window.getComputedStyle(gridAutoAndAuto, '').getPropertyValue('-webkit-grid-template-rows') is "10px"
-PASS window.getComputedStyle(gridFixedMaxContentAndFixedMaxContent, '').getPropertyValue('-webkit-grid-template-columns') is "20px 80px"
-PASS window.getComputedStyle(gridFixedMaxContentAndFixedMaxContent, '').getPropertyValue('-webkit-grid-template-rows') is "10px"
+PASS window.getComputedStyle(gridAutoAndAuto, '').getPropertyValue('grid-template-columns') is "30px 70px"
+PASS window.getComputedStyle(gridAutoAndAuto, '').getPropertyValue('grid-template-rows') is "10px"
+PASS window.getComputedStyle(gridFixedMaxContentAndFixedMaxContent, '').getPropertyValue('grid-template-columns') is "20px 80px"
+PASS window.getComputedStyle(gridFixedMaxContentAndFixedMaxContent, '').getPropertyValue('grid-template-rows') is "10px"
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/mark-as-infinitely-growable.html b/LayoutTests/fast/css-grid-layout/mark-as-infinitely-growable.html
index d18dcba..59937d5 100644
--- a/LayoutTests/fast/css-grid-layout/mark-as-infinitely-growable.html
+++ b/LayoutTests/fast/css-grid-layout/mark-as-infinitely-growable.html
@@ -7,11 +7,11 @@
font: 10px/1 Ahem;
}
.gridAutoAndAuto {
- -webkit-grid-template-columns: auto auto;
+ grid-template-columns: auto auto;
}
.gridFixedMaxContentAndFixedMaxContent {
- -webkit-grid-template-columns: minmax(20px, -webkit-max-content) minmax(10px, -webkit-max-content);
+ grid-template-columns: minmax(20px, -webkit-max-content) minmax(10px, -webkit-max-content);
}
</style>
<script src="../../resources/js-test.js"></script>
diff --git a/LayoutTests/fast/css-grid-layout/maximize-tracks-definite-indefinite-height.html b/LayoutTests/fast/css-grid-layout/maximize-tracks-definite-indefinite-height.html
index 74df4fd..528d913 100644
--- a/LayoutTests/fast/css-grid-layout/maximize-tracks-definite-indefinite-height.html
+++ b/LayoutTests/fast/css-grid-layout/maximize-tracks-definite-indefinite-height.html
@@ -5,7 +5,7 @@
<style>
.grid {
- -webkit-grid-template-rows: minmax(0px, 100px);
+ grid-template-rows: minmax(0px, 100px);
width: 40px;
align-items: start;
diff --git a/LayoutTests/fast/css-grid-layout/min-content-row-must-shrink-when-column-grows.html b/LayoutTests/fast/css-grid-layout/min-content-row-must-shrink-when-column-grows.html
index 6e815ee..d64b114 100644
--- a/LayoutTests/fast/css-grid-layout/min-content-row-must-shrink-when-column-grows.html
+++ b/LayoutTests/fast/css-grid-layout/min-content-row-must-shrink-when-column-grows.html
@@ -5,8 +5,8 @@
<script src="../../resources/check-layout.js"></script>
<style>
.grid {
- -webkit-grid-template-columns: -webkit-min-content 1fr;
- -webkit-grid-template-rows: -webkit-min-content;
+ grid-template-columns: -webkit-min-content 1fr;
+ grid-template-rows: -webkit-min-content;
width: 500px;
font: 10px/1 Ahem;
}
diff --git a/LayoutTests/fast/css-grid-layout/min-height-border-box.html b/LayoutTests/fast/css-grid-layout/min-height-border-box.html
index d608f3b..e660a3a 100644
--- a/LayoutTests/fast/css-grid-layout/min-height-border-box.html
+++ b/LayoutTests/fast/css-grid-layout/min-height-border-box.html
@@ -5,7 +5,7 @@
.grid {
border: 5px solid magenta;
margin-bottom: 25px;
- -webkit-grid-template-rows: minmax(auto, 0px);
+ grid-template-rows: minmax(auto, 0px);
}
.item {
diff --git a/LayoutTests/fast/css-grid-layout/min-width-height-auto-and-margins.html b/LayoutTests/fast/css-grid-layout/min-width-height-auto-and-margins.html
index bd85f9c..81ab82c 100644
--- a/LayoutTests/fast/css-grid-layout/min-width-height-auto-and-margins.html
+++ b/LayoutTests/fast/css-grid-layout/min-width-height-auto-and-margins.html
@@ -3,17 +3,17 @@
<link href="../css-intrinsic-dimensions/resources/height-keyword-classes.css" rel="stylesheet">
<link href="resources/grid.css" rel="stylesheet">
<style>
-.columnsSmallerThanContentBox { -webkit-grid-template-columns: 80px; }
-.columnsSameAsContentBox { -webkit-grid-template-columns: 100px; }
-.columnsBiggerThanContentBox { -webkit-grid-template-columns: 120px; }
-.columnsSameAsMarginBox { -webkit-grid-template-columns: 140px; }
-.columnsBiggerThanMarginBox { -webkit-grid-template-columns: 150px; }
+.columnsSmallerThanContentBox { grid-template-columns: 80px; }
+.columnsSameAsContentBox { grid-template-columns: 100px; }
+.columnsBiggerThanContentBox { grid-template-columns: 120px; }
+.columnsSameAsMarginBox { grid-template-columns: 140px; }
+.columnsBiggerThanMarginBox { grid-template-columns: 150px; }
-.rowsSmallerThanContentBox { -webkit-grid-template-rows: 20px; }
-.rowsEqualAsContentBox { -webkit-grid-template-rows: 25px; }
-.rowsBiggerThanContentBox { -webkit-grid-template-rows: 50px; }
-.rowsSameAsMarginBox { -webkit-grid-template-rows: 65px; }
-.rowsBiggerThanMarginBox { -webkit-grid-template-rows: 100px; }
+.rowsSmallerThanContentBox { grid-template-rows: 20px; }
+.rowsEqualAsContentBox { grid-template-rows: 25px; }
+.rowsBiggerThanContentBox { grid-template-rows: 50px; }
+.rowsSameAsMarginBox { grid-template-rows: 65px; }
+.rowsBiggerThanMarginBox { grid-template-rows: 100px; }
.container {
position: relative;
diff --git a/LayoutTests/fast/css-grid-layout/min-width-height-auto-overflow.html b/LayoutTests/fast/css-grid-layout/min-width-height-auto-overflow.html
index bbae695..5379425 100644
--- a/LayoutTests/fast/css-grid-layout/min-width-height-auto-overflow.html
+++ b/LayoutTests/fast/css-grid-layout/min-width-height-auto-overflow.html
@@ -2,8 +2,8 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-columns: 50px;
- -webkit-grid-template-rows: 50px;
+ grid-template-columns: 50px;
+ grid-template-rows: 50px;
height: 50px;
width: 50px;
margin: 50px;
diff --git a/LayoutTests/fast/css-grid-layout/min-width-height-auto.html b/LayoutTests/fast/css-grid-layout/min-width-height-auto.html
index 4bf9708..7f9d32f 100644
--- a/LayoutTests/fast/css-grid-layout/min-width-height-auto.html
+++ b/LayoutTests/fast/css-grid-layout/min-width-height-auto.html
@@ -2,8 +2,8 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-columns: 5px;
- -webkit-grid-template-rows: 5px;
+ grid-template-columns: 5px;
+ grid-template-rows: 5px;
}
.container {
diff --git a/LayoutTests/fast/css-grid-layout/min-width-margin-box.html b/LayoutTests/fast/css-grid-layout/min-width-margin-box.html
index 37e3d2d..3a045e9 100644
--- a/LayoutTests/fast/css-grid-layout/min-width-margin-box.html
+++ b/LayoutTests/fast/css-grid-layout/min-width-margin-box.html
@@ -6,7 +6,7 @@
.grid {
border: 5px solid magenta;
margin-bottom: 60px;
- -webkit-grid-template-columns: minmax(auto, 0px);
+ grid-template-columns: minmax(auto, 0px);
}
.item {
@@ -15,7 +15,7 @@
.stretchedItem {
background-color: green;
- -webkit-grid-row: 2;
+ grid-row: 2;
height: 15px;
}
diff --git a/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-height-only.html b/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-height-only.html
index 0106a86..12ddd50 100644
--- a/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-height-only.html
+++ b/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-height-only.html
@@ -8,36 +8,36 @@
}
#grid1 {
- -webkit-grid-template-columns: 30px;
- -webkit-grid-template-rows: minmax(20px, 80px) 160px;
+ grid-template-columns: 30px;
+ grid-template-rows: minmax(20px, 80px) 160px;
}
#grid2 {
- -webkit-grid-template-columns: 30px;
- -webkit-grid-template-rows: minmax(50%, 120px) minmax(20px, 40%);
+ grid-template-columns: 30px;
+ grid-template-rows: minmax(50%, 120px) minmax(20px, 40%);
}
#grid3 {
- -webkit-grid-template-columns: 30px;
+ grid-template-columns: 30px;
/* Overlapping range. */
- -webkit-grid-template-rows: minmax(10px, 180px) minmax(30px, 150px);
+ grid-template-rows: minmax(10px, 180px) minmax(30px, 150px);
}
#grid4 {
- -webkit-grid-template-columns: 30px;
- -webkit-grid-template-rows: minmax(20px, 80px) 60px;
+ grid-template-columns: 30px;
+ grid-template-rows: minmax(20px, 80px) 60px;
}
#grid5 {
- -webkit-grid-template-columns: 30px;
+ grid-template-columns: 30px;
/* 90% > 80px, 80px should be ignored. */
- -webkit-grid-template-rows: minmax(90%, 80px) minmax(10px, 60%);
+ grid-template-rows: minmax(90%, 80px) minmax(10px, 60%);
}
#grid6 {
/* Overlapping range. */
- -webkit-grid-template-columns: 30px;
- -webkit-grid-template-rows: minmax(10px, 180px) minmax(30px, 150px);
+ grid-template-columns: 30px;
+ grid-template-rows: minmax(10px, 180px) minmax(30px, 150px);
}
.firstRowFirstColumn {
diff --git a/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-width-only.html b/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-width-only.html
index 1fe0676..f538a49 100644
--- a/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-width-only.html
+++ b/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-width-only.html
@@ -8,37 +8,37 @@
}
#grid1 {
- -webkit-grid-template-columns: minmax(20px, 80px) 60px;
- -webkit-grid-template-rows: 30px;
+ grid-template-columns: minmax(20px, 80px) 60px;
+ grid-template-rows: 30px;
}
#grid2 {
/* First minmax more constraining than available logical width. */
- -webkit-grid-template-columns: minmax(50%, 60px) minmax(10px, 40%);
- -webkit-grid-template-rows: 30px;
+ grid-template-columns: minmax(50%, 60px) minmax(10px, 40%);
+ grid-template-rows: 30px;
}
#grid3 {
/* Overlapping range. */
- -webkit-grid-template-columns: minmax(10px, 80px) minmax(20px, 50px);
- -webkit-grid-template-rows: 30px;
+ grid-template-columns: minmax(10px, 80px) minmax(20px, 50px);
+ grid-template-rows: 30px;
}
#grid4 {
- -webkit-grid-template-columns: minmax(20px, 80px) 160px;
- -webkit-grid-template-rows: 30px;
+ grid-template-columns: minmax(20px, 80px) 160px;
+ grid-template-rows: 30px;
}
#grid5 {
/* 50% > 80px, 80px should be ignored. */
- -webkit-grid-template-columns: minmax(50%, 80px) minmax(10px, 60%);
- -webkit-grid-template-rows: 30px;
+ grid-template-columns: minmax(50%, 80px) minmax(10px, 60%);
+ grid-template-rows: 30px;
}
#grid6 {
/* Overlapping range. */
- -webkit-grid-template-columns: minmax(10px, 180px) minmax(30px, 150px);
- -webkit-grid-template-rows: 30px;
+ grid-template-columns: minmax(10px, 180px) minmax(30px, 150px);
+ grid-template-rows: 30px;
}
.firstRowFirstColumn {
diff --git a/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-columns.html b/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-columns.html
index b441c62..195da4d 100644
--- a/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-columns.html
+++ b/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-columns.html
@@ -3,13 +3,13 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.gridMinMaxContent {
- -webkit-grid-template-columns: minmax(-webkit-max-content, 50px);
- -webkit-grid-template-rows: 60px;
+ grid-template-columns: minmax(-webkit-max-content, 50px);
+ grid-template-rows: 60px;
}
.gridMaxMaxContent {
- -webkit-grid-template-columns: minmax(30px, -webkit-max-content);
- -webkit-grid-template-rows: 20px;
+ grid-template-columns: minmax(30px, -webkit-max-content);
+ grid-template-rows: 20px;
}
.firstRowFirstColumn {
diff --git a/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-rows.html b/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-rows.html
index 81bc11d..bba9905 100644
--- a/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-rows.html
+++ b/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-rows.html
@@ -3,13 +3,13 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.gridMinMaxContent {
- -webkit-grid-template-columns: 20px;
- -webkit-grid-template-rows: minmax(-webkit-max-content, 50px);
+ grid-template-columns: 20px;
+ grid-template-rows: minmax(-webkit-max-content, 50px);
}
.gridMaxMaxContent {
- -webkit-grid-template-columns: 20px;
- -webkit-grid-template-rows: minmax(30px, -webkit-max-content);
+ grid-template-columns: 20px;
+ grid-template-rows: minmax(30px, -webkit-max-content);
}
.firstRowFirstColumn {
diff --git a/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-columns.html b/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-columns.html
index 0b95555..4ce7193 100644
--- a/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-columns.html
+++ b/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-columns.html
@@ -3,13 +3,13 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.gridMinMinContent {
- -webkit-grid-template-columns: minmax(-webkit-min-content, 40px);
- -webkit-grid-template-rows: 50px;
+ grid-template-columns: minmax(-webkit-min-content, 40px);
+ grid-template-rows: 50px;
}
.gridMaxMinContent {
- -webkit-grid-template-columns: minmax(30px, -webkit-min-content);
- -webkit-grid-template-rows: 20px;
+ grid-template-columns: minmax(30px, -webkit-min-content);
+ grid-template-rows: 20px;
}
.firstRowFirstColumn {
diff --git a/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-rows.html b/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-rows.html
index b91303f..93c5678 100644
--- a/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-rows.html
+++ b/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-rows.html
@@ -3,13 +3,13 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.gridMinMinContent {
- -webkit-grid-template-columns: 30px;
- -webkit-grid-template-rows: minmax(-webkit-min-content, 40px);
+ grid-template-columns: 30px;
+ grid-template-rows: minmax(-webkit-min-content, 40px);
}
.gridMaxMinContent {
- -webkit-grid-template-columns: 30px;
- -webkit-grid-template-rows: minmax(30px, -webkit-min-content);
+ grid-template-columns: 30px;
+ grid-template-rows: minmax(30px, -webkit-min-content);
}
.firstRowFirstColumn {
diff --git a/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-columns.html b/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-columns.html
index 55d0dbd..e14dd9a 100644
--- a/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-columns.html
+++ b/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-columns.html
@@ -4,23 +4,23 @@
<link href="resources/grid-alignment.css" rel="stylesheet">
<style>
.gridAutoAutoContent {
- -webkit-grid-template-columns: auto auto;
- -webkit-grid-template-rows: 50px 100px;
+ grid-template-columns: auto auto;
+ grid-template-rows: 50px 100px;
}
.gridFixedAutoContent {
- -webkit-grid-template-columns: 10px auto;
- -webkit-grid-template-rows: 50px 100px;
+ grid-template-columns: 10px auto;
+ grid-template-rows: 50px 100px;
}
.gridMinMaxMin {
- -webkit-grid-template-columns: minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 140px);
- -webkit-grid-template-rows: 50px 100px;
+ grid-template-columns: minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 140px);
+ grid-template-rows: 50px 100px;
}
.gridMinMaxMax {
- -webkit-grid-template-columns: minmax(50px, -webkit-min-content) minmax(40px, -webkit-max-content);
- -webkit-grid-template-rows: 50px 100px;
+ grid-template-columns: minmax(50px, -webkit-min-content) minmax(40px, -webkit-max-content);
+ grid-template-rows: 50px 100px;
}
</style>
diff --git a/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-rows.html b/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-rows.html
index 3ef6d1a..4853560 100644
--- a/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-rows.html
+++ b/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-rows.html
@@ -3,23 +3,23 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.gridAutoAutoContent {
- -webkit-grid-template-columns: 50px 100px;
- -webkit-grid-template-rows: auto auto;
+ grid-template-columns: 50px 100px;
+ grid-template-rows: auto auto;
}
.gridFixedAutoContent {
- -webkit-grid-template-columns: 50px 100px;
- -webkit-grid-template-rows: 10px auto;
+ grid-template-columns: 50px 100px;
+ grid-template-rows: 10px auto;
}
.gridMinMaxMin {
- -webkit-grid-template-columns: 50px 100px;
- -webkit-grid-template-rows: minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 140px);
+ grid-template-columns: 50px 100px;
+ grid-template-rows: minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 140px);
}
.gridMinMaxMax {
- -webkit-grid-template-columns: 50px 100px;
- -webkit-grid-template-rows: minmax(50px, -webkit-min-content) minmax(40px, -webkit-max-content);
+ grid-template-columns: 50px 100px;
+ grid-template-rows: minmax(50px, -webkit-min-content) minmax(40px, -webkit-max-content);
}
</style>
<script src="../../resources/check-layout.js"></script>
diff --git a/LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expected.txt b/LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expected.txt
index ae6b20a..19c1af6 100644
--- a/LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expected.txt
@@ -3,113 +3,113 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-Test getting -webkit-grid-template-columns and -webkit-grid-template-rows set through CSS
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-template-columns') is "[first] 10px"
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-template-rows') is "[first] 15px"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-template-columns') is "424px [last]"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-template-rows') is "162px [last]"
-PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('-webkit-grid-template-columns') is "0px [last]"
-PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('-webkit-grid-template-rows') is "0px [last]"
-PASS window.getComputedStyle(gridWithPercentWithoutSizeWithChildren, '').getPropertyValue('-webkit-grid-template-columns') is "77px [last]"
-PASS window.getComputedStyle(gridWithPercentWithoutSizeWithChildren, '').getPropertyValue('-webkit-grid-template-rows') is "22px [last]"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-template-columns') is "[first] 0px"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-template-rows') is "0px [last]"
-PASS window.getComputedStyle(gridWithAutoWithChildrenElement, '').getPropertyValue('-webkit-grid-template-columns') is "[first] 77px"
-PASS window.getComputedStyle(gridWithAutoWithChildrenElement, '').getPropertyValue('-webkit-grid-template-rows') is "22px [last]"
-PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('-webkit-grid-template-columns') is "[first] 80px"
-PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('-webkit-grid-template-rows') is "300px [last]"
-PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue('-webkit-grid-template-columns') is "[first nav] 10px [last]"
-PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue('-webkit-grid-template-rows') is "[first nav] 15px [last]"
-PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, '').getPropertyValue('-webkit-grid-template-columns') is "[first nav] 80px [nav] 120px [last]"
-PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, '').getPropertyValue('-webkit-grid-template-rows') is "[first nav2] 150px [nav2] 450px [last]"
-PASS window.getComputedStyle(gridWithRepeatElement, '').getPropertyValue('-webkit-grid-template-columns') is "[first] 10px [nav nav2] 400px [nav nav2] 400px"
-PASS window.getComputedStyle(gridWithRepeatElement, '').getPropertyValue('-webkit-grid-template-rows') is "100px [nav nav2] 150px [nav nav2] 150px [last]"
-PASS window.getComputedStyle(gridWithEmptyBrackets, '').getPropertyValue('-webkit-grid-template-columns') is "10px"
-PASS window.getComputedStyle(gridWithEmptyBrackets, '').getPropertyValue('-webkit-grid-template-rows') is "20px 50px"
+Test getting grid-template-columns and grid-template-rows set through CSS
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-columns') is "[first] 10px"
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-rows') is "[first] 15px"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-columns') is "424px [last]"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-rows') is "162px [last]"
+PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('grid-template-columns') is "0px [last]"
+PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('grid-template-rows') is "0px [last]"
+PASS window.getComputedStyle(gridWithPercentWithoutSizeWithChildren, '').getPropertyValue('grid-template-columns') is "77px [last]"
+PASS window.getComputedStyle(gridWithPercentWithoutSizeWithChildren, '').getPropertyValue('grid-template-rows') is "22px [last]"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-columns') is "[first] 0px"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-rows') is "0px [last]"
+PASS window.getComputedStyle(gridWithAutoWithChildrenElement, '').getPropertyValue('grid-template-columns') is "[first] 77px"
+PASS window.getComputedStyle(gridWithAutoWithChildrenElement, '').getPropertyValue('grid-template-rows') is "22px [last]"
+PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('grid-template-columns') is "[first] 80px"
+PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('grid-template-rows') is "300px [last]"
+PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue('grid-template-columns') is "[first nav] 10px [last]"
+PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue('grid-template-rows') is "[first nav] 15px [last]"
+PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, '').getPropertyValue('grid-template-columns') is "[first nav] 80px [nav] 120px [last]"
+PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, '').getPropertyValue('grid-template-rows') is "[first nav2] 150px [nav2] 450px [last]"
+PASS window.getComputedStyle(gridWithRepeatElement, '').getPropertyValue('grid-template-columns') is "[first] 10px [nav nav2] 400px [nav nav2] 400px"
+PASS window.getComputedStyle(gridWithRepeatElement, '').getPropertyValue('grid-template-rows') is "100px [nav nav2] 150px [nav nav2] 150px [last]"
+PASS window.getComputedStyle(gridWithEmptyBrackets, '').getPropertyValue('grid-template-columns') is "10px"
+PASS window.getComputedStyle(gridWithEmptyBrackets, '').getPropertyValue('grid-template-rows') is "20px 50px"
-Test getting and setting -webkit-grid-template-columns and -webkit-grid-template-rows through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[first] 18px"
-PASS element.style.webkitGridTemplateColumns is "[first] 18px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "66px [last]"
-PASS element.style.webkitGridTemplateRows is "66px [last]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[first] 440px"
-PASS element.style.webkitGridTemplateColumns is "[first] 55%"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "240px [last]"
-PASS element.style.webkitGridTemplateRows is "40% [last]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[first] 0px"
-PASS element.style.webkitGridTemplateColumns is "[first] auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "0px [last]"
-PASS element.style.webkitGridTemplateRows is "auto [last]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[first] 0px"
-PASS element.style.webkitGridTemplateColumns is "[first] -webkit-min-content"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "0px [last]"
-PASS element.style.webkitGridTemplateRows is "-webkit-min-content [last]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[first] 0px"
-PASS element.style.webkitGridTemplateColumns is "[first] -webkit-max-content"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "0px [last]"
-PASS element.style.webkitGridTemplateRows is "-webkit-max-content [last]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[first] 440px"
-PASS element.style.webkitGridTemplateColumns is "[first] minmax(55%, 45px)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "240px [last]"
-PASS element.style.webkitGridTemplateRows is "minmax(30px, 40%) [last]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[first] 220px"
-PASS element.style.webkitGridTemplateColumns is "[first] minmax(22em, -webkit-max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "50px [last]"
-PASS element.style.webkitGridTemplateRows is "minmax(-webkit-max-content, 5em) [last]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[first] 220px"
-PASS element.style.webkitGridTemplateColumns is "[first] minmax(22em, -webkit-min-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "50px [last]"
-PASS element.style.webkitGridTemplateRows is "minmax(-webkit-min-content, 5em) [last]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[first] 0px"
-PASS element.style.webkitGridTemplateColumns is "[first] minmax(-webkit-min-content, -webkit-max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "0px [last]"
-PASS element.style.webkitGridTemplateRows is "minmax(-webkit-max-content, -webkit-min-content) [last]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[first nav] 0px [last]"
-PASS element.style.webkitGridTemplateColumns is "[first nav] minmax(-webkit-min-content, -webkit-max-content) [last]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "[first nav] 0px [last]"
-PASS element.style.webkitGridTemplateRows is "[first nav] minmax(-webkit-max-content, -webkit-min-content) [last]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[first nav] 0px [nav] 0px [last]"
-PASS element.style.webkitGridTemplateColumns is "[first nav] minmax(-webkit-min-content, -webkit-max-content) [nav] auto [last]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "[first nav2] 0px [nav2] 15px [last]"
-PASS element.style.webkitGridTemplateRows is "[first nav2] minmax(-webkit-max-content, -webkit-min-content) [nav2] minmax(10px, 15px) [last]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[foo bar] 0px [foo] 0px [bar]"
-PASS element.style.webkitGridTemplateColumns is "[foo bar] auto [foo] auto [bar]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "[foo bar] 0px [foo] 0px [bar]"
-PASS element.style.webkitGridTemplateRows is "[foo bar] auto [foo] auto [bar]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[first] 0px [foo bar] 20px [foo bar] 20px"
-PASS element.style.webkitGridTemplateColumns is "[first] auto [foo bar] 20px [foo bar] 20px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "220px [foo] 300px [baz]"
-PASS element.style.webkitGridTemplateRows is "220px [foo] 50% [baz]"
+Test getting and setting grid-template-columns and grid-template-rows through JS
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] 18px"
+PASS element.style.gridTemplateColumns is "[first] 18px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "66px [last]"
+PASS element.style.gridTemplateRows is "66px [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] 440px"
+PASS element.style.gridTemplateColumns is "[first] 55%"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "240px [last]"
+PASS element.style.gridTemplateRows is "40% [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] 0px"
+PASS element.style.gridTemplateColumns is "[first] auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px [last]"
+PASS element.style.gridTemplateRows is "auto [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] 0px"
+PASS element.style.gridTemplateColumns is "[first] -webkit-min-content"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px [last]"
+PASS element.style.gridTemplateRows is "-webkit-min-content [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] 0px"
+PASS element.style.gridTemplateColumns is "[first] -webkit-max-content"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px [last]"
+PASS element.style.gridTemplateRows is "-webkit-max-content [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] 440px"
+PASS element.style.gridTemplateColumns is "[first] minmax(55%, 45px)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "240px [last]"
+PASS element.style.gridTemplateRows is "minmax(30px, 40%) [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] 220px"
+PASS element.style.gridTemplateColumns is "[first] minmax(22em, -webkit-max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "50px [last]"
+PASS element.style.gridTemplateRows is "minmax(-webkit-max-content, 5em) [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] 220px"
+PASS element.style.gridTemplateColumns is "[first] minmax(22em, -webkit-min-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "50px [last]"
+PASS element.style.gridTemplateRows is "minmax(-webkit-min-content, 5em) [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] 0px"
+PASS element.style.gridTemplateColumns is "[first] minmax(-webkit-min-content, -webkit-max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px [last]"
+PASS element.style.gridTemplateRows is "minmax(-webkit-max-content, -webkit-min-content) [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first nav] 0px [last]"
+PASS element.style.gridTemplateColumns is "[first nav] minmax(-webkit-min-content, -webkit-max-content) [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "[first nav] 0px [last]"
+PASS element.style.gridTemplateRows is "[first nav] minmax(-webkit-max-content, -webkit-min-content) [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first nav] 0px [nav] 0px [last]"
+PASS element.style.gridTemplateColumns is "[first nav] minmax(-webkit-min-content, -webkit-max-content) [nav] auto [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "[first nav2] 0px [nav2] 15px [last]"
+PASS element.style.gridTemplateRows is "[first nav2] minmax(-webkit-max-content, -webkit-min-content) [nav2] minmax(10px, 15px) [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[foo bar] 0px [foo] 0px [bar]"
+PASS element.style.gridTemplateColumns is "[foo bar] auto [foo] auto [bar]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "[foo bar] 0px [foo] 0px [bar]"
+PASS element.style.gridTemplateRows is "[foo bar] auto [foo] auto [bar]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] 0px [foo bar] 20px [foo bar] 20px"
+PASS element.style.gridTemplateColumns is "[first] auto [foo bar] 20px [foo bar] 20px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "220px [foo] 300px [baz]"
+PASS element.style.gridTemplateRows is "220px [foo] 50% [baz]"
Test getting invalid grid-template-columns and grid-template-rows set through CSS
-PASS window.getComputedStyle(gridWithoutBrackets, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithoutBrackets, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithInvalidNestedBrackets, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithInvalidNestedBrackets, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithUnbalancedBrackets, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithUnbalancedBrackets, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithMisplacedBrackets, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithMisplacedBrackets, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithContiguousBrackets, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithContiguousBrackets, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithoutBrackets, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithoutBrackets, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithInvalidNestedBrackets, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithInvalidNestedBrackets, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithUnbalancedBrackets, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithUnbalancedBrackets, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithMisplacedBrackets, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithMisplacedBrackets, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithContiguousBrackets, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithContiguousBrackets, '').getPropertyValue('grid-template-rows') is "none"
-Test getting and setting invalid -webkit-grid-template-columns and -webkit-grid-template-rows through JS
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+Test getting and setting invalid grid-template-columns and grid-template-rows through JS
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html b/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html
index 2d1bc88..814633c 100644
--- a/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html
@@ -11,62 +11,62 @@
height: 600px;
}
.gridItem {
- -webkit-grid-column: 1;
- -webkit-grid-row: 1;
+ grid-column: 1;
+ grid-row: 1;
height: 22px;
width: 77px;
}
.gridWithFixed {
- -webkit-grid-template-columns: [first] 10px;
- -webkit-grid-template-rows: [first] 15px;
+ grid-template-columns: [first] 10px;
+ grid-template-rows: [first] 15px;
}
.gridWithPercent {
- -webkit-grid-template-columns: 53% [last];
- -webkit-grid-template-rows: 27% [last];
+ grid-template-columns: 53% [last];
+ grid-template-rows: 27% [last];
}
.gridWithAuto {
- -webkit-grid-template-columns: [first] auto;
- -webkit-grid-template-rows: auto [last];
+ grid-template-columns: [first] auto;
+ grid-template-rows: auto [last];
}
.gridWithMinMax {
- -webkit-grid-template-columns: [first] minmax(10%, 15px);
- -webkit-grid-template-rows: minmax(20px, 50%) [last];
+ grid-template-columns: [first] minmax(10%, 15px);
+ grid-template-rows: minmax(20px, 50%) [last];
}
.gridWithFixedMultiple {
- -webkit-grid-template-columns: [first nav] 10px [last];
- -webkit-grid-template-rows: [first nav] 15px [last];
+ grid-template-columns: [first nav] 10px [last];
+ grid-template-rows: [first nav] 15px [last];
}
.gridWithPercentageSameStringMultipleTimes {
- -webkit-grid-template-columns: [first nav] 10% [nav] 15% [last];
- -webkit-grid-template-rows: [first nav2] 25% [nav2] 75% [last];
+ grid-template-columns: [first nav] 10% [nav] 15% [last];
+ grid-template-rows: [first nav2] 25% [nav2] 75% [last];
}
.gridWithRepeat {
- -webkit-grid-template-columns: [first] 10px repeat(2, [nav nav2] 50%);
- -webkit-grid-template-rows: 100px repeat(2, [nav nav2] 25%) [last];
+ grid-template-columns: [first] 10px repeat(2, [nav nav2] 50%);
+ grid-template-rows: 100px repeat(2, [nav nav2] 25%) [last];
}
.gridWithEmptyBrackets {
- -webkit-grid-template-columns: [] 10px;
- -webkit-grid-template-rows: 20px [ ] 50px [];
+ grid-template-columns: [] 10px;
+ grid-template-rows: 20px [ ] 50px [];
}
.gridWithoutBrackets {
- -webkit-grid-template-columns: first nav 10px;
- -webkit-grid-template-rows: first 50% last;
+ grid-template-columns: first nav 10px;
+ grid-template-rows: first 50% last;
}
.gridWithInvalidNestedBrackets {
- -webkit-grid-template-columns: [first [nav]] 10px [last];
- -webkit-grid-template-rows: [first] 50% [last [nav] nav2];
+ grid-template-columns: [first [nav]] 10px [last];
+ grid-template-rows: [first] 50% [last [nav] nav2];
}
.gridWithUnbalancedBrackets {
- -webkit-grid-template-columns: [first nav 10px;
- -webkit-grid-template-rows: [first] 50% last];
+ grid-template-columns: [first nav 10px;
+ grid-template-rows: [first] 50% last];
}
.gridWithMisplacedBrackets {
- -webkit-grid-template-columns: [first 10px] 50%;
- -webkit-grid-template-rows: [first] [nav 50%];
+ grid-template-columns: [first 10px] 50%;
+ grid-template-rows: [first] [nav 50%];
}
.gridWithContiguousBrackets {
- -webkit-grid-template-columns: [first] [nav] 10px;
- -webkit-grid-template-rows: 50px [nav nav2] [middle] 10px;
+ grid-template-columns: [first] [nav] 10px;
+ grid-template-rows: 50px [nav nav2] [middle] 10px;
}
</style>
<script src="../../resources/js-test-pre.js"></script>
@@ -97,7 +97,7 @@
<script>
description('Test that setting and getting grid-template-columns and grid-template-rows works as expected');
- debug("Test getting -webkit-grid-template-columns and -webkit-grid-template-rows set through CSS");
+ debug("Test getting grid-template-columns and grid-template-rows set through CSS");
testGridTemplatesValues(document.getElementById("gridWithFixedElement"), "[first] 10px", "[first] 15px");
testGridTemplatesValues(document.getElementById("gridWithPercentElement"), "424px [last]", "162px [last]");
testGridTemplatesValues(document.getElementById("gridWithPercentWithoutSize"), "0px [last]", "0px [last]");
@@ -111,7 +111,7 @@
testGridTemplatesValues(document.getElementById("gridWithEmptyBrackets"), "10px", "20px 50px");
debug("");
- debug("Test getting and setting -webkit-grid-template-columns and -webkit-grid-template-rows through JS");
+ debug("Test getting and setting grid-template-columns and grid-template-rows through JS");
testGridTemplatesSetJSValues("[first] 18px", "66px [last]", "[first] 18px", "66px [last]", "[first] 18px", "66px [last]");
testGridTemplatesSetJSValues("[first] 55%", "40% [last]", "[first] 440px", "240px [last]", "[first] 55%", "40% [last]");
testGridTemplatesSetJSValues("[first] auto", "auto [last]", "[first] 0px", "0px [last]", "[first] auto", "auto [last]");
@@ -135,7 +135,7 @@
testGridTemplatesValues(document.getElementById("gridWithContiguousBrackets"), "none", "none");
debug("");
- debug("Test getting and setting invalid -webkit-grid-template-columns and -webkit-grid-template-rows through JS");
+ debug("Test getting and setting invalid grid-template-columns and grid-template-rows through JS");
testGridTemplatesSetBadJSValues("foo", "bar");
testGridTemplatesSetBadJSValues("foo bar", "bar foo");
testGridTemplatesSetBadJSValues("[foo]", "[bar");
diff --git a/LayoutTests/fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks-expected.txt b/LayoutTests/fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks-expected.txt
index f31e707..8830aaf 100644
--- a/LayoutTests/fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks-expected.txt
@@ -3,22 +3,22 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS window.getComputedStyle(gridOneColumnSingle, '').getPropertyValue('-webkit-grid-template-columns') is "[a] 200px [b]"
-PASS window.getComputedStyle(gridOneColumnSingle, '').getPropertyValue('-webkit-grid-template-rows') is "[x] 50px [y] 50px 50px 50px"
-PASS window.getComputedStyle(gridTwoColumnsSingle, '').getPropertyValue('-webkit-grid-template-columns') is "[a] 200px [b] 150px"
-PASS window.getComputedStyle(gridTwoColumnsSingle, '').getPropertyValue('-webkit-grid-template-rows') is "[x] 50px [y] 50px"
-PASS window.getComputedStyle(gridThreeColumnsSingle, '').getPropertyValue('-webkit-grid-template-columns') is "[a] 200px [b] 150px 100px"
-PASS window.getComputedStyle(gridThreeColumnsSingle, '').getPropertyValue('-webkit-grid-template-rows') is "[x] 50px [y] 50px"
-PASS window.getComputedStyle(gridFourColumnsSingle, '').getPropertyValue('-webkit-grid-template-columns') is "[a] 200px [b] 150px 100px 50px"
-PASS window.getComputedStyle(gridFourColumnsSingle, '').getPropertyValue('-webkit-grid-template-rows') is "[x] 50px [y]"
-PASS window.getComputedStyle(gridOneColumnMultiple, '').getPropertyValue('-webkit-grid-template-columns') is "[a b c] 200px [d e]"
-PASS window.getComputedStyle(gridOneColumnMultiple, '').getPropertyValue('-webkit-grid-template-rows') is "[x y z] 50px [v w] 50px 50px 50px"
-PASS window.getComputedStyle(gridTwoColumnsMultiple, '').getPropertyValue('-webkit-grid-template-columns') is "[a b c] 200px [d e] 150px"
-PASS window.getComputedStyle(gridTwoColumnsMultiple, '').getPropertyValue('-webkit-grid-template-rows') is "[x y z] 50px [v w] 50px"
-PASS window.getComputedStyle(gridThreeColumnsMultiple, '').getPropertyValue('-webkit-grid-template-columns') is "[a b c] 200px [d e] 150px 100px"
-PASS window.getComputedStyle(gridThreeColumnsMultiple, '').getPropertyValue('-webkit-grid-template-rows') is "[x y z] 50px [v w] 50px"
-PASS window.getComputedStyle(gridFourColumnsMultiple, '').getPropertyValue('-webkit-grid-template-columns') is "[a b c] 200px [d e] 150px 100px 50px"
-PASS window.getComputedStyle(gridFourColumnsMultiple, '').getPropertyValue('-webkit-grid-template-rows') is "[x y z] 50px [v w]"
+PASS window.getComputedStyle(gridOneColumnSingle, '').getPropertyValue('grid-template-columns') is "[a] 200px [b]"
+PASS window.getComputedStyle(gridOneColumnSingle, '').getPropertyValue('grid-template-rows') is "[x] 50px [y] 50px 50px 50px"
+PASS window.getComputedStyle(gridTwoColumnsSingle, '').getPropertyValue('grid-template-columns') is "[a] 200px [b] 150px"
+PASS window.getComputedStyle(gridTwoColumnsSingle, '').getPropertyValue('grid-template-rows') is "[x] 50px [y] 50px"
+PASS window.getComputedStyle(gridThreeColumnsSingle, '').getPropertyValue('grid-template-columns') is "[a] 200px [b] 150px 100px"
+PASS window.getComputedStyle(gridThreeColumnsSingle, '').getPropertyValue('grid-template-rows') is "[x] 50px [y] 50px"
+PASS window.getComputedStyle(gridFourColumnsSingle, '').getPropertyValue('grid-template-columns') is "[a] 200px [b] 150px 100px 50px"
+PASS window.getComputedStyle(gridFourColumnsSingle, '').getPropertyValue('grid-template-rows') is "[x] 50px [y]"
+PASS window.getComputedStyle(gridOneColumnMultiple, '').getPropertyValue('grid-template-columns') is "[a b c] 200px [d e]"
+PASS window.getComputedStyle(gridOneColumnMultiple, '').getPropertyValue('grid-template-rows') is "[x y z] 50px [v w] 50px 50px 50px"
+PASS window.getComputedStyle(gridTwoColumnsMultiple, '').getPropertyValue('grid-template-columns') is "[a b c] 200px [d e] 150px"
+PASS window.getComputedStyle(gridTwoColumnsMultiple, '').getPropertyValue('grid-template-rows') is "[x y z] 50px [v w] 50px"
+PASS window.getComputedStyle(gridThreeColumnsMultiple, '').getPropertyValue('grid-template-columns') is "[a b c] 200px [d e] 150px 100px"
+PASS window.getComputedStyle(gridThreeColumnsMultiple, '').getPropertyValue('grid-template-rows') is "[x y z] 50px [v w] 50px"
+PASS window.getComputedStyle(gridFourColumnsMultiple, '').getPropertyValue('grid-template-columns') is "[a b c] 200px [d e] 150px 100px 50px"
+PASS window.getComputedStyle(gridFourColumnsMultiple, '').getPropertyValue('grid-template-rows') is "[x y z] 50px [v w]"
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks.html b/LayoutTests/fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks.html
index bc9d96c..d521b7c 100644
--- a/LayoutTests/fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks.html
+++ b/LayoutTests/fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks.html
@@ -7,13 +7,13 @@
}
.singleNamedGridLines {
- -webkit-grid-template-columns: [a] auto [b];
- -webkit-grid-template-rows: [x] auto [y];
+ grid-template-columns: [a] auto [b];
+ grid-template-rows: [x] auto [y];
}
.multipleNamedGridLines {
- -webkit-grid-template-columns: [a b c] auto [d e];
- -webkit-grid-template-rows: [x y z] auto [v w];
+ grid-template-columns: [a b c] auto [d e];
+ grid-template-rows: [x y z] auto [v w];
}
</style>
<script src="../../resources/js-test.js"></script>
diff --git a/LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-dynamic-get-set.html b/LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-dynamic-get-set.html
index f769927..5c57656 100644
--- a/LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-dynamic-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-dynamic-get-set.html
@@ -10,15 +10,15 @@
var gridContainer = document.getElementById("gridContainer");
var gridElement = document.createElement("div");
gridElement.className = "grid";
- gridElement.style.webkitGridAutoFlow = "dense";
+ gridElement.style.gridAutoFlow = "dense";
for (var key in gridDefinitions) {
if (key == "rows")
- gridElement.style.webkitGridTemplateRows = gridDefinitions[key];
+ gridElement.style.gridTemplateRows = gridDefinitions[key];
else if (key == "columns")
- gridElement.style.webkitGridTemplateColumns = gridDefinitions[key];
+ gridElement.style.gridTemplateColumns = gridDefinitions[key];
else
- gridElement.style.webkitGridTemplateAreas = gridDefinitions[key];
+ gridElement.style.gridTemplateAreas = gridDefinitions[key];
}
for (var i in itemsDefinitions) {
@@ -27,9 +27,9 @@
gridItem.className = "sizedToGridArea";
if (itemDefinition.row)
- gridItem.style.webkitGridRow = itemDefinition.row;
+ gridItem.style.gridRow = itemDefinition.row;
if (itemDefinition.column)
- gridItem.style.webkitGridColumn = itemDefinition.column;
+ gridItem.style.gridColumn = itemDefinition.column;
gridItem.setAttribute("data-offset-x", itemDefinition.x);
gridItem.setAttribute("data-offset-y", itemDefinition.y);
diff --git a/LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-get-set-expected.txt b/LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-get-set-expected.txt
index 27fef39..c6c90b4 100644
--- a/LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-get-set-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-get-set-expected.txt
@@ -1,315 +1,315 @@
-PASS getComputedStyle(GridUniqueColumnB, '').getPropertyValue('-webkit-grid-column') is "b / b"
-PASS getComputedStyle(GridUniqueColumnB, '').getPropertyValue('-webkit-grid-column-start') is "b"
-PASS getComputedStyle(GridUniqueColumnB, '').getPropertyValue('-webkit-grid-column-end') is "b"
-PASS getComputedStyle(GridUniqueColumnB, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(GridUniqueColumnB, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(GridUniqueColumnB, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(GridUniqueRowE, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(GridUniqueRowE, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(GridUniqueRowE, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(GridUniqueRowE, '').getPropertyValue('-webkit-grid-row') is "e / e"
-PASS getComputedStyle(GridUniqueRowE, '').getPropertyValue('-webkit-grid-row-start') is "e"
-PASS getComputedStyle(GridUniqueRowE, '').getPropertyValue('-webkit-grid-row-end') is "e"
-PASS getComputedStyle(GridUniqueColumnBStart, '').getPropertyValue('-webkit-grid-column') is "b-start / b-start"
-PASS getComputedStyle(GridUniqueColumnBStart, '').getPropertyValue('-webkit-grid-column-start') is "b-start"
-PASS getComputedStyle(GridUniqueColumnBStart, '').getPropertyValue('-webkit-grid-column-end') is "b-start"
-PASS getComputedStyle(GridUniqueColumnBStart, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(GridUniqueColumnBStart, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(GridUniqueColumnBStart, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(GridUniqueRowGStart, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(GridUniqueRowGStart, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(GridUniqueRowGStart, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(GridUniqueRowGStart, '').getPropertyValue('-webkit-grid-row') is "g-start / g-start"
-PASS getComputedStyle(GridUniqueRowGStart, '').getPropertyValue('-webkit-grid-row-start') is "g-start"
-PASS getComputedStyle(GridUniqueRowGStart, '').getPropertyValue('-webkit-grid-row-end') is "g-start"
-PASS getComputedStyle(GridUniqueColumnBD, '').getPropertyValue('-webkit-grid-column') is "b / d"
-PASS getComputedStyle(GridUniqueColumnBD, '').getPropertyValue('-webkit-grid-column-start') is "b"
-PASS getComputedStyle(GridUniqueColumnBD, '').getPropertyValue('-webkit-grid-column-end') is "d"
-PASS getComputedStyle(GridUniqueColumnBD, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(GridUniqueColumnBD, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(GridUniqueColumnBD, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(GridUniqueRowGH, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(GridUniqueRowGH, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(GridUniqueRowGH, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(GridUniqueRowGH, '').getPropertyValue('-webkit-grid-row') is "g / h"
-PASS getComputedStyle(GridUniqueRowGH, '').getPropertyValue('-webkit-grid-row-start') is "g"
-PASS getComputedStyle(GridUniqueRowGH, '').getPropertyValue('-webkit-grid-row-end') is "h"
-PASS getComputedStyle(GridUniqueColumnCRowF, '').getPropertyValue('-webkit-grid-column') is "c / c"
-PASS getComputedStyle(GridUniqueColumnCRowF, '').getPropertyValue('-webkit-grid-column-start') is "c"
-PASS getComputedStyle(GridUniqueColumnCRowF, '').getPropertyValue('-webkit-grid-column-end') is "c"
-PASS getComputedStyle(GridUniqueColumnCRowF, '').getPropertyValue('-webkit-grid-row') is "f / f"
-PASS getComputedStyle(GridUniqueColumnCRowF, '').getPropertyValue('-webkit-grid-row-start') is "f"
-PASS getComputedStyle(GridUniqueColumnCRowF, '').getPropertyValue('-webkit-grid-row-end') is "f"
-PASS getComputedStyle(GridUniqueColumnBInteger, '').getPropertyValue('-webkit-grid-column') is "b / 4"
-PASS getComputedStyle(GridUniqueColumnBInteger, '').getPropertyValue('-webkit-grid-column-start') is "b"
-PASS getComputedStyle(GridUniqueColumnBInteger, '').getPropertyValue('-webkit-grid-column-end') is "4"
-PASS getComputedStyle(GridUniqueColumnBInteger, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(GridUniqueColumnBInteger, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(GridUniqueColumnBInteger, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(GridUniqueRowIntegerH, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(GridUniqueRowIntegerH, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(GridUniqueRowIntegerH, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(GridUniqueRowIntegerH, '').getPropertyValue('-webkit-grid-row') is "3 / h"
-PASS getComputedStyle(GridUniqueRowIntegerH, '').getPropertyValue('-webkit-grid-row-start') is "3"
-PASS getComputedStyle(GridUniqueRowIntegerH, '').getPropertyValue('-webkit-grid-row-end') is "h"
-PASS getComputedStyle(GridUniqueColumnIntegerRowG, '').getPropertyValue('-webkit-grid-column') is "2 / auto"
-PASS getComputedStyle(GridUniqueColumnIntegerRowG, '').getPropertyValue('-webkit-grid-column-start') is "2"
-PASS getComputedStyle(GridUniqueColumnIntegerRowG, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(GridUniqueColumnIntegerRowG, '').getPropertyValue('-webkit-grid-row') is "g / g"
-PASS getComputedStyle(GridUniqueColumnIntegerRowG, '').getPropertyValue('-webkit-grid-row-start') is "g"
-PASS getComputedStyle(GridUniqueColumnIntegerRowG, '').getPropertyValue('-webkit-grid-row-end') is "g"
-PASS getComputedStyle(GridUniqueColumnARowInteger, '').getPropertyValue('-webkit-grid-column') is "a / a"
-PASS getComputedStyle(GridUniqueColumnARowInteger, '').getPropertyValue('-webkit-grid-column-start') is "a"
-PASS getComputedStyle(GridUniqueColumnARowInteger, '').getPropertyValue('-webkit-grid-column-end') is "a"
-PASS getComputedStyle(GridUniqueColumnARowInteger, '').getPropertyValue('-webkit-grid-row') is "2 / auto"
-PASS getComputedStyle(GridUniqueColumnARowInteger, '').getPropertyValue('-webkit-grid-row-start') is "2"
-PASS getComputedStyle(GridUniqueColumnARowInteger, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(GridUniqueColumnCStart, '').getPropertyValue('-webkit-grid-column') is "c-start / c-start"
-PASS getComputedStyle(GridUniqueColumnCStart, '').getPropertyValue('-webkit-grid-column-start') is "c-start"
-PASS getComputedStyle(GridUniqueColumnCStart, '').getPropertyValue('-webkit-grid-column-end') is "c-start"
-PASS getComputedStyle(GridUniqueColumnCStart, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(GridUniqueColumnCStart, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(GridUniqueColumnCStart, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(GridUniqueRowFStart, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(GridUniqueRowFStart, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(GridUniqueRowFStart, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(GridUniqueRowFStart, '').getPropertyValue('-webkit-grid-row') is "f-start / f-start"
-PASS getComputedStyle(GridUniqueRowFStart, '').getPropertyValue('-webkit-grid-row-start') is "f-start"
-PASS getComputedStyle(GridUniqueRowFStart, '').getPropertyValue('-webkit-grid-row-end') is "f-start"
-PASS getComputedStyle(GridUniqueColumnCStartRowFEnd, '').getPropertyValue('-webkit-grid-column') is "c-start / c-start"
-PASS getComputedStyle(GridUniqueColumnCStartRowFEnd, '').getPropertyValue('-webkit-grid-column-start') is "c-start"
-PASS getComputedStyle(GridUniqueColumnCStartRowFEnd, '').getPropertyValue('-webkit-grid-column-end') is "c-start"
-PASS getComputedStyle(GridUniqueColumnCStartRowFEnd, '').getPropertyValue('-webkit-grid-row') is "f-end / f-end"
-PASS getComputedStyle(GridUniqueColumnCStartRowFEnd, '').getPropertyValue('-webkit-grid-row-start') is "f-end"
-PASS getComputedStyle(GridUniqueColumnCStartRowFEnd, '').getPropertyValue('-webkit-grid-row-end') is "f-end"
-PASS getComputedStyle(GridUniqueColumnBEndRowHStart, '').getPropertyValue('-webkit-grid-column') is "b-end / b-end"
-PASS getComputedStyle(GridUniqueColumnBEndRowHStart, '').getPropertyValue('-webkit-grid-column-start') is "b-end"
-PASS getComputedStyle(GridUniqueColumnBEndRowHStart, '').getPropertyValue('-webkit-grid-column-end') is "b-end"
-PASS getComputedStyle(GridUniqueColumnBEndRowHStart, '').getPropertyValue('-webkit-grid-row') is "h-start / h-start"
-PASS getComputedStyle(GridUniqueColumnBEndRowHStart, '').getPropertyValue('-webkit-grid-row-start') is "h-start"
-PASS getComputedStyle(GridUniqueColumnBEndRowHStart, '').getPropertyValue('-webkit-grid-row-end') is "h-start"
-PASS getComputedStyle(GridAreasNoNamesColumnAStartRowDStart, '').getPropertyValue('-webkit-grid-column') is "a-start / a-start"
-PASS getComputedStyle(GridAreasNoNamesColumnAStartRowDStart, '').getPropertyValue('-webkit-grid-column-start') is "a-start"
-PASS getComputedStyle(GridAreasNoNamesColumnAStartRowDStart, '').getPropertyValue('-webkit-grid-column-end') is "a-start"
-PASS getComputedStyle(GridAreasNoNamesColumnAStartRowDStart, '').getPropertyValue('-webkit-grid-row') is "d-start / d-start"
-PASS getComputedStyle(GridAreasNoNamesColumnAStartRowDStart, '').getPropertyValue('-webkit-grid-row-start') is "d-start"
-PASS getComputedStyle(GridAreasNoNamesColumnAStartRowDStart, '').getPropertyValue('-webkit-grid-row-end') is "d-start"
-PASS getComputedStyle(GridAreasNoNamesColumnAStartRowD, '').getPropertyValue('-webkit-grid-column') is "a-start / a-start"
-PASS getComputedStyle(GridAreasNoNamesColumnAStartRowD, '').getPropertyValue('-webkit-grid-column-start') is "a-start"
-PASS getComputedStyle(GridAreasNoNamesColumnAStartRowD, '').getPropertyValue('-webkit-grid-column-end') is "a-start"
-PASS getComputedStyle(GridAreasNoNamesColumnAStartRowD, '').getPropertyValue('-webkit-grid-row') is "d / d"
-PASS getComputedStyle(GridAreasNoNamesColumnAStartRowD, '').getPropertyValue('-webkit-grid-row-start') is "d"
-PASS getComputedStyle(GridAreasNoNamesColumnAStartRowD, '').getPropertyValue('-webkit-grid-row-end') is "d"
-PASS getComputedStyle(GridAreasNoNamesColumnDStartRowCStart, '').getPropertyValue('-webkit-grid-column') is "d-start / d-start"
-PASS getComputedStyle(GridAreasNoNamesColumnDStartRowCStart, '').getPropertyValue('-webkit-grid-column-start') is "d-start"
-PASS getComputedStyle(GridAreasNoNamesColumnDStartRowCStart, '').getPropertyValue('-webkit-grid-column-end') is "d-start"
-PASS getComputedStyle(GridAreasNoNamesColumnDStartRowCStart, '').getPropertyValue('-webkit-grid-row') is "c-start / c-start"
-PASS getComputedStyle(GridAreasNoNamesColumnDStartRowCStart, '').getPropertyValue('-webkit-grid-row-start') is "c-start"
-PASS getComputedStyle(GridAreasNoNamesColumnDStartRowCStart, '').getPropertyValue('-webkit-grid-row-end') is "c-start"
-PASS getComputedStyle(GridAreasNoNamesColumnD, '').getPropertyValue('-webkit-grid-column') is "d / d"
-PASS getComputedStyle(GridAreasNoNamesColumnD, '').getPropertyValue('-webkit-grid-column-start') is "d"
-PASS getComputedStyle(GridAreasNoNamesColumnD, '').getPropertyValue('-webkit-grid-column-end') is "d"
-PASS getComputedStyle(GridAreasNoNamesColumnD, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(GridAreasNoNamesColumnD, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(GridAreasNoNamesColumnD, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(GridAreasNoNamesRowD, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(GridAreasNoNamesRowD, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(GridAreasNoNamesRowD, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(GridAreasNoNamesRowD, '').getPropertyValue('-webkit-grid-row') is "d / d"
-PASS getComputedStyle(GridAreasNoNamesRowD, '').getPropertyValue('-webkit-grid-row-start') is "d"
-PASS getComputedStyle(GridAreasNoNamesRowD, '').getPropertyValue('-webkit-grid-row-end') is "d"
-PASS getComputedStyle(GridAreasNoNamesColumnC, '').getPropertyValue('-webkit-grid-column') is "c / c"
-PASS getComputedStyle(GridAreasNoNamesColumnC, '').getPropertyValue('-webkit-grid-column-start') is "c"
-PASS getComputedStyle(GridAreasNoNamesColumnC, '').getPropertyValue('-webkit-grid-column-end') is "c"
-PASS getComputedStyle(GridAreasNoNamesColumnC, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(GridAreasNoNamesColumnC, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(GridAreasNoNamesColumnC, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(GridAreasNoNamesRowC, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(GridAreasNoNamesRowC, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(GridAreasNoNamesRowC, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(GridAreasNoNamesRowC, '').getPropertyValue('-webkit-grid-row') is "c / c"
-PASS getComputedStyle(GridAreasNoNamesRowC, '').getPropertyValue('-webkit-grid-row-start') is "c"
-PASS getComputedStyle(GridAreasNoNamesRowC, '').getPropertyValue('-webkit-grid-row-end') is "c"
-PASS getComputedStyle(GridAreasNoNamesColumnA, '').getPropertyValue('-webkit-grid-column') is "a / a"
-PASS getComputedStyle(GridAreasNoNamesColumnA, '').getPropertyValue('-webkit-grid-column-start') is "a"
-PASS getComputedStyle(GridAreasNoNamesColumnA, '').getPropertyValue('-webkit-grid-column-end') is "a"
-PASS getComputedStyle(GridAreasNoNamesColumnA, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(GridAreasNoNamesColumnA, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(GridAreasNoNamesColumnA, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(GridAreasNoNamesRowA, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(GridAreasNoNamesRowA, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(GridAreasNoNamesRowA, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(GridAreasNoNamesRowA, '').getPropertyValue('-webkit-grid-row') is "a / a"
-PASS getComputedStyle(GridAreasNoNamesRowA, '').getPropertyValue('-webkit-grid-row-start') is "a"
-PASS getComputedStyle(GridAreasNoNamesRowA, '').getPropertyValue('-webkit-grid-row-end') is "a"
-PASS getComputedStyle(GridAreasNoNamesColumnARowA, '').getPropertyValue('-webkit-grid-column') is "a / a"
-PASS getComputedStyle(GridAreasNoNamesColumnARowA, '').getPropertyValue('-webkit-grid-column-start') is "a"
-PASS getComputedStyle(GridAreasNoNamesColumnARowA, '').getPropertyValue('-webkit-grid-column-end') is "a"
-PASS getComputedStyle(GridAreasNoNamesColumnARowA, '').getPropertyValue('-webkit-grid-row') is "a / a"
-PASS getComputedStyle(GridAreasNoNamesColumnARowA, '').getPropertyValue('-webkit-grid-row-start') is "a"
-PASS getComputedStyle(GridAreasNoNamesColumnARowA, '').getPropertyValue('-webkit-grid-row-end') is "a"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnD, '').getPropertyValue('-webkit-grid-column') is "d / d"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnD, '').getPropertyValue('-webkit-grid-column-start') is "d"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnD, '').getPropertyValue('-webkit-grid-column-end') is "d"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnD, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnD, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnD, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(GridAreasNamedLineAfterRowD, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(GridAreasNamedLineAfterRowD, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(GridAreasNamedLineAfterRowD, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(GridAreasNamedLineAfterRowD, '').getPropertyValue('-webkit-grid-row') is "d / d"
-PASS getComputedStyle(GridAreasNamedLineAfterRowD, '').getPropertyValue('-webkit-grid-row-start') is "d"
-PASS getComputedStyle(GridAreasNamedLineAfterRowD, '').getPropertyValue('-webkit-grid-row-end') is "d"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnC, '').getPropertyValue('-webkit-grid-column') is "c / c"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnC, '').getPropertyValue('-webkit-grid-column-start') is "c"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnC, '').getPropertyValue('-webkit-grid-column-end') is "c"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnC, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnC, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnC, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(GridAreasNamedLineAfterRowC, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(GridAreasNamedLineAfterRowC, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(GridAreasNamedLineAfterRowC, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(GridAreasNamedLineAfterRowC, '').getPropertyValue('-webkit-grid-row') is "c / c"
-PASS getComputedStyle(GridAreasNamedLineAfterRowC, '').getPropertyValue('-webkit-grid-row-start') is "c"
-PASS getComputedStyle(GridAreasNamedLineAfterRowC, '').getPropertyValue('-webkit-grid-row-end') is "c"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnStartAStart, '').getPropertyValue('-webkit-grid-column') is "a-start / auto"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnStartAStart, '').getPropertyValue('-webkit-grid-column-start') is "a-start"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnStartAStart, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnStartAStart, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnStartAStart, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnStartAStart, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(GridAreasNamedLineAfterRowStartCStart, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(GridAreasNamedLineAfterRowStartCStart, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(GridAreasNamedLineAfterRowStartCStart, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(GridAreasNamedLineAfterRowStartCStart, '').getPropertyValue('-webkit-grid-row') is "c-start / auto"
-PASS getComputedStyle(GridAreasNamedLineAfterRowStartCStart, '').getPropertyValue('-webkit-grid-row-start') is "c-start"
-PASS getComputedStyle(GridAreasNamedLineAfterRowStartCStart, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnA, '').getPropertyValue('-webkit-grid-column') is "a / a"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnA, '').getPropertyValue('-webkit-grid-column-start') is "a"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnA, '').getPropertyValue('-webkit-grid-column-end') is "a"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnA, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnA, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnA, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnARowD, '').getPropertyValue('-webkit-grid-column') is "a / a"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnARowD, '').getPropertyValue('-webkit-grid-column-start') is "a"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnARowD, '').getPropertyValue('-webkit-grid-column-end') is "a"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnARowD, '').getPropertyValue('-webkit-grid-row') is "d / d"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnARowD, '').getPropertyValue('-webkit-grid-row-start') is "d"
-PASS getComputedStyle(GridAreasNamedLineAfterColumnARowD, '').getPropertyValue('-webkit-grid-row-end') is "d"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnD, '').getPropertyValue('-webkit-grid-column') is "d / d"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnD, '').getPropertyValue('-webkit-grid-column-start') is "d"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnD, '').getPropertyValue('-webkit-grid-column-end') is "d"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnD, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnD, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnD, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(GridAreasNamedLineBeforeRowD, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(GridAreasNamedLineBeforeRowD, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(GridAreasNamedLineBeforeRowD, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(GridAreasNamedLineBeforeRowD, '').getPropertyValue('-webkit-grid-row') is "d / d"
-PASS getComputedStyle(GridAreasNamedLineBeforeRowD, '').getPropertyValue('-webkit-grid-row-start') is "d"
-PASS getComputedStyle(GridAreasNamedLineBeforeRowD, '').getPropertyValue('-webkit-grid-row-end') is "d"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnC, '').getPropertyValue('-webkit-grid-column') is "c / c"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnC, '').getPropertyValue('-webkit-grid-column-start') is "c"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnC, '').getPropertyValue('-webkit-grid-column-end') is "c"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnC, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnC, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnC, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(GridAreasNamedLineBeforeRowC, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(GridAreasNamedLineBeforeRowC, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(GridAreasNamedLineBeforeRowC, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(GridAreasNamedLineBeforeRowC, '').getPropertyValue('-webkit-grid-row') is "c / c"
-PASS getComputedStyle(GridAreasNamedLineBeforeRowC, '').getPropertyValue('-webkit-grid-row-start') is "c"
-PASS getComputedStyle(GridAreasNamedLineBeforeRowC, '').getPropertyValue('-webkit-grid-row-end') is "c"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnStartDStart, '').getPropertyValue('-webkit-grid-column') is "d-start / auto"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnStartDStart, '').getPropertyValue('-webkit-grid-column-start') is "d-start"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnStartDStart, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnStartDStart, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnStartDStart, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnStartDStart, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(GridAreasNamedLineBeforeRowStartDStart, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(GridAreasNamedLineBeforeRowStartDStart, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(GridAreasNamedLineBeforeRowStartDStart, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(GridAreasNamedLineBeforeRowStartDStart, '').getPropertyValue('-webkit-grid-row') is "d-start / auto"
-PASS getComputedStyle(GridAreasNamedLineBeforeRowStartDStart, '').getPropertyValue('-webkit-grid-row-start') is "d-start"
-PASS getComputedStyle(GridAreasNamedLineBeforeRowStartDStart, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnA, '').getPropertyValue('-webkit-grid-column') is "a / a"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnA, '').getPropertyValue('-webkit-grid-column-start') is "a"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnA, '').getPropertyValue('-webkit-grid-column-end') is "a"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnA, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnA, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnA, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnARowD, '').getPropertyValue('-webkit-grid-column') is "a / a"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnARowD, '').getPropertyValue('-webkit-grid-column-start') is "a"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnARowD, '').getPropertyValue('-webkit-grid-column-end') is "a"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnARowD, '').getPropertyValue('-webkit-grid-row') is "d / d"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnARowD, '').getPropertyValue('-webkit-grid-row-start') is "d"
-PASS getComputedStyle(GridAreasNamedLineBeforeColumnARowD, '').getPropertyValue('-webkit-grid-row-end') is "d"
-PASS getComputedStyle(GridAreasNoNamesColumnAAStartRowDStart, '').getPropertyValue('-webkit-grid-column') is "a / a-start"
-PASS getComputedStyle(GridAreasNoNamesColumnAAStartRowDStart, '').getPropertyValue('-webkit-grid-column-start') is "a"
-PASS getComputedStyle(GridAreasNoNamesColumnAAStartRowDStart, '').getPropertyValue('-webkit-grid-column-end') is "a-start"
-PASS getComputedStyle(GridAreasNoNamesColumnAAStartRowDStart, '').getPropertyValue('-webkit-grid-row') is "d-start / d-start"
-PASS getComputedStyle(GridAreasNoNamesColumnAAStartRowDStart, '').getPropertyValue('-webkit-grid-row-start') is "d-start"
-PASS getComputedStyle(GridAreasNoNamesColumnAAStartRowDStart, '').getPropertyValue('-webkit-grid-row-end') is "d-start"
-PASS getComputedStyle(GridAreasNoNamesColumnDDStartRowCStart, '').getPropertyValue('-webkit-grid-column') is "d / d-start"
-PASS getComputedStyle(GridAreasNoNamesColumnDDStartRowCStart, '').getPropertyValue('-webkit-grid-column-start') is "d"
-PASS getComputedStyle(GridAreasNoNamesColumnDDStartRowCStart, '').getPropertyValue('-webkit-grid-column-end') is "d-start"
-PASS getComputedStyle(GridAreasNoNamesColumnDDStartRowCStart, '').getPropertyValue('-webkit-grid-row') is "c-start / c-start"
-PASS getComputedStyle(GridAreasNoNamesColumnDDStartRowCStart, '').getPropertyValue('-webkit-grid-row-start') is "c-start"
-PASS getComputedStyle(GridAreasNoNamesColumnDDStartRowCStart, '').getPropertyValue('-webkit-grid-row-end') is "c-start"
-PASS getComputedStyle(GridAreasNoNamesColumnCRowAAStart, '').getPropertyValue('-webkit-grid-column') is "c / c"
-PASS getComputedStyle(GridAreasNoNamesColumnCRowAAStart, '').getPropertyValue('-webkit-grid-column-start') is "c"
-PASS getComputedStyle(GridAreasNoNamesColumnCRowAAStart, '').getPropertyValue('-webkit-grid-column-end') is "c"
-PASS getComputedStyle(GridAreasNoNamesColumnCRowAAStart, '').getPropertyValue('-webkit-grid-row') is "a / a-start"
-PASS getComputedStyle(GridAreasNoNamesColumnCRowAAStart, '').getPropertyValue('-webkit-grid-row-start') is "a"
-PASS getComputedStyle(GridAreasNoNamesColumnCRowAAStart, '').getPropertyValue('-webkit-grid-row-end') is "a-start"
-PASS getComputedStyle(GridAreasNoNamesColumnDRowCCStart, '').getPropertyValue('-webkit-grid-column') is "d / d"
-PASS getComputedStyle(GridAreasNoNamesColumnDRowCCStart, '').getPropertyValue('-webkit-grid-column-start') is "d"
-PASS getComputedStyle(GridAreasNoNamesColumnDRowCCStart, '').getPropertyValue('-webkit-grid-column-end') is "d"
-PASS getComputedStyle(GridAreasNoNamesColumnDRowCCStart, '').getPropertyValue('-webkit-grid-row') is "c / c-start"
-PASS getComputedStyle(GridAreasNoNamesColumnDRowCCStart, '').getPropertyValue('-webkit-grid-row-start') is "c"
-PASS getComputedStyle(GridAreasNoNamesColumnDRowCCStart, '').getPropertyValue('-webkit-grid-row-end') is "c-start"
-PASS getComputedStyle(GridAreasEnd, '').getPropertyValue('-webkit-grid-column') is "a / a"
-PASS getComputedStyle(GridAreasEnd, '').getPropertyValue('-webkit-grid-column-start') is "a"
-PASS getComputedStyle(GridAreasEnd, '').getPropertyValue('-webkit-grid-column-end') is "a"
-PASS getComputedStyle(GridAreasEnd, '').getPropertyValue('-webkit-grid-row') is "auto / auto"
-PASS getComputedStyle(GridAreasEnd, '').getPropertyValue('-webkit-grid-row-start') is "auto"
-PASS getComputedStyle(GridAreasEnd, '').getPropertyValue('-webkit-grid-row-end') is "auto"
-PASS getComputedStyle(GridAreasEndColumnARowC, '').getPropertyValue('-webkit-grid-column') is "a / a"
-PASS getComputedStyle(GridAreasEndColumnARowC, '').getPropertyValue('-webkit-grid-column-start') is "a"
-PASS getComputedStyle(GridAreasEndColumnARowC, '').getPropertyValue('-webkit-grid-column-end') is "a"
-PASS getComputedStyle(GridAreasEndColumnARowC, '').getPropertyValue('-webkit-grid-row') is "c / c"
-PASS getComputedStyle(GridAreasEndColumnARowC, '').getPropertyValue('-webkit-grid-row-start') is "c"
-PASS getComputedStyle(GridAreasEndColumnARowC, '').getPropertyValue('-webkit-grid-row-end') is "c"
-PASS getComputedStyle(GridAreasEndRowD, '').getPropertyValue('-webkit-grid-column') is "auto / auto"
-PASS getComputedStyle(GridAreasEndRowD, '').getPropertyValue('-webkit-grid-column-start') is "auto"
-PASS getComputedStyle(GridAreasEndRowD, '').getPropertyValue('-webkit-grid-column-end') is "auto"
-PASS getComputedStyle(GridAreasEndRowD, '').getPropertyValue('-webkit-grid-row') is "d / d"
-PASS getComputedStyle(GridAreasEndRowD, '').getPropertyValue('-webkit-grid-row-start') is "d"
-PASS getComputedStyle(GridAreasEndRowD, '').getPropertyValue('-webkit-grid-row-end') is "d"
-PASS getComputedStyle(GridAreasEndColumnARowD, '').getPropertyValue('-webkit-grid-column') is "a / a"
-PASS getComputedStyle(GridAreasEndColumnARowD, '').getPropertyValue('-webkit-grid-column-start') is "a"
-PASS getComputedStyle(GridAreasEndColumnARowD, '').getPropertyValue('-webkit-grid-column-end') is "a"
-PASS getComputedStyle(GridAreasEndColumnARowD, '').getPropertyValue('-webkit-grid-row') is "d / d"
-PASS getComputedStyle(GridAreasEndColumnARowD, '').getPropertyValue('-webkit-grid-row-start') is "d"
-PASS getComputedStyle(GridAreasEndColumnARowD, '').getPropertyValue('-webkit-grid-row-end') is "d"
-PASS getComputedStyle(GridAreasRepeatColumnDRowC, '').getPropertyValue('-webkit-grid-column') is "d / d"
-PASS getComputedStyle(GridAreasRepeatColumnDRowC, '').getPropertyValue('-webkit-grid-column-start') is "d"
-PASS getComputedStyle(GridAreasRepeatColumnDRowC, '').getPropertyValue('-webkit-grid-column-end') is "d"
-PASS getComputedStyle(GridAreasRepeatColumnDRowC, '').getPropertyValue('-webkit-grid-row') is "c / c"
-PASS getComputedStyle(GridAreasRepeatColumnDRowC, '').getPropertyValue('-webkit-grid-row-start') is "c"
-PASS getComputedStyle(GridAreasRepeatColumnDRowC, '').getPropertyValue('-webkit-grid-row-end') is "c"
-PASS getComputedStyle(GridAreasRepeatColumnDStartDEndRowCStartCEnd, '').getPropertyValue('-webkit-grid-column') is "d-start / d-end"
-PASS getComputedStyle(GridAreasRepeatColumnDStartDEndRowCStartCEnd, '').getPropertyValue('-webkit-grid-column-start') is "d-start"
-PASS getComputedStyle(GridAreasRepeatColumnDStartDEndRowCStartCEnd, '').getPropertyValue('-webkit-grid-column-end') is "d-end"
-PASS getComputedStyle(GridAreasRepeatColumnDStartDEndRowCStartCEnd, '').getPropertyValue('-webkit-grid-row') is "c-start / c-end"
-PASS getComputedStyle(GridAreasRepeatColumnDStartDEndRowCStartCEnd, '').getPropertyValue('-webkit-grid-row-start') is "c-start"
-PASS getComputedStyle(GridAreasRepeatColumnDStartDEndRowCStartCEnd, '').getPropertyValue('-webkit-grid-row-end') is "c-end"
-PASS getComputedStyle(GridAreasRepeatColumnCRowD, '').getPropertyValue('-webkit-grid-column') is "c / c"
-PASS getComputedStyle(GridAreasRepeatColumnCRowD, '').getPropertyValue('-webkit-grid-column-start') is "c"
-PASS getComputedStyle(GridAreasRepeatColumnCRowD, '').getPropertyValue('-webkit-grid-column-end') is "c"
-PASS getComputedStyle(GridAreasRepeatColumnCRowD, '').getPropertyValue('-webkit-grid-row') is "d / d"
-PASS getComputedStyle(GridAreasRepeatColumnCRowD, '').getPropertyValue('-webkit-grid-row-start') is "d"
-PASS getComputedStyle(GridAreasRepeatColumnCRowD, '').getPropertyValue('-webkit-grid-row-end') is "d"
+PASS getComputedStyle(GridUniqueColumnB, '').getPropertyValue('grid-column') is "b / b"
+PASS getComputedStyle(GridUniqueColumnB, '').getPropertyValue('grid-column-start') is "b"
+PASS getComputedStyle(GridUniqueColumnB, '').getPropertyValue('grid-column-end') is "b"
+PASS getComputedStyle(GridUniqueColumnB, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(GridUniqueColumnB, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(GridUniqueColumnB, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(GridUniqueRowE, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(GridUniqueRowE, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(GridUniqueRowE, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(GridUniqueRowE, '').getPropertyValue('grid-row') is "e / e"
+PASS getComputedStyle(GridUniqueRowE, '').getPropertyValue('grid-row-start') is "e"
+PASS getComputedStyle(GridUniqueRowE, '').getPropertyValue('grid-row-end') is "e"
+PASS getComputedStyle(GridUniqueColumnBStart, '').getPropertyValue('grid-column') is "b-start / b-start"
+PASS getComputedStyle(GridUniqueColumnBStart, '').getPropertyValue('grid-column-start') is "b-start"
+PASS getComputedStyle(GridUniqueColumnBStart, '').getPropertyValue('grid-column-end') is "b-start"
+PASS getComputedStyle(GridUniqueColumnBStart, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(GridUniqueColumnBStart, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(GridUniqueColumnBStart, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(GridUniqueRowGStart, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(GridUniqueRowGStart, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(GridUniqueRowGStart, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(GridUniqueRowGStart, '').getPropertyValue('grid-row') is "g-start / g-start"
+PASS getComputedStyle(GridUniqueRowGStart, '').getPropertyValue('grid-row-start') is "g-start"
+PASS getComputedStyle(GridUniqueRowGStart, '').getPropertyValue('grid-row-end') is "g-start"
+PASS getComputedStyle(GridUniqueColumnBD, '').getPropertyValue('grid-column') is "b / d"
+PASS getComputedStyle(GridUniqueColumnBD, '').getPropertyValue('grid-column-start') is "b"
+PASS getComputedStyle(GridUniqueColumnBD, '').getPropertyValue('grid-column-end') is "d"
+PASS getComputedStyle(GridUniqueColumnBD, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(GridUniqueColumnBD, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(GridUniqueColumnBD, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(GridUniqueRowGH, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(GridUniqueRowGH, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(GridUniqueRowGH, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(GridUniqueRowGH, '').getPropertyValue('grid-row') is "g / h"
+PASS getComputedStyle(GridUniqueRowGH, '').getPropertyValue('grid-row-start') is "g"
+PASS getComputedStyle(GridUniqueRowGH, '').getPropertyValue('grid-row-end') is "h"
+PASS getComputedStyle(GridUniqueColumnCRowF, '').getPropertyValue('grid-column') is "c / c"
+PASS getComputedStyle(GridUniqueColumnCRowF, '').getPropertyValue('grid-column-start') is "c"
+PASS getComputedStyle(GridUniqueColumnCRowF, '').getPropertyValue('grid-column-end') is "c"
+PASS getComputedStyle(GridUniqueColumnCRowF, '').getPropertyValue('grid-row') is "f / f"
+PASS getComputedStyle(GridUniqueColumnCRowF, '').getPropertyValue('grid-row-start') is "f"
+PASS getComputedStyle(GridUniqueColumnCRowF, '').getPropertyValue('grid-row-end') is "f"
+PASS getComputedStyle(GridUniqueColumnBInteger, '').getPropertyValue('grid-column') is "b / 4"
+PASS getComputedStyle(GridUniqueColumnBInteger, '').getPropertyValue('grid-column-start') is "b"
+PASS getComputedStyle(GridUniqueColumnBInteger, '').getPropertyValue('grid-column-end') is "4"
+PASS getComputedStyle(GridUniqueColumnBInteger, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(GridUniqueColumnBInteger, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(GridUniqueColumnBInteger, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(GridUniqueRowIntegerH, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(GridUniqueRowIntegerH, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(GridUniqueRowIntegerH, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(GridUniqueRowIntegerH, '').getPropertyValue('grid-row') is "3 / h"
+PASS getComputedStyle(GridUniqueRowIntegerH, '').getPropertyValue('grid-row-start') is "3"
+PASS getComputedStyle(GridUniqueRowIntegerH, '').getPropertyValue('grid-row-end') is "h"
+PASS getComputedStyle(GridUniqueColumnIntegerRowG, '').getPropertyValue('grid-column') is "2 / auto"
+PASS getComputedStyle(GridUniqueColumnIntegerRowG, '').getPropertyValue('grid-column-start') is "2"
+PASS getComputedStyle(GridUniqueColumnIntegerRowG, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(GridUniqueColumnIntegerRowG, '').getPropertyValue('grid-row') is "g / g"
+PASS getComputedStyle(GridUniqueColumnIntegerRowG, '').getPropertyValue('grid-row-start') is "g"
+PASS getComputedStyle(GridUniqueColumnIntegerRowG, '').getPropertyValue('grid-row-end') is "g"
+PASS getComputedStyle(GridUniqueColumnARowInteger, '').getPropertyValue('grid-column') is "a / a"
+PASS getComputedStyle(GridUniqueColumnARowInteger, '').getPropertyValue('grid-column-start') is "a"
+PASS getComputedStyle(GridUniqueColumnARowInteger, '').getPropertyValue('grid-column-end') is "a"
+PASS getComputedStyle(GridUniqueColumnARowInteger, '').getPropertyValue('grid-row') is "2 / auto"
+PASS getComputedStyle(GridUniqueColumnARowInteger, '').getPropertyValue('grid-row-start') is "2"
+PASS getComputedStyle(GridUniqueColumnARowInteger, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(GridUniqueColumnCStart, '').getPropertyValue('grid-column') is "c-start / c-start"
+PASS getComputedStyle(GridUniqueColumnCStart, '').getPropertyValue('grid-column-start') is "c-start"
+PASS getComputedStyle(GridUniqueColumnCStart, '').getPropertyValue('grid-column-end') is "c-start"
+PASS getComputedStyle(GridUniqueColumnCStart, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(GridUniqueColumnCStart, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(GridUniqueColumnCStart, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(GridUniqueRowFStart, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(GridUniqueRowFStart, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(GridUniqueRowFStart, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(GridUniqueRowFStart, '').getPropertyValue('grid-row') is "f-start / f-start"
+PASS getComputedStyle(GridUniqueRowFStart, '').getPropertyValue('grid-row-start') is "f-start"
+PASS getComputedStyle(GridUniqueRowFStart, '').getPropertyValue('grid-row-end') is "f-start"
+PASS getComputedStyle(GridUniqueColumnCStartRowFEnd, '').getPropertyValue('grid-column') is "c-start / c-start"
+PASS getComputedStyle(GridUniqueColumnCStartRowFEnd, '').getPropertyValue('grid-column-start') is "c-start"
+PASS getComputedStyle(GridUniqueColumnCStartRowFEnd, '').getPropertyValue('grid-column-end') is "c-start"
+PASS getComputedStyle(GridUniqueColumnCStartRowFEnd, '').getPropertyValue('grid-row') is "f-end / f-end"
+PASS getComputedStyle(GridUniqueColumnCStartRowFEnd, '').getPropertyValue('grid-row-start') is "f-end"
+PASS getComputedStyle(GridUniqueColumnCStartRowFEnd, '').getPropertyValue('grid-row-end') is "f-end"
+PASS getComputedStyle(GridUniqueColumnBEndRowHStart, '').getPropertyValue('grid-column') is "b-end / b-end"
+PASS getComputedStyle(GridUniqueColumnBEndRowHStart, '').getPropertyValue('grid-column-start') is "b-end"
+PASS getComputedStyle(GridUniqueColumnBEndRowHStart, '').getPropertyValue('grid-column-end') is "b-end"
+PASS getComputedStyle(GridUniqueColumnBEndRowHStart, '').getPropertyValue('grid-row') is "h-start / h-start"
+PASS getComputedStyle(GridUniqueColumnBEndRowHStart, '').getPropertyValue('grid-row-start') is "h-start"
+PASS getComputedStyle(GridUniqueColumnBEndRowHStart, '').getPropertyValue('grid-row-end') is "h-start"
+PASS getComputedStyle(GridAreasNoNamesColumnAStartRowDStart, '').getPropertyValue('grid-column') is "a-start / a-start"
+PASS getComputedStyle(GridAreasNoNamesColumnAStartRowDStart, '').getPropertyValue('grid-column-start') is "a-start"
+PASS getComputedStyle(GridAreasNoNamesColumnAStartRowDStart, '').getPropertyValue('grid-column-end') is "a-start"
+PASS getComputedStyle(GridAreasNoNamesColumnAStartRowDStart, '').getPropertyValue('grid-row') is "d-start / d-start"
+PASS getComputedStyle(GridAreasNoNamesColumnAStartRowDStart, '').getPropertyValue('grid-row-start') is "d-start"
+PASS getComputedStyle(GridAreasNoNamesColumnAStartRowDStart, '').getPropertyValue('grid-row-end') is "d-start"
+PASS getComputedStyle(GridAreasNoNamesColumnAStartRowD, '').getPropertyValue('grid-column') is "a-start / a-start"
+PASS getComputedStyle(GridAreasNoNamesColumnAStartRowD, '').getPropertyValue('grid-column-start') is "a-start"
+PASS getComputedStyle(GridAreasNoNamesColumnAStartRowD, '').getPropertyValue('grid-column-end') is "a-start"
+PASS getComputedStyle(GridAreasNoNamesColumnAStartRowD, '').getPropertyValue('grid-row') is "d / d"
+PASS getComputedStyle(GridAreasNoNamesColumnAStartRowD, '').getPropertyValue('grid-row-start') is "d"
+PASS getComputedStyle(GridAreasNoNamesColumnAStartRowD, '').getPropertyValue('grid-row-end') is "d"
+PASS getComputedStyle(GridAreasNoNamesColumnDStartRowCStart, '').getPropertyValue('grid-column') is "d-start / d-start"
+PASS getComputedStyle(GridAreasNoNamesColumnDStartRowCStart, '').getPropertyValue('grid-column-start') is "d-start"
+PASS getComputedStyle(GridAreasNoNamesColumnDStartRowCStart, '').getPropertyValue('grid-column-end') is "d-start"
+PASS getComputedStyle(GridAreasNoNamesColumnDStartRowCStart, '').getPropertyValue('grid-row') is "c-start / c-start"
+PASS getComputedStyle(GridAreasNoNamesColumnDStartRowCStart, '').getPropertyValue('grid-row-start') is "c-start"
+PASS getComputedStyle(GridAreasNoNamesColumnDStartRowCStart, '').getPropertyValue('grid-row-end') is "c-start"
+PASS getComputedStyle(GridAreasNoNamesColumnD, '').getPropertyValue('grid-column') is "d / d"
+PASS getComputedStyle(GridAreasNoNamesColumnD, '').getPropertyValue('grid-column-start') is "d"
+PASS getComputedStyle(GridAreasNoNamesColumnD, '').getPropertyValue('grid-column-end') is "d"
+PASS getComputedStyle(GridAreasNoNamesColumnD, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(GridAreasNoNamesColumnD, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(GridAreasNoNamesColumnD, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(GridAreasNoNamesRowD, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(GridAreasNoNamesRowD, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(GridAreasNoNamesRowD, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(GridAreasNoNamesRowD, '').getPropertyValue('grid-row') is "d / d"
+PASS getComputedStyle(GridAreasNoNamesRowD, '').getPropertyValue('grid-row-start') is "d"
+PASS getComputedStyle(GridAreasNoNamesRowD, '').getPropertyValue('grid-row-end') is "d"
+PASS getComputedStyle(GridAreasNoNamesColumnC, '').getPropertyValue('grid-column') is "c / c"
+PASS getComputedStyle(GridAreasNoNamesColumnC, '').getPropertyValue('grid-column-start') is "c"
+PASS getComputedStyle(GridAreasNoNamesColumnC, '').getPropertyValue('grid-column-end') is "c"
+PASS getComputedStyle(GridAreasNoNamesColumnC, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(GridAreasNoNamesColumnC, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(GridAreasNoNamesColumnC, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(GridAreasNoNamesRowC, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(GridAreasNoNamesRowC, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(GridAreasNoNamesRowC, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(GridAreasNoNamesRowC, '').getPropertyValue('grid-row') is "c / c"
+PASS getComputedStyle(GridAreasNoNamesRowC, '').getPropertyValue('grid-row-start') is "c"
+PASS getComputedStyle(GridAreasNoNamesRowC, '').getPropertyValue('grid-row-end') is "c"
+PASS getComputedStyle(GridAreasNoNamesColumnA, '').getPropertyValue('grid-column') is "a / a"
+PASS getComputedStyle(GridAreasNoNamesColumnA, '').getPropertyValue('grid-column-start') is "a"
+PASS getComputedStyle(GridAreasNoNamesColumnA, '').getPropertyValue('grid-column-end') is "a"
+PASS getComputedStyle(GridAreasNoNamesColumnA, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(GridAreasNoNamesColumnA, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(GridAreasNoNamesColumnA, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(GridAreasNoNamesRowA, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(GridAreasNoNamesRowA, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(GridAreasNoNamesRowA, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(GridAreasNoNamesRowA, '').getPropertyValue('grid-row') is "a / a"
+PASS getComputedStyle(GridAreasNoNamesRowA, '').getPropertyValue('grid-row-start') is "a"
+PASS getComputedStyle(GridAreasNoNamesRowA, '').getPropertyValue('grid-row-end') is "a"
+PASS getComputedStyle(GridAreasNoNamesColumnARowA, '').getPropertyValue('grid-column') is "a / a"
+PASS getComputedStyle(GridAreasNoNamesColumnARowA, '').getPropertyValue('grid-column-start') is "a"
+PASS getComputedStyle(GridAreasNoNamesColumnARowA, '').getPropertyValue('grid-column-end') is "a"
+PASS getComputedStyle(GridAreasNoNamesColumnARowA, '').getPropertyValue('grid-row') is "a / a"
+PASS getComputedStyle(GridAreasNoNamesColumnARowA, '').getPropertyValue('grid-row-start') is "a"
+PASS getComputedStyle(GridAreasNoNamesColumnARowA, '').getPropertyValue('grid-row-end') is "a"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnD, '').getPropertyValue('grid-column') is "d / d"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnD, '').getPropertyValue('grid-column-start') is "d"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnD, '').getPropertyValue('grid-column-end') is "d"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnD, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnD, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnD, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(GridAreasNamedLineAfterRowD, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(GridAreasNamedLineAfterRowD, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(GridAreasNamedLineAfterRowD, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(GridAreasNamedLineAfterRowD, '').getPropertyValue('grid-row') is "d / d"
+PASS getComputedStyle(GridAreasNamedLineAfterRowD, '').getPropertyValue('grid-row-start') is "d"
+PASS getComputedStyle(GridAreasNamedLineAfterRowD, '').getPropertyValue('grid-row-end') is "d"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnC, '').getPropertyValue('grid-column') is "c / c"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnC, '').getPropertyValue('grid-column-start') is "c"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnC, '').getPropertyValue('grid-column-end') is "c"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnC, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnC, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnC, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(GridAreasNamedLineAfterRowC, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(GridAreasNamedLineAfterRowC, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(GridAreasNamedLineAfterRowC, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(GridAreasNamedLineAfterRowC, '').getPropertyValue('grid-row') is "c / c"
+PASS getComputedStyle(GridAreasNamedLineAfterRowC, '').getPropertyValue('grid-row-start') is "c"
+PASS getComputedStyle(GridAreasNamedLineAfterRowC, '').getPropertyValue('grid-row-end') is "c"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnStartAStart, '').getPropertyValue('grid-column') is "a-start / auto"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnStartAStart, '').getPropertyValue('grid-column-start') is "a-start"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnStartAStart, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnStartAStart, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnStartAStart, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnStartAStart, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(GridAreasNamedLineAfterRowStartCStart, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(GridAreasNamedLineAfterRowStartCStart, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(GridAreasNamedLineAfterRowStartCStart, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(GridAreasNamedLineAfterRowStartCStart, '').getPropertyValue('grid-row') is "c-start / auto"
+PASS getComputedStyle(GridAreasNamedLineAfterRowStartCStart, '').getPropertyValue('grid-row-start') is "c-start"
+PASS getComputedStyle(GridAreasNamedLineAfterRowStartCStart, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnA, '').getPropertyValue('grid-column') is "a / a"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnA, '').getPropertyValue('grid-column-start') is "a"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnA, '').getPropertyValue('grid-column-end') is "a"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnA, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnA, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnA, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnARowD, '').getPropertyValue('grid-column') is "a / a"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnARowD, '').getPropertyValue('grid-column-start') is "a"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnARowD, '').getPropertyValue('grid-column-end') is "a"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnARowD, '').getPropertyValue('grid-row') is "d / d"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnARowD, '').getPropertyValue('grid-row-start') is "d"
+PASS getComputedStyle(GridAreasNamedLineAfterColumnARowD, '').getPropertyValue('grid-row-end') is "d"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnD, '').getPropertyValue('grid-column') is "d / d"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnD, '').getPropertyValue('grid-column-start') is "d"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnD, '').getPropertyValue('grid-column-end') is "d"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnD, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnD, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnD, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(GridAreasNamedLineBeforeRowD, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(GridAreasNamedLineBeforeRowD, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(GridAreasNamedLineBeforeRowD, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(GridAreasNamedLineBeforeRowD, '').getPropertyValue('grid-row') is "d / d"
+PASS getComputedStyle(GridAreasNamedLineBeforeRowD, '').getPropertyValue('grid-row-start') is "d"
+PASS getComputedStyle(GridAreasNamedLineBeforeRowD, '').getPropertyValue('grid-row-end') is "d"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnC, '').getPropertyValue('grid-column') is "c / c"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnC, '').getPropertyValue('grid-column-start') is "c"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnC, '').getPropertyValue('grid-column-end') is "c"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnC, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnC, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnC, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(GridAreasNamedLineBeforeRowC, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(GridAreasNamedLineBeforeRowC, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(GridAreasNamedLineBeforeRowC, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(GridAreasNamedLineBeforeRowC, '').getPropertyValue('grid-row') is "c / c"
+PASS getComputedStyle(GridAreasNamedLineBeforeRowC, '').getPropertyValue('grid-row-start') is "c"
+PASS getComputedStyle(GridAreasNamedLineBeforeRowC, '').getPropertyValue('grid-row-end') is "c"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnStartDStart, '').getPropertyValue('grid-column') is "d-start / auto"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnStartDStart, '').getPropertyValue('grid-column-start') is "d-start"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnStartDStart, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnStartDStart, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnStartDStart, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnStartDStart, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(GridAreasNamedLineBeforeRowStartDStart, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(GridAreasNamedLineBeforeRowStartDStart, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(GridAreasNamedLineBeforeRowStartDStart, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(GridAreasNamedLineBeforeRowStartDStart, '').getPropertyValue('grid-row') is "d-start / auto"
+PASS getComputedStyle(GridAreasNamedLineBeforeRowStartDStart, '').getPropertyValue('grid-row-start') is "d-start"
+PASS getComputedStyle(GridAreasNamedLineBeforeRowStartDStart, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnA, '').getPropertyValue('grid-column') is "a / a"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnA, '').getPropertyValue('grid-column-start') is "a"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnA, '').getPropertyValue('grid-column-end') is "a"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnA, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnA, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnA, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnARowD, '').getPropertyValue('grid-column') is "a / a"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnARowD, '').getPropertyValue('grid-column-start') is "a"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnARowD, '').getPropertyValue('grid-column-end') is "a"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnARowD, '').getPropertyValue('grid-row') is "d / d"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnARowD, '').getPropertyValue('grid-row-start') is "d"
+PASS getComputedStyle(GridAreasNamedLineBeforeColumnARowD, '').getPropertyValue('grid-row-end') is "d"
+PASS getComputedStyle(GridAreasNoNamesColumnAAStartRowDStart, '').getPropertyValue('grid-column') is "a / a-start"
+PASS getComputedStyle(GridAreasNoNamesColumnAAStartRowDStart, '').getPropertyValue('grid-column-start') is "a"
+PASS getComputedStyle(GridAreasNoNamesColumnAAStartRowDStart, '').getPropertyValue('grid-column-end') is "a-start"
+PASS getComputedStyle(GridAreasNoNamesColumnAAStartRowDStart, '').getPropertyValue('grid-row') is "d-start / d-start"
+PASS getComputedStyle(GridAreasNoNamesColumnAAStartRowDStart, '').getPropertyValue('grid-row-start') is "d-start"
+PASS getComputedStyle(GridAreasNoNamesColumnAAStartRowDStart, '').getPropertyValue('grid-row-end') is "d-start"
+PASS getComputedStyle(GridAreasNoNamesColumnDDStartRowCStart, '').getPropertyValue('grid-column') is "d / d-start"
+PASS getComputedStyle(GridAreasNoNamesColumnDDStartRowCStart, '').getPropertyValue('grid-column-start') is "d"
+PASS getComputedStyle(GridAreasNoNamesColumnDDStartRowCStart, '').getPropertyValue('grid-column-end') is "d-start"
+PASS getComputedStyle(GridAreasNoNamesColumnDDStartRowCStart, '').getPropertyValue('grid-row') is "c-start / c-start"
+PASS getComputedStyle(GridAreasNoNamesColumnDDStartRowCStart, '').getPropertyValue('grid-row-start') is "c-start"
+PASS getComputedStyle(GridAreasNoNamesColumnDDStartRowCStart, '').getPropertyValue('grid-row-end') is "c-start"
+PASS getComputedStyle(GridAreasNoNamesColumnCRowAAStart, '').getPropertyValue('grid-column') is "c / c"
+PASS getComputedStyle(GridAreasNoNamesColumnCRowAAStart, '').getPropertyValue('grid-column-start') is "c"
+PASS getComputedStyle(GridAreasNoNamesColumnCRowAAStart, '').getPropertyValue('grid-column-end') is "c"
+PASS getComputedStyle(GridAreasNoNamesColumnCRowAAStart, '').getPropertyValue('grid-row') is "a / a-start"
+PASS getComputedStyle(GridAreasNoNamesColumnCRowAAStart, '').getPropertyValue('grid-row-start') is "a"
+PASS getComputedStyle(GridAreasNoNamesColumnCRowAAStart, '').getPropertyValue('grid-row-end') is "a-start"
+PASS getComputedStyle(GridAreasNoNamesColumnDRowCCStart, '').getPropertyValue('grid-column') is "d / d"
+PASS getComputedStyle(GridAreasNoNamesColumnDRowCCStart, '').getPropertyValue('grid-column-start') is "d"
+PASS getComputedStyle(GridAreasNoNamesColumnDRowCCStart, '').getPropertyValue('grid-column-end') is "d"
+PASS getComputedStyle(GridAreasNoNamesColumnDRowCCStart, '').getPropertyValue('grid-row') is "c / c-start"
+PASS getComputedStyle(GridAreasNoNamesColumnDRowCCStart, '').getPropertyValue('grid-row-start') is "c"
+PASS getComputedStyle(GridAreasNoNamesColumnDRowCCStart, '').getPropertyValue('grid-row-end') is "c-start"
+PASS getComputedStyle(GridAreasEnd, '').getPropertyValue('grid-column') is "a / a"
+PASS getComputedStyle(GridAreasEnd, '').getPropertyValue('grid-column-start') is "a"
+PASS getComputedStyle(GridAreasEnd, '').getPropertyValue('grid-column-end') is "a"
+PASS getComputedStyle(GridAreasEnd, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(GridAreasEnd, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(GridAreasEnd, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(GridAreasEndColumnARowC, '').getPropertyValue('grid-column') is "a / a"
+PASS getComputedStyle(GridAreasEndColumnARowC, '').getPropertyValue('grid-column-start') is "a"
+PASS getComputedStyle(GridAreasEndColumnARowC, '').getPropertyValue('grid-column-end') is "a"
+PASS getComputedStyle(GridAreasEndColumnARowC, '').getPropertyValue('grid-row') is "c / c"
+PASS getComputedStyle(GridAreasEndColumnARowC, '').getPropertyValue('grid-row-start') is "c"
+PASS getComputedStyle(GridAreasEndColumnARowC, '').getPropertyValue('grid-row-end') is "c"
+PASS getComputedStyle(GridAreasEndRowD, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(GridAreasEndRowD, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(GridAreasEndRowD, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(GridAreasEndRowD, '').getPropertyValue('grid-row') is "d / d"
+PASS getComputedStyle(GridAreasEndRowD, '').getPropertyValue('grid-row-start') is "d"
+PASS getComputedStyle(GridAreasEndRowD, '').getPropertyValue('grid-row-end') is "d"
+PASS getComputedStyle(GridAreasEndColumnARowD, '').getPropertyValue('grid-column') is "a / a"
+PASS getComputedStyle(GridAreasEndColumnARowD, '').getPropertyValue('grid-column-start') is "a"
+PASS getComputedStyle(GridAreasEndColumnARowD, '').getPropertyValue('grid-column-end') is "a"
+PASS getComputedStyle(GridAreasEndColumnARowD, '').getPropertyValue('grid-row') is "d / d"
+PASS getComputedStyle(GridAreasEndColumnARowD, '').getPropertyValue('grid-row-start') is "d"
+PASS getComputedStyle(GridAreasEndColumnARowD, '').getPropertyValue('grid-row-end') is "d"
+PASS getComputedStyle(GridAreasRepeatColumnDRowC, '').getPropertyValue('grid-column') is "d / d"
+PASS getComputedStyle(GridAreasRepeatColumnDRowC, '').getPropertyValue('grid-column-start') is "d"
+PASS getComputedStyle(GridAreasRepeatColumnDRowC, '').getPropertyValue('grid-column-end') is "d"
+PASS getComputedStyle(GridAreasRepeatColumnDRowC, '').getPropertyValue('grid-row') is "c / c"
+PASS getComputedStyle(GridAreasRepeatColumnDRowC, '').getPropertyValue('grid-row-start') is "c"
+PASS getComputedStyle(GridAreasRepeatColumnDRowC, '').getPropertyValue('grid-row-end') is "c"
+PASS getComputedStyle(GridAreasRepeatColumnDStartDEndRowCStartCEnd, '').getPropertyValue('grid-column') is "d-start / d-end"
+PASS getComputedStyle(GridAreasRepeatColumnDStartDEndRowCStartCEnd, '').getPropertyValue('grid-column-start') is "d-start"
+PASS getComputedStyle(GridAreasRepeatColumnDStartDEndRowCStartCEnd, '').getPropertyValue('grid-column-end') is "d-end"
+PASS getComputedStyle(GridAreasRepeatColumnDStartDEndRowCStartCEnd, '').getPropertyValue('grid-row') is "c-start / c-end"
+PASS getComputedStyle(GridAreasRepeatColumnDStartDEndRowCStartCEnd, '').getPropertyValue('grid-row-start') is "c-start"
+PASS getComputedStyle(GridAreasRepeatColumnDStartDEndRowCStartCEnd, '').getPropertyValue('grid-row-end') is "c-end"
+PASS getComputedStyle(GridAreasRepeatColumnCRowD, '').getPropertyValue('grid-column') is "c / c"
+PASS getComputedStyle(GridAreasRepeatColumnCRowD, '').getPropertyValue('grid-column-start') is "c"
+PASS getComputedStyle(GridAreasRepeatColumnCRowD, '').getPropertyValue('grid-column-end') is "c"
+PASS getComputedStyle(GridAreasRepeatColumnCRowD, '').getPropertyValue('grid-row') is "d / d"
+PASS getComputedStyle(GridAreasRepeatColumnCRowD, '').getPropertyValue('grid-row-start') is "d"
+PASS getComputedStyle(GridAreasRepeatColumnCRowD, '').getPropertyValue('grid-row-end') is "d"
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-get-set.html b/LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-get-set.html
index 88e3bed..1cfe30a 100644
--- a/LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-get-set.html
@@ -5,39 +5,39 @@
<style type="text/css">
.gridAreas {
- -webkit-grid-template-areas: ". a a"
+ grid-template-areas: ". a a"
"c a a"
". . d";
}
.gridNoLineNames {
- -webkit-grid-template-columns: 50px 100px 200px;
- -webkit-grid-template-rows: 50px 100px 200px;
+ grid-template-columns: 50px 100px 200px;
+ grid-template-rows: 50px 100px 200px;
}
.gridUniqueNames {
- -webkit-grid-template-columns: [a] 50px (b b-start) 100px [c] 200px [d];
- -webkit-grid-template-rows: [e] 50px [f] 100px (g g-start) 200px [h];
+ grid-template-columns: [a] 50px (b b-start) 100px [c] 200px [d];
+ grid-template-rows: [e] 50px [f] 100px (g g-start) 200px [h];
}
.gridWithNamedLineBeforeGridArea {
- -webkit-grid-template-columns: (a-start c-start) 50px (d-start) 100px 200px;
- -webkit-grid-template-rows: (c-start) 50px (d-start) 100px 200px;
+ grid-template-columns: (a-start c-start) 50px (d-start) 100px 200px;
+ grid-template-rows: (c-start) 50px (d-start) 100px 200px;
}
.gridWithNamedLineAfterGridArea {
- -webkit-grid-template-columns: 50px 100px (a-start) 200px;
- -webkit-grid-template-rows: 50px 100px (c-start) 200px;
+ grid-template-columns: 50px 100px (a-start) 200px;
+ grid-template-rows: 50px 100px (c-start) 200px;
}
.gridWithEndLines {
- -webkit-grid-template-columns: 50px 100px (a-end) 200px (c-end);
- -webkit-grid-template-rows: 50px (c-end) 100px (d-end) 200px;
+ grid-template-columns: 50px 100px (a-end) 200px (c-end);
+ grid-template-rows: 50px (c-end) 100px (d-end) 200px;
}
.gridRepeatedNames {
- -webkit-grid-template-columns: (d-start) 50px (d-start) 100px (d-start) 200px;
- -webkit-grid-template-rows: 50px (c-end) 100px (c-end) 200px (c-end);
+ grid-template-columns: (d-start) 50px (d-start) 100px (d-start) 200px;
+ grid-template-rows: 50px (c-end) 100px (c-end) 200px (c-end);
}
</style>
@@ -46,142 +46,142 @@
<body>
<div style="position: relative">
<div class="grid gridUniqueNames">
- <div class="sizedToGridArea" style="-webkit-grid-column: b;" id="GridUniqueColumnB"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: e;" id="GridUniqueRowE"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: b-start;" id="GridUniqueColumnBStart"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: g-start;" id="GridUniqueRowGStart"></div>
+ <div class="sizedToGridArea" style="grid-column: b;" id="GridUniqueColumnB"></div>
+ <div class="sizedToGridArea" style="grid-row: e;" id="GridUniqueRowE"></div>
+ <div class="sizedToGridArea" style="grid-column: b-start;" id="GridUniqueColumnBStart"></div>
+ <div class="sizedToGridArea" style="grid-row: g-start;" id="GridUniqueRowGStart"></div>
</div>
</div>
<div style="position: relative">
<div class="grid gridUniqueNames">
- <div class="sizedToGridArea" style="-webkit-grid-column: b / d;" id="GridUniqueColumnBD"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: g / h;" id="GridUniqueRowGH"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: c; -webkit-grid-row: f;" id="GridUniqueColumnCRowF"></div>
+ <div class="sizedToGridArea" style="grid-column: b / d;" id="GridUniqueColumnBD"></div>
+ <div class="sizedToGridArea" style="grid-row: g / h;" id="GridUniqueRowGH"></div>
+ <div class="sizedToGridArea" style="grid-column: c; grid-row: f;" id="GridUniqueColumnCRowF"></div>
</div>
</div>
<!-- Check positioning using unique grid-line names mixed with integers -->
<div style="position: relative">
<div class="grid gridUniqueNames">
- <div class="sizedToGridArea" style="-webkit-grid-column: b / 4;" id="GridUniqueColumnBInteger"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: 3 / h;" id="GridUniqueRowIntegerH"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: 2; -webkit-grid-row: g;" id="GridUniqueColumnIntegerRowG"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: a; -webkit-grid-row: 2;" id="GridUniqueColumnARowInteger"></div>
+ <div class="sizedToGridArea" style="grid-column: b / 4;" id="GridUniqueColumnBInteger"></div>
+ <div class="sizedToGridArea" style="grid-row: 3 / h;" id="GridUniqueRowIntegerH"></div>
+ <div class="sizedToGridArea" style="grid-column: 2; grid-row: g;" id="GridUniqueColumnIntegerRowG"></div>
+ <div class="sizedToGridArea" style="grid-column: a; grid-row: 2;" id="GridUniqueColumnARowInteger"></div>
</div>
</div>
<!-- Check that without named gridAreas there are no implicit grid-line names defined -->
<div style="position: relative">
<div class="grid gridUniqueNames">
- <div class="sizedToGridArea" style="-webkit-grid-column: c-start;" id="GridUniqueColumnCStart"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: f-start;" id="GridUniqueRowFStart"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: c-start; -webkit-grid-row: f-end" id="GridUniqueColumnCStartRowFEnd"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: b-end; -webkit-grid-row: h-start" id="GridUniqueColumnBEndRowHStart"></div>
+ <div class="sizedToGridArea" style="grid-column: c-start;" id="GridUniqueColumnCStart"></div>
+ <div class="sizedToGridArea" style="grid-row: f-start;" id="GridUniqueRowFStart"></div>
+ <div class="sizedToGridArea" style="grid-column: c-start; grid-row: f-end" id="GridUniqueColumnCStartRowFEnd"></div>
+ <div class="sizedToGridArea" style="grid-column: b-end; grid-row: h-start" id="GridUniqueColumnBEndRowHStart"></div>
</div>
</div>
<!-- Check that gridArea's implicit names are well defined -->
<div style="position: relative">
<div class="grid gridAreas gridNoLineNames">
- <div class="sizedToGridArea" style="-webkit-grid-column: a-start; -webkit-grid-row: d-start;" id="GridAreasNoNamesColumnAStartRowDStart"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: a-start; -webkit-grid-row: d;" id="GridAreasNoNamesColumnAStartRowD"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: d-start; -webkit-grid-row: c-start;"id="GridAreasNoNamesColumnDStartRowCStart"></div>
+ <div class="sizedToGridArea" style="grid-column: a-start; grid-row: d-start;" id="GridAreasNoNamesColumnAStartRowDStart"></div>
+ <div class="sizedToGridArea" style="grid-column: a-start; grid-row: d;" id="GridAreasNoNamesColumnAStartRowD"></div>
+ <div class="sizedToGridArea" style="grid-column: d-start; grid-row: c-start;"id="GridAreasNoNamesColumnDStartRowCStart"></div>
</div>
</div>
<!-- Check positioning using grid areas -->
<div style="position: relative">
<div class="grid gridAreas gridNoLineNames">
- <div class="sizedToGridArea" style="-webkit-grid-column: d;" id="GridAreasNoNamesColumnD"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: d;" id="GridAreasNoNamesRowD"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: c;" id="GridAreasNoNamesColumnC"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: c;" id="GridAreasNoNamesRowC"></div>
+ <div class="sizedToGridArea" style="grid-column: d;" id="GridAreasNoNamesColumnD"></div>
+ <div class="sizedToGridArea" style="grid-row: d;" id="GridAreasNoNamesRowD"></div>
+ <div class="sizedToGridArea" style="grid-column: c;" id="GridAreasNoNamesColumnC"></div>
+ <div class="sizedToGridArea" style="grid-row: c;" id="GridAreasNoNamesRowC"></div>
</div>
</div>
<div style="position: relative">
<div class="grid gridAreas gridNoLineNames">
- <div class="sizedToGridArea" style="-webkit-grid-column: a;" id="GridAreasNoNamesColumnA"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: a;" id="GridAreasNoNamesRowA"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: a; -webkit-grid-row: a;" id="GridAreasNoNamesColumnARowA"></div>
+ <div class="sizedToGridArea" style="grid-column: a;" id="GridAreasNoNamesColumnA"></div>
+ <div class="sizedToGridArea" style="grid-row: a;" id="GridAreasNoNamesRowA"></div>
+ <div class="sizedToGridArea" style="grid-column: a; grid-row: a;" id="GridAreasNoNamesColumnARowA"></div>
</div>
</div>
<!-- Use grid area's implicit line names if defined before explicitly named grid lines -->
<div style="position: relative">
<div class="grid gridAreas gridWithNamedLineAfterGridArea">
- <div class="sizedToGridArea" style="-webkit-grid-column: d;" id="GridAreasNamedLineAfterColumnD"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: d;" id="GridAreasNamedLineAfterRowD"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: c;" id="GridAreasNamedLineAfterColumnC"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: c;" id="GridAreasNamedLineAfterRowC"></div>
+ <div class="sizedToGridArea" style="grid-column: d;" id="GridAreasNamedLineAfterColumnD"></div>
+ <div class="sizedToGridArea" style="grid-row: d;" id="GridAreasNamedLineAfterRowD"></div>
+ <div class="sizedToGridArea" style="grid-column: c;" id="GridAreasNamedLineAfterColumnC"></div>
+ <div class="sizedToGridArea" style="grid-row: c;" id="GridAreasNamedLineAfterRowC"></div>
</div>
</div>
<div style="position: relative">
<div class="grid gridAreas gridWithNamedLineAfterGridArea">
- <div class="sizedToGridArea" style="-webkit-grid-column-start: a-start;" id="GridAreasNamedLineAfterColumnStartAStart"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row-start: c-start;" id="GridAreasNamedLineAfterRowStartCStart"></div>
+ <div class="sizedToGridArea" style="grid-column-start: a-start;" id="GridAreasNamedLineAfterColumnStartAStart"></div>
+ <div class="sizedToGridArea" style="grid-row-start: c-start;" id="GridAreasNamedLineAfterRowStartCStart"></div>
</div>
</div>
<div style="position: relative">
<div class="grid gridAreas gridWithNamedLineAfterGridArea">
- <div class="sizedToGridArea" style="-webkit-grid-column: a;" id="GridAreasNamedLineAfterColumnA"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: a; -webkit-grid-row: d;" id="GridAreasNamedLineAfterColumnARowD"></div>
+ <div class="sizedToGridArea" style="grid-column: a;" id="GridAreasNamedLineAfterColumnA"></div>
+ <div class="sizedToGridArea" style="grid-column: a; grid-row: d;" id="GridAreasNamedLineAfterColumnARowD"></div>
</div>
</div>
<!-- Use explicitly named grid lines if they're defined before the grid area -->
<div style="position: relative">
<div class="grid gridAreas gridWithNamedLineBeforeGridArea">
- <div class="sizedToGridArea" style="-webkit-grid-column: d;" id="GridAreasNamedLineBeforeColumnD"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: d;" id="GridAreasNamedLineBeforeRowD"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: c;" id="GridAreasNamedLineBeforeColumnC"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: c;" id="GridAreasNamedLineBeforeRowC"></div>
+ <div class="sizedToGridArea" style="grid-column: d;" id="GridAreasNamedLineBeforeColumnD"></div>
+ <div class="sizedToGridArea" style="grid-row: d;" id="GridAreasNamedLineBeforeRowD"></div>
+ <div class="sizedToGridArea" style="grid-column: c;" id="GridAreasNamedLineBeforeColumnC"></div>
+ <div class="sizedToGridArea" style="grid-row: c;" id="GridAreasNamedLineBeforeRowC"></div>
</div>
</div>
<div style="position: relative">
<div class="grid gridAreas gridWithNamedLineBeforeGridArea">
- <div class="sizedToGridArea" style="-webkit-grid-column-start: d-start;" id="GridAreasNamedLineBeforeColumnStartDStart"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row-start: d-start;" id="GridAreasNamedLineBeforeRowStartDStart"></div>
+ <div class="sizedToGridArea" style="grid-column-start: d-start;" id="GridAreasNamedLineBeforeColumnStartDStart"></div>
+ <div class="sizedToGridArea" style="grid-row-start: d-start;" id="GridAreasNamedLineBeforeRowStartDStart"></div>
</div>
</div>
<div style="position: relative">
<div class="grid gridAreas gridWithNamedLineBeforeGridArea">
- <div class="sizedToGridArea" style="-webkit-grid-column: a;" id="GridAreasNamedLineBeforeColumnA"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: a; -webkit-grid-row: d;" id="GridAreasNamedLineBeforeColumnARowD"></div>
+ <div class="sizedToGridArea" style="grid-column: a;" id="GridAreasNamedLineBeforeColumnA"></div>
+ <div class="sizedToGridArea" style="grid-column: a; grid-row: d;" id="GridAreasNamedLineBeforeColumnARowD"></div>
</div>
</div>
<!-- Check that a "-start" ident in a end column or a "-end" ident in a start column is not treated as a implicit grid line of a grid area -->
<div style="position: relative">
<div class="grid gridAreas gridNoLineNames">
- <div class="sizedToGridArea" style="-webkit-grid-column: a / a-start; -webkit-grid-row: d-start;" id="GridAreasNoNamesColumnAAStartRowDStart"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: d / d-start; -webkit-grid-row: c-start;" id="GridAreasNoNamesColumnDDStartRowCStart"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: c; -webkit-grid-row: a / a-start;" id="GridAreasNoNamesColumnCRowAAStart"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: d; -webkit-grid-row: c / c-start;" id="GridAreasNoNamesColumnDRowCCStart"></div>
+ <div class="sizedToGridArea" style="grid-column: a / a-start; grid-row: d-start;" id="GridAreasNoNamesColumnAAStartRowDStart"></div>
+ <div class="sizedToGridArea" style="grid-column: d / d-start; grid-row: c-start;" id="GridAreasNoNamesColumnDDStartRowCStart"></div>
+ <div class="sizedToGridArea" style="grid-column: c; grid-row: a / a-start;" id="GridAreasNoNamesColumnCRowAAStart"></div>
+ <div class="sizedToGridArea" style="grid-column: d; grid-row: c / c-start;" id="GridAreasNoNamesColumnDRowCCStart"></div>
</div>
</div>
<!-- Check that we propertly resolve explicit "-end" lines inside grid areas -->
<div style="position: relative">
<div class="grid gridAreas gridWithEndLines">
- <div class="sizedToGridArea" style="-webkit-grid-column: a" id="GridAreasEnd"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: a; -webkit-grid-row: c" id="GridAreasEndColumnARowC"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: d;" id="GridAreasEndRowD"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: a; -webkit-grid-row: d;" id="GridAreasEndColumnARowD"></div>
+ <div class="sizedToGridArea" style="grid-column: a" id="GridAreasEnd"></div>
+ <div class="sizedToGridArea" style="grid-column: a; grid-row: c" id="GridAreasEndColumnARowC"></div>
+ <div class="sizedToGridArea" style="grid-row: d;" id="GridAreasEndRowD"></div>
+ <div class="sizedToGridArea" style="grid-column: a; grid-row: d;" id="GridAreasEndColumnARowD"></div>
</div>
</div>
<!-- Check that we always pick the first definition when multiple grid lines have the same name -->
<div style="position: relative">
<div class="grid gridAreas gridRepeatedNames">
- <div class="sizedToGridArea" style="-webkit-grid-column: d; -webkit-grid-row: c" id="GridAreasRepeatColumnDRowC"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: d-start / d-end; -webkit-grid-row: c-start / c-end" id="GridAreasRepeatColumnDStartDEndRowCStartCEnd"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: c; -webkit-grid-row: d" id="GridAreasRepeatColumnCRowD"></div>
+ <div class="sizedToGridArea" style="grid-column: d; grid-row: c" id="GridAreasRepeatColumnDRowC"></div>
+ <div class="sizedToGridArea" style="grid-column: d-start / d-end; grid-row: c-start / c-end" id="GridAreasRepeatColumnDStartDEndRowCStartCEnd"></div>
+ <div class="sizedToGridArea" style="grid-column: c; grid-row: d" id="GridAreasRepeatColumnCRowD"></div>
</div>
</div>
diff --git a/LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-resolution.html b/LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-resolution.html
index 5bb6f73..3ed69f9 100644
--- a/LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-resolution.html
+++ b/LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-resolution.html
@@ -6,50 +6,50 @@
<style type="text/css">
.gridAreas {
- -webkit-grid-template-areas: ". a a"
+ grid-template-areas: ". a a"
"c a a"
". . d";
}
.gridAreasSpecial {
- -webkit-grid-template-areas: ". a-start a-start"
+ grid-template-areas: ". a-start a-start"
"c a-end a-end"
". . d";
}
.gridNoLineNames {
- -webkit-grid-template-columns: 50px 100px 200px;
- -webkit-grid-template-rows: 50px 100px 200px;
+ grid-template-columns: 50px 100px 200px;
+ grid-template-rows: 50px 100px 200px;
}
.gridUniqueNames {
- -webkit-grid-template-columns: [a] 50px [b b-start] 100px [c -start] 200px [d];
- -webkit-grid-template-rows: [e] 50px [f -end] 100px [g g-start] 200px [h];
+ grid-template-columns: [a] 50px [b b-start] 100px [c -start] 200px [d];
+ grid-template-rows: [e] 50px [f -end] 100px [g g-start] 200px [h];
}
.gridWithNamedLineBeforeGridArea {
- -webkit-grid-template-columns: [a-start c-start] 50px [d-start] 100px 200px;
- -webkit-grid-template-rows: [c-start] 50px [d-start] 100px 200px;
+ grid-template-columns: [a-start c-start] 50px [d-start] 100px 200px;
+ grid-template-rows: [c-start] 50px [d-start] 100px 200px;
}
.gridWithNamedLineAfterGridArea {
- -webkit-grid-template-columns: 50px 100px [a-start] 200px;
- -webkit-grid-template-rows: 50px 100px [c-start] 200px;
+ grid-template-columns: 50px 100px [a-start] 200px;
+ grid-template-rows: 50px 100px [c-start] 200px;
}
.gridWithEndLines {
- -webkit-grid-template-columns: 50px 100px [a-end] 200px [c-end];
- -webkit-grid-template-rows: 50px [c-end] 100px [d-end] 200px;
+ grid-template-columns: 50px 100px [a-end] 200px [c-end];
+ grid-template-rows: 50px [c-end] 100px [d-end] 200px;
}
.gridRepeatedNames {
- -webkit-grid-template-columns: [d-start] 50px [d-start] 100px [d-start] 200px;
- -webkit-grid-template-rows: 50px [c-end] 100px [c-end] 200px [c-end];
+ grid-template-columns: [d-start] 50px [d-start] 100px [d-start] 200px;
+ grid-template-rows: 50px [c-end] 100px [c-end] 200px [c-end];
}
.gridImplicitArea {
- -webkit-grid-template-columns: 50px [z-start] 100px [z-end] 200px;
- -webkit-grid-template-rows: 50px [z-start] 100px 200px [z-end];
+ grid-template-columns: 50px [z-start] 100px [z-end] 200px;
+ grid-template-rows: 50px [z-start] 100px 200px [z-end];
}
</style>
@@ -62,186 +62,186 @@
<!-- Check positioning using unique grid-line names -->
<div style="position: relative">
<div class="grid gridUniqueNames">
- <div class="sizedToGridArea" style="-webkit-grid-column: b;" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: e;" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="50"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: b-start;" data-offset-x="50" data-offset-y="50" data-expected-width="100" data-expected-height="100"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: g-start;" data-offset-x="0" data-offset-y="150" data-expected-width="50" data-expected-height="200"></div>
+ <div class="sizedToGridArea" style="grid-column: b;" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
+ <div class="sizedToGridArea" style="grid-row: e;" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="50"></div>
+ <div class="sizedToGridArea" style="grid-column: b-start;" data-offset-x="50" data-offset-y="50" data-expected-width="100" data-expected-height="100"></div>
+ <div class="sizedToGridArea" style="grid-row: g-start;" data-offset-x="0" data-offset-y="150" data-expected-width="50" data-expected-height="200"></div>
</div>
</div>
<div style="position: relative">
<div class="grid gridUniqueNames">
- <div class="sizedToGridArea" style="-webkit-grid-column: b / d;" data-offset-x="50" data-offset-y="0" data-expected-width="300" data-expected-height="50"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: g / h;" data-offset-x="0" data-offset-y="150" data-expected-width="50" data-expected-height="200"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: c; -webkit-grid-row: f;" data-offset-x="150" data-offset-y="50" data-expected-width="200" data-expected-height="100"></div>
+ <div class="sizedToGridArea" style="grid-column: b / d;" data-offset-x="50" data-offset-y="0" data-expected-width="300" data-expected-height="50"></div>
+ <div class="sizedToGridArea" style="grid-row: g / h;" data-offset-x="0" data-offset-y="150" data-expected-width="50" data-expected-height="200"></div>
+ <div class="sizedToGridArea" style="grid-column: c; grid-row: f;" data-offset-x="150" data-offset-y="50" data-expected-width="200" data-expected-height="100"></div>
</div>
</div>
<!-- Check positioning using unique grid-line names mixed with integers -->
<div style="position: relative">
<div class="grid gridUniqueNames">
- <div class="sizedToGridArea" style="-webkit-grid-column: b / 4;" data-offset-x="50" data-offset-y="0" data-expected-width="300" data-expected-height="50"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: 3 / h;" data-offset-x="0" data-offset-y="150" data-expected-width="50" data-expected-height="200"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: 2; -webkit-grid-row: g;" data-offset-x="50" data-offset-y="150" data-expected-width="100" data-expected-height="200"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: a; -webkit-grid-row: 2;" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="100"></div>
+ <div class="sizedToGridArea" style="grid-column: b / 4;" data-offset-x="50" data-offset-y="0" data-expected-width="300" data-expected-height="50"></div>
+ <div class="sizedToGridArea" style="grid-row: 3 / h;" data-offset-x="0" data-offset-y="150" data-expected-width="50" data-expected-height="200"></div>
+ <div class="sizedToGridArea" style="grid-column: 2; grid-row: g;" data-offset-x="50" data-offset-y="150" data-expected-width="100" data-expected-height="200"></div>
+ <div class="sizedToGridArea" style="grid-column: a; grid-row: 2;" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="100"></div>
</div>
</div>
<!-- Check that without named gridAreas there are no implicit grid-line names defined -->
<div style="position: relative">
<div class="grid gridUniqueNames justifyContentStart">
- <div class="sizedToGridArea" style="-webkit-grid-column: c-start;" data-offset-x="350" data-offset-y="0" data-expected-width="0" data-expected-height="50"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: f-start;" data-offset-x="0" data-offset-y="350" data-expected-width="50" data-expected-height="0"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: c-start; -webkit-grid-row: f-end" data-offset-x="350" data-offset-y="350" data-expected-width="0" data-expected-height="0"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: b-end; -webkit-grid-row: h-start" data-offset-x="350" data-offset-y="350" data-expected-width="0" data-expected-height="0"></div>
+ <div class="sizedToGridArea" style="grid-column: c-start;" data-offset-x="350" data-offset-y="0" data-expected-width="0" data-expected-height="50"></div>
+ <div class="sizedToGridArea" style="grid-row: f-start;" data-offset-x="0" data-offset-y="350" data-expected-width="50" data-expected-height="0"></div>
+ <div class="sizedToGridArea" style="grid-column: c-start; grid-row: f-end" data-offset-x="350" data-offset-y="350" data-expected-width="0" data-expected-height="0"></div>
+ <div class="sizedToGridArea" style="grid-column: b-end; grid-row: h-start" data-offset-x="350" data-offset-y="350" data-expected-width="0" data-expected-height="0"></div>
</div>
</div>
<!-- Check that gridArea's implicit names are well defined -->
<div style="position: relative">
<div class="grid gridAreas gridNoLineNames">
- <div class="sizedToGridArea" style="-webkit-grid-column: a-start; -webkit-grid-row: d-start;" data-offset-x="50" data-offset-y="150" data-expected-width="100" data-expected-height="200"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: a-start; -webkit-grid-row: d;" data-offset-x="50" data-offset-y="150" data-expected-width="100" data-expected-height="200"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: d-start; -webkit-grid-row: c-start;" data-offset-x="150" data-offset-y="50" data-expected-width="200" data-expected-height="100"></div>
+ <div class="sizedToGridArea" style="grid-column: a-start; grid-row: d-start;" data-offset-x="50" data-offset-y="150" data-expected-width="100" data-expected-height="200"></div>
+ <div class="sizedToGridArea" style="grid-column: a-start; grid-row: d;" data-offset-x="50" data-offset-y="150" data-expected-width="100" data-expected-height="200"></div>
+ <div class="sizedToGridArea" style="grid-column: d-start; grid-row: c-start;" data-offset-x="150" data-offset-y="50" data-expected-width="200" data-expected-height="100"></div>
</div>
</div>
<!-- Check positioning using grid areas -->
<div style="position: relative">
<div class="grid gridAreas gridNoLineNames gridAutoFlowRowDense">
- <div class="sizedToGridArea" style="-webkit-grid-column: d;" data-offset-x="150" data-offset-y="0" data-expected-width="200" data-expected-height="50"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: d;" data-offset-x="0" data-offset-y="150" data-expected-width="50" data-expected-height="200"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: c;" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="50"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: c;" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="100"></div>
+ <div class="sizedToGridArea" style="grid-column: d;" data-offset-x="150" data-offset-y="0" data-expected-width="200" data-expected-height="50"></div>
+ <div class="sizedToGridArea" style="grid-row: d;" data-offset-x="0" data-offset-y="150" data-expected-width="50" data-expected-height="200"></div>
+ <div class="sizedToGridArea" style="grid-column: c;" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="50"></div>
+ <div class="sizedToGridArea" style="grid-row: c;" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="100"></div>
</div>
</div>
<div style="position: relative">
<div class="grid gridAreas gridNoLineNames">
- <div class="sizedToGridArea" style="-webkit-grid-column: a;" data-offset-x="50" data-offset-y="150" data-expected-width="300" data-expected-height="200"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: a;" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="150"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: a; -webkit-grid-row: a;" data-offset-x="50" data-offset-y="0" data-expected-width="300" data-expected-height="150"></div>
+ <div class="sizedToGridArea" style="grid-column: a;" data-offset-x="50" data-offset-y="150" data-expected-width="300" data-expected-height="200"></div>
+ <div class="sizedToGridArea" style="grid-row: a;" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="150"></div>
+ <div class="sizedToGridArea" style="grid-column: a; grid-row: a;" data-offset-x="50" data-offset-y="0" data-expected-width="300" data-expected-height="150"></div>
</div>
</div>
<!-- Use grid area's implicit line names if defined before explicitly named grid lines -->
<div style="position: relative">
<div class="grid gridAreas gridWithNamedLineAfterGridArea gridAutoFlowRowDense">
- <div class="sizedToGridArea" style="-webkit-grid-column: d;" data-offset-x="150" data-offset-y="0" data-expected-width="200" data-expected-height="50"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: d;" data-offset-x="0" data-offset-y="150" data-expected-width="50" data-expected-height="200"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: c;" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="50"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: c;" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="100"></div>
+ <div class="sizedToGridArea" style="grid-column: d;" data-offset-x="150" data-offset-y="0" data-expected-width="200" data-expected-height="50"></div>
+ <div class="sizedToGridArea" style="grid-row: d;" data-offset-x="0" data-offset-y="150" data-expected-width="50" data-expected-height="200"></div>
+ <div class="sizedToGridArea" style="grid-column: c;" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="50"></div>
+ <div class="sizedToGridArea" style="grid-row: c;" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="100"></div>
</div>
</div>
<div style="position: relative">
<div class="grid gridAreas gridWithNamedLineAfterGridArea">
- <div class="sizedToGridArea" style="-webkit-grid-column-start: a-start;" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row-start: c-start;" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="100"></div>
+ <div class="sizedToGridArea" style="grid-column-start: a-start;" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
+ <div class="sizedToGridArea" style="grid-row-start: c-start;" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="100"></div>
</div>
</div>
<div style="position: relative">
<div class="grid gridAreas gridWithNamedLineAfterGridArea">
- <div class="sizedToGridArea" style="-webkit-grid-column: a;" data-offset-x="50" data-offset-y="0" data-expected-width="300" data-expected-height="50"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: d;" data-offset-x="0" data-offset-y="150" data-expected-width="50" data-expected-height="200"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: a; -webkit-grid-row: d;" data-offset-x="50" data-offset-y="150" data-expected-width="300" data-expected-height="200"></div>
+ <div class="sizedToGridArea" style="grid-column: a;" data-offset-x="50" data-offset-y="0" data-expected-width="300" data-expected-height="50"></div>
+ <div class="sizedToGridArea" style="grid-row: d;" data-offset-x="0" data-offset-y="150" data-expected-width="50" data-expected-height="200"></div>
+ <div class="sizedToGridArea" style="grid-column: a; grid-row: d;" data-offset-x="50" data-offset-y="150" data-expected-width="300" data-expected-height="200"></div>
</div>
</div>
<!-- Use explicitly named grid lines if they're defined before the grid area -->
<div style="position: relative">
<div class="grid gridAreas gridWithNamedLineBeforeGridArea">
- <div class="sizedToGridArea" style="-webkit-grid-column: d;" data-offset-x="50" data-offset-y="150" data-expected-width="300" data-expected-height="200"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: d;" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="300"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: c;" data-offset-x="0" data-offset-y="350" data-expected-width="50" data-expected-height="0"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: c;" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="150"></div>
+ <div class="sizedToGridArea" style="grid-column: d;" data-offset-x="50" data-offset-y="150" data-expected-width="300" data-expected-height="200"></div>
+ <div class="sizedToGridArea" style="grid-row: d;" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="300"></div>
+ <div class="sizedToGridArea" style="grid-column: c;" data-offset-x="0" data-offset-y="350" data-expected-width="50" data-expected-height="0"></div>
+ <div class="sizedToGridArea" style="grid-row: c;" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="150"></div>
</div>
</div>
<div style="position: relative">
<div class="grid gridAreas gridWithNamedLineBeforeGridArea justifyContentStart">
- <div class="sizedToGridArea" style="-webkit-grid-column-start: d-start;" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row-start: d-start;" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="100"></div>
+ <div class="sizedToGridArea" style="grid-column-start: d-start;" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
+ <div class="sizedToGridArea" style="grid-row-start: d-start;" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="100"></div>
</div>
</div>
<div style="position: relative">
<div class="grid gridAreas gridWithNamedLineBeforeGridArea justifyContentStart">
- <div class="sizedToGridArea" style="-webkit-grid-column: a;" data-offset-x="0" data-offset-y="0" data-expected-width="350" data-expected-height="50"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: d;" data-offset-x="350" data-offset-y="50" data-expected-width="0" data-expected-height="300"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: a; -webkit-grid-row: d;" data-offset-x="0" data-offset-y="50" data-expected-width="350" data-expected-height="300"></div>
+ <div class="sizedToGridArea" style="grid-column: a;" data-offset-x="0" data-offset-y="0" data-expected-width="350" data-expected-height="50"></div>
+ <div class="sizedToGridArea" style="grid-row: d;" data-offset-x="350" data-offset-y="50" data-expected-width="0" data-expected-height="300"></div>
+ <div class="sizedToGridArea" style="grid-column: a; grid-row: d;" data-offset-x="0" data-offset-y="50" data-expected-width="350" data-expected-height="300"></div>
</div>
</div>
<!-- Check that a "-start" ident in a end column or a "-end" ident in a start column is not treated as a implicit grid line of a grid area -->
<div style="position: relative">
<div class="grid gridAreas gridNoLineNames">
- <div class="sizedToGridArea" style="-webkit-grid-column: a / a-start; -webkit-grid-row: d-start;" data-offset-x="50" data-offset-y="150" data-expected-width="100" data-expected-height="200"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: d / d-start; -webkit-grid-row: c-start;" data-offset-x="150" data-offset-y="50" data-expected-width="200" data-expected-height="100"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: c; -webkit-grid-row: a / a-start;" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="50"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: d; -webkit-grid-row: c / c-start;" data-offset-x="150" data-offset-y="50" data-expected-width="200" data-expected-height="100"></div>
+ <div class="sizedToGridArea" style="grid-column: a / a-start; grid-row: d-start;" data-offset-x="50" data-offset-y="150" data-expected-width="100" data-expected-height="200"></div>
+ <div class="sizedToGridArea" style="grid-column: d / d-start; grid-row: c-start;" data-offset-x="150" data-offset-y="50" data-expected-width="200" data-expected-height="100"></div>
+ <div class="sizedToGridArea" style="grid-column: c; grid-row: a / a-start;" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="50"></div>
+ <div class="sizedToGridArea" style="grid-column: d; grid-row: c / c-start;" data-offset-x="150" data-offset-y="50" data-expected-width="200" data-expected-height="100"></div>
</div>
</div>
<!-- Check that we propertly resolve explicit "-end" lines inside grid areas -->
<div style="position: relative">
<div class="grid gridAreas gridWithEndLines">
- <div class="sizedToGridArea" style="-webkit-grid-column: a" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: a; -webkit-grid-row: c" data-offset-x="50" data-offset-y="50" data-expected-width="100" data-expected-height="100"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: d;" data-offset-x="0" data-offset-y="150" data-expected-width="50" data-expected-height="200"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: a; -webkit-grid-row: d;" data-offset-x="50" data-offset-y="150" data-expected-width="100" data-expected-height="200"></div>
+ <div class="sizedToGridArea" style="grid-column: a" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
+ <div class="sizedToGridArea" style="grid-column: a; grid-row: c" data-offset-x="50" data-offset-y="50" data-expected-width="100" data-expected-height="100"></div>
+ <div class="sizedToGridArea" style="grid-row: d;" data-offset-x="0" data-offset-y="150" data-expected-width="50" data-expected-height="200"></div>
+ <div class="sizedToGridArea" style="grid-column: a; grid-row: d;" data-offset-x="50" data-offset-y="150" data-expected-width="100" data-expected-height="200"></div>
</div>
</div>
<!-- Check that we always pick the first definition when multiple grid lines have the same name -->
<div style="position: relative">
<div class="grid gridAreas gridRepeatedNames">
- <div class="sizedToGridArea" style="-webkit-grid-column: d; -webkit-grid-row: c" data-offset-x="0" data-offset-y="50" data-expected-width="350" data-expected-height="100"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: d-start / d-end; -webkit-grid-row: c-start / c-end" data-offset-x="0" data-offset-y="50" data-expected-width="350" data-expected-height="100"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: c; -webkit-grid-row: d" data-offset-x="0" data-offset-y="150" data-expected-width="50" data-expected-height="200"></div>
+ <div class="sizedToGridArea" style="grid-column: d; grid-row: c" data-offset-x="0" data-offset-y="50" data-expected-width="350" data-expected-height="100"></div>
+ <div class="sizedToGridArea" style="grid-column: d-start / d-end; grid-row: c-start / c-end" data-offset-x="0" data-offset-y="50" data-expected-width="350" data-expected-height="100"></div>
+ <div class="sizedToGridArea" style="grid-column: c; grid-row: d" data-offset-x="0" data-offset-y="150" data-expected-width="50" data-expected-height="200"></div>
</div>
</div>
<!-- Check behavior with areas named *-start or *-end -->
<div style="position: relative">
<div class="grid gridAreasSpecial gridNoLineNames justifyContentStart">
- <div class="sizedToGridArea" style="-webkit-grid-column: a;" data-offset-x="350" data-offset-y="0" data-expected-width="0" data-expected-height="50"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: a;" data-offset-x="0" data-offset-y="350" data-expected-width="50" data-expected-height="0"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: a; -webkit-grid-row: a;" data-offset-x="350" data-offset-y="350" data-expected-width="0" data-expected-height="0"></div>
+ <div class="sizedToGridArea" style="grid-column: a;" data-offset-x="350" data-offset-y="0" data-expected-width="0" data-expected-height="50"></div>
+ <div class="sizedToGridArea" style="grid-row: a;" data-offset-x="0" data-offset-y="350" data-expected-width="50" data-expected-height="0"></div>
+ <div class="sizedToGridArea" style="grid-column: a; grid-row: a;" data-offset-x="350" data-offset-y="350" data-expected-width="0" data-expected-height="0"></div>
</div>
</div>
<div style="position: relative">
<div class="grid gridAreasSpecial gridNoLineNames">
- <div class="sizedToGridArea" style="-webkit-grid-column: a-start;" data-offset-x="50" data-offset-y="0" data-expected-width="300" data-expected-height="50"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: a-end;" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="100"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: a-start; -webkit-grid-row: a-end;" data-offset-x="50" data-offset-y="50" data-expected-width="300" data-expected-height="100"></div>
+ <div class="sizedToGridArea" style="grid-column: a-start;" data-offset-x="50" data-offset-y="0" data-expected-width="300" data-expected-height="50"></div>
+ <div class="sizedToGridArea" style="grid-row: a-end;" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="100"></div>
+ <div class="sizedToGridArea" style="grid-column: a-start; grid-row: a-end;" data-offset-x="50" data-offset-y="50" data-expected-width="300" data-expected-height="100"></div>
</div>
</div>
<div style="position: relative">
<div class="grid gridAreasSpecial gridWithNamedLineBeforeGridArea">
- <div class="sizedToGridArea" style="-webkit-grid-column: a-start;" data-offset-x="50" data-offset-y="0" data-expected-width="300" data-expected-height="50"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: a-end;" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="100"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: a-start; -webkit-grid-row: a-end;" data-offset-x="50" data-offset-y="50" data-expected-width="300" data-expected-height="100"></div>
+ <div class="sizedToGridArea" style="grid-column: a-start;" data-offset-x="50" data-offset-y="0" data-expected-width="300" data-expected-height="50"></div>
+ <div class="sizedToGridArea" style="grid-row: a-end;" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="100"></div>
+ <div class="sizedToGridArea" style="grid-column: a-start; grid-row: a-end;" data-offset-x="50" data-offset-y="50" data-expected-width="300" data-expected-height="100"></div>
</div>
</div>
<div style="position: relative">
<div class="grid gridAreasSpecial gridWithNamedLineAfterGridArea">
- <div class="sizedToGridArea" style="-webkit-grid-column: a-start;" data-offset-x="50" data-offset-y="0" data-expected-width="300" data-expected-height="50"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: d;" data-offset-x="0" data-offset-y="150" data-expected-width="50" data-expected-height="200"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: a-start; -webkit-grid-row: d;" data-offset-x="50" data-offset-y="150" data-expected-width="300" data-expected-height="200"></div>
+ <div class="sizedToGridArea" style="grid-column: a-start;" data-offset-x="50" data-offset-y="0" data-expected-width="300" data-expected-height="50"></div>
+ <div class="sizedToGridArea" style="grid-row: d;" data-offset-x="0" data-offset-y="150" data-expected-width="50" data-expected-height="200"></div>
+ <div class="sizedToGridArea" style="grid-column: a-start; grid-row: d;" data-offset-x="50" data-offset-y="150" data-expected-width="300" data-expected-height="200"></div>
</div>
</div>
<!-- Check behavior with lines named *-start or *-end -->
<div style="position: relative">
<div class="grid gridAreasSpecial gridUniqueNames">
- <div class="sizedToGridArea" style="-webkit-grid-column: -start;" data-offset-x="150" data-offset-y="0" data-expected-width="200" data-expected-height="50"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: -end;" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="100"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column-end: -start; -webkit-grid-row-start: -end;" data-offset-x="50" data-offset-y="50" data-expected-width="100" data-expected-height="100"></div>
+ <div class="sizedToGridArea" style="grid-column: -start;" data-offset-x="150" data-offset-y="0" data-expected-width="200" data-expected-height="50"></div>
+ <div class="sizedToGridArea" style="grid-row: -end;" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="100"></div>
+ <div class="sizedToGridArea" style="grid-column-end: -start; grid-row-start: -end;" data-offset-x="50" data-offset-y="50" data-expected-width="100" data-expected-height="100"></div>
</div>
</div>
@@ -249,9 +249,9 @@
<!-- Check that <custom-ident>-{start|end} named lines define implicit named areas -->
<div style="position: relative">
<div class="grid gridAreas gridImplicitArea">
- <div class="sizedToGridArea" style="-webkit-grid-column: z;" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: z;" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="300"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column-end: z; -webkit-grid-row-start: z;" data-offset-x="50" data-offset-y="50" data-expected-width="100" data-expected-height="100"></div>
+ <div class="sizedToGridArea" style="grid-column: z;" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
+ <div class="sizedToGridArea" style="grid-row: z;" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="300"></div>
+ <div class="sizedToGridArea" style="grid-column-end: z; grid-row-start: z;" data-offset-x="50" data-offset-y="50" data-expected-width="100" data-expected-height="100"></div>
</div>
</div>
diff --git a/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt b/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt
index 288337e..55f0a4d 100644
--- a/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt
@@ -4,154 +4,154 @@
Test getting grid-template-columns and grid-template-rows set through CSS
-PASS window.getComputedStyle(gridWithNoneElement, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithNoneElement, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-template-columns') is "10px"
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-template-rows') is "15px"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-template-columns') is "53%"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-template-rows') is "27%"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-template-columns') is "auto"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-template-rows') is "auto"
-PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-template-columns') is "100px"
-PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-template-rows') is "150px"
-PASS window.getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('-webkit-grid-template-columns') is "64px"
-PASS window.getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('-webkit-grid-template-rows') is "60px"
-PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(10%, 15px)"
-PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(20px, 50%)"
-PASS window.getComputedStyle(gridWithMinContent, '').getPropertyValue('-webkit-grid-template-columns') is "-webkit-min-content"
-PASS window.getComputedStyle(gridWithMinContent, '').getPropertyValue('-webkit-grid-template-rows') is "-webkit-min-content"
-PASS window.getComputedStyle(gridWithMaxContent, '').getPropertyValue('-webkit-grid-template-columns') is "-webkit-max-content"
-PASS window.getComputedStyle(gridWithMaxContent, '').getPropertyValue('-webkit-grid-template-rows') is "-webkit-max-content"
-PASS window.getComputedStyle(gridWithFraction, '').getPropertyValue('-webkit-grid-template-columns') is "1fr"
-PASS window.getComputedStyle(gridWithFraction, '').getPropertyValue('-webkit-grid-template-rows') is "2fr"
-PASS window.getComputedStyle(gridWithCalc, '').getPropertyValue('-webkit-grid-template-columns') is "150px"
-PASS window.getComputedStyle(gridWithCalc, '').getPropertyValue('-webkit-grid-template-rows') is "75px"
-PASS window.getComputedStyle(gridWithCalcComplex, '').getPropertyValue('-webkit-grid-template-columns') is "calc(50% + 150px)"
-PASS window.getComputedStyle(gridWithCalcComplex, '').getPropertyValue('-webkit-grid-template-rows') is "calc(65% + 75px)"
-PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(10%, 15px)"
-PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(20px, 50%)"
-PASS window.getComputedStyle(gridWithCalcComplexInsideMinMax, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(10%, calc(50% + 15px))"
-PASS window.getComputedStyle(gridWithCalcComplexInsideMinMax, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(calc(20px + 10%), 50%)"
-PASS window.getComputedStyle(gridWithAutoInsideMinMax, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(auto, 20px)"
-PASS window.getComputedStyle(gridWithAutoInsideMinMax, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(-webkit-min-content, auto)"
+PASS window.getComputedStyle(gridWithNoneElement, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithNoneElement, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-columns') is "10px"
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-rows') is "15px"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-columns') is "53%"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-rows') is "27%"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-columns') is "auto"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-rows') is "auto"
+PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('grid-template-columns') is "100px"
+PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('grid-template-rows') is "150px"
+PASS window.getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('grid-template-columns') is "64px"
+PASS window.getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('grid-template-rows') is "60px"
+PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('grid-template-columns') is "minmax(10%, 15px)"
+PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('grid-template-rows') is "minmax(20px, 50%)"
+PASS window.getComputedStyle(gridWithMinContent, '').getPropertyValue('grid-template-columns') is "-webkit-min-content"
+PASS window.getComputedStyle(gridWithMinContent, '').getPropertyValue('grid-template-rows') is "-webkit-min-content"
+PASS window.getComputedStyle(gridWithMaxContent, '').getPropertyValue('grid-template-columns') is "-webkit-max-content"
+PASS window.getComputedStyle(gridWithMaxContent, '').getPropertyValue('grid-template-rows') is "-webkit-max-content"
+PASS window.getComputedStyle(gridWithFraction, '').getPropertyValue('grid-template-columns') is "1fr"
+PASS window.getComputedStyle(gridWithFraction, '').getPropertyValue('grid-template-rows') is "2fr"
+PASS window.getComputedStyle(gridWithCalc, '').getPropertyValue('grid-template-columns') is "150px"
+PASS window.getComputedStyle(gridWithCalc, '').getPropertyValue('grid-template-rows') is "75px"
+PASS window.getComputedStyle(gridWithCalcComplex, '').getPropertyValue('grid-template-columns') is "calc(50% + 150px)"
+PASS window.getComputedStyle(gridWithCalcComplex, '').getPropertyValue('grid-template-rows') is "calc(65% + 75px)"
+PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('grid-template-columns') is "minmax(10%, 15px)"
+PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('grid-template-rows') is "minmax(20px, 50%)"
+PASS window.getComputedStyle(gridWithCalcComplexInsideMinMax, '').getPropertyValue('grid-template-columns') is "minmax(10%, calc(50% + 15px))"
+PASS window.getComputedStyle(gridWithCalcComplexInsideMinMax, '').getPropertyValue('grid-template-rows') is "minmax(calc(20px + 10%), 50%)"
+PASS window.getComputedStyle(gridWithAutoInsideMinMax, '').getPropertyValue('grid-template-columns') is "minmax(auto, 20px)"
+PASS window.getComputedStyle(gridWithAutoInsideMinMax, '').getPropertyValue('grid-template-rows') is "minmax(-webkit-min-content, auto)"
Test getting wrong values for grid-template-columns and grid-template-rows through CSS (they should resolve to the default: 'none')
-PASS window.getComputedStyle(gridWithFitContentElement, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithFitContentElement, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithFitContentElement, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithFitContentElement, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('grid-template-rows') is "none"
Test the initial value
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is 'none'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is 'none'
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is 'none'
Test getting and setting grid-template-columns and grid-template-rows through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "18px"
-PASS element.style.webkitGridTemplateColumns is "18px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "66px"
-PASS element.style.webkitGridTemplateRows is "66px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "55%"
-PASS element.style.webkitGridTemplateColumns is "55%"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "40%"
-PASS element.style.webkitGridTemplateRows is "40%"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "auto"
-PASS element.style.webkitGridTemplateColumns is "auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "auto"
-PASS element.style.webkitGridTemplateRows is "auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "80px"
-PASS element.style.webkitGridTemplateColumns is "10vw"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "150px"
-PASS element.style.webkitGridTemplateRows is "25vh"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "-webkit-min-content"
-PASS element.style.webkitGridTemplateColumns is "-webkit-min-content"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "-webkit-min-content"
-PASS element.style.webkitGridTemplateRows is "-webkit-min-content"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "-webkit-max-content"
-PASS element.style.webkitGridTemplateColumns is "-webkit-max-content"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "-webkit-max-content"
-PASS element.style.webkitGridTemplateRows is "-webkit-max-content"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "18px"
+PASS element.style.gridTemplateColumns is "18px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "66px"
+PASS element.style.gridTemplateRows is "66px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "55%"
+PASS element.style.gridTemplateColumns is "55%"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "40%"
+PASS element.style.gridTemplateRows is "40%"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "auto"
+PASS element.style.gridTemplateColumns is "auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "auto"
+PASS element.style.gridTemplateRows is "auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "80px"
+PASS element.style.gridTemplateColumns is "10vw"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "150px"
+PASS element.style.gridTemplateRows is "25vh"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "-webkit-min-content"
+PASS element.style.gridTemplateColumns is "-webkit-min-content"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "-webkit-min-content"
+PASS element.style.gridTemplateRows is "-webkit-min-content"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "-webkit-max-content"
+PASS element.style.gridTemplateColumns is "-webkit-max-content"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "-webkit-max-content"
+PASS element.style.gridTemplateRows is "-webkit-max-content"
Test getting and setting grid-template-columns and grid-template-rows to minmax() values through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(55%, 45px)"
-PASS element.style.webkitGridTemplateColumns is "minmax(55%, 45px)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(30px, 40%)"
-PASS element.style.webkitGridTemplateRows is "minmax(30px, 40%)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(220px, 48px)"
-PASS element.style.webkitGridTemplateColumns is "minmax(22em, 8vh)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(80px, 50px)"
-PASS element.style.webkitGridTemplateRows is "minmax(10vw, 5em)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(-webkit-min-content, 48px)"
-PASS element.style.webkitGridTemplateColumns is "minmax(-webkit-min-content, 8vh)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(80px, -webkit-min-content)"
-PASS element.style.webkitGridTemplateRows is "minmax(10vw, -webkit-min-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(220px, -webkit-max-content)"
-PASS element.style.webkitGridTemplateColumns is "minmax(22em, -webkit-max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(-webkit-max-content, 50px)"
-PASS element.style.webkitGridTemplateRows is "minmax(-webkit-max-content, 5em)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(-webkit-min-content, -webkit-max-content)"
-PASS element.style.webkitGridTemplateColumns is "minmax(-webkit-min-content, -webkit-max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(-webkit-max-content, -webkit-min-content)"
-PASS element.style.webkitGridTemplateRows is "minmax(-webkit-max-content, -webkit-min-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "3600fr"
-PASS element.style.webkitGridTemplateColumns is "3600fr"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "154fr"
-PASS element.style.webkitGridTemplateRows is "154fr"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "3.1459fr"
-PASS element.style.webkitGridTemplateColumns is "3.1459fr"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "2.718fr"
-PASS element.style.webkitGridTemplateRows is "2.718fr"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "3fr"
-PASS element.style.webkitGridTemplateColumns is "3fr"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "4fr"
-PASS element.style.webkitGridTemplateRows is "4fr"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(auto, 48px)"
-PASS element.style.webkitGridTemplateColumns is "minmax(auto, 8vh)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(80px, auto)"
-PASS element.style.webkitGridTemplateRows is "minmax(10vw, auto)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "minmax(55%, 45px)"
+PASS element.style.gridTemplateColumns is "minmax(55%, 45px)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(30px, 40%)"
+PASS element.style.gridTemplateRows is "minmax(30px, 40%)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "minmax(220px, 48px)"
+PASS element.style.gridTemplateColumns is "minmax(22em, 8vh)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(80px, 50px)"
+PASS element.style.gridTemplateRows is "minmax(10vw, 5em)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "minmax(-webkit-min-content, 48px)"
+PASS element.style.gridTemplateColumns is "minmax(-webkit-min-content, 8vh)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(80px, -webkit-min-content)"
+PASS element.style.gridTemplateRows is "minmax(10vw, -webkit-min-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "minmax(220px, -webkit-max-content)"
+PASS element.style.gridTemplateColumns is "minmax(22em, -webkit-max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(-webkit-max-content, 50px)"
+PASS element.style.gridTemplateRows is "minmax(-webkit-max-content, 5em)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "minmax(-webkit-min-content, -webkit-max-content)"
+PASS element.style.gridTemplateColumns is "minmax(-webkit-min-content, -webkit-max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(-webkit-max-content, -webkit-min-content)"
+PASS element.style.gridTemplateRows is "minmax(-webkit-max-content, -webkit-min-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "3600fr"
+PASS element.style.gridTemplateColumns is "3600fr"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "154fr"
+PASS element.style.gridTemplateRows is "154fr"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "3.1459fr"
+PASS element.style.gridTemplateColumns is "3.1459fr"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "2.718fr"
+PASS element.style.gridTemplateRows is "2.718fr"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "3fr"
+PASS element.style.gridTemplateColumns is "3fr"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "4fr"
+PASS element.style.gridTemplateRows is "4fr"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "minmax(auto, 48px)"
+PASS element.style.gridTemplateColumns is "minmax(auto, 8vh)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(80px, auto)"
+PASS element.style.gridTemplateRows is "minmax(10vw, auto)"
Test setting grid-template-columns and grid-template-rows to bad values through JS
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
Test setting grid-template-columns and grid-template-rows back to 'none' through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "18px"
-PASS element.style.webkitGridTemplateColumns is "18px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "66px"
-PASS element.style.webkitGridTemplateRows is "66px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS element.style.webkitGridTemplateColumns is "none"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS element.style.webkitGridTemplateRows is "none"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "18px"
+PASS element.style.gridTemplateColumns is "18px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "66px"
+PASS element.style.gridTemplateRows is "66px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS element.style.gridTemplateColumns is "none"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS element.style.gridTemplateRows is "none"
Test setting grid-template-columns and grid-template-rows to 'inherit' through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is '50px [last]'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is '[first] 101%'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is '50px [last]'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is '[first] 101%'
Test setting grid-template-columns and grid-template-rows to 'initial' through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is '150% [last]'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is '[first] 1fr'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is 'none'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is '150% [last]'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is '[first] 1fr'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is 'none'
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt b/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt
index bd85dab..5e1a0f9 100644
--- a/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt
@@ -4,114 +4,114 @@
Test getting |grid-template-columns| and |grid-template-rows| set through CSS
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-template-columns') is "7px 11px"
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-template-rows') is "17px 2px"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-template-columns') is "53% 99%"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-template-rows') is "27% 52%"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-template-columns') is "auto auto"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-template-rows') is "auto auto"
-PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-template-columns') is "100px 120px"
-PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-template-rows') is "150px 170px"
-PASS window.getComputedStyle(gridWithThreeItems, '').getPropertyValue('-webkit-grid-template-columns') is "15px auto 100px"
-PASS window.getComputedStyle(gridWithThreeItems, '').getPropertyValue('-webkit-grid-template-rows') is "120px 18px auto"
-PASS window.getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('-webkit-grid-template-columns') is "50% 120px"
-PASS window.getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('-webkit-grid-template-rows') is "35% 168px"
-PASS window.getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('-webkit-grid-template-columns') is "-webkit-min-content -webkit-max-content"
-PASS window.getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('-webkit-grid-template-rows') is "-webkit-max-content -webkit-min-content"
-PASS window.getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(45px, 30%) 15px"
-PASS window.getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('-webkit-grid-template-rows') is "120px minmax(35%, 10px)"
-PASS window.getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(-webkit-min-content, 30%) 15px"
-PASS window.getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('-webkit-grid-template-rows') is "120px minmax(35%, -webkit-max-content)"
-PASS window.getComputedStyle(gridWithFractionFraction, '').getPropertyValue('-webkit-grid-template-columns') is "1fr 2fr"
-PASS window.getComputedStyle(gridWithFractionFraction, '').getPropertyValue('-webkit-grid-template-rows') is "3fr 4fr"
-PASS window.getComputedStyle(gridWithFractionMinMax, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(-webkit-min-content, 45px) 2fr"
-PASS window.getComputedStyle(gridWithFractionMinMax, '').getPropertyValue('-webkit-grid-template-rows') is "3fr minmax(14px, -webkit-max-content)"
-PASS window.getComputedStyle(gridWithCalcCalc, '').getPropertyValue('-webkit-grid-template-columns') is "200px 100px"
-PASS window.getComputedStyle(gridWithCalcCalc, '').getPropertyValue('-webkit-grid-template-rows') is "150px 75px"
-PASS window.getComputedStyle(gridWithCalcAndFixed, '').getPropertyValue('-webkit-grid-template-columns') is "50% 80px"
-PASS window.getComputedStyle(gridWithCalcAndFixed, '').getPropertyValue('-webkit-grid-template-rows') is "88px 25%"
-PASS window.getComputedStyle(gridWithCalcAndMinMax, '').getPropertyValue('-webkit-grid-template-columns') is "calc(30px + 20%) minmax(-webkit-min-content, 80px)"
-PASS window.getComputedStyle(gridWithCalcAndMinMax, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(25%, -webkit-max-content) calc(10% - 7px)"
-PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(calc(23px + 10%), 400px) 120px"
-PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('-webkit-grid-template-rows') is "150px minmax(5%, calc(50% - 125px))"
-PASS window.getComputedStyle(gridWithAutoInsideMinMax, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(auto, 20px) 10%"
-PASS window.getComputedStyle(gridWithAutoInsideMinMax, '').getPropertyValue('-webkit-grid-template-rows') is "-webkit-max-content minmax(-webkit-min-content, auto)"
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-columns') is "7px 11px"
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-rows') is "17px 2px"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-columns') is "53% 99%"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-rows') is "27% 52%"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-columns') is "auto auto"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-rows') is "auto auto"
+PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('grid-template-columns') is "100px 120px"
+PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('grid-template-rows') is "150px 170px"
+PASS window.getComputedStyle(gridWithThreeItems, '').getPropertyValue('grid-template-columns') is "15px auto 100px"
+PASS window.getComputedStyle(gridWithThreeItems, '').getPropertyValue('grid-template-rows') is "120px 18px auto"
+PASS window.getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('grid-template-columns') is "50% 120px"
+PASS window.getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('grid-template-rows') is "35% 168px"
+PASS window.getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('grid-template-columns') is "-webkit-min-content -webkit-max-content"
+PASS window.getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('grid-template-rows') is "-webkit-max-content -webkit-min-content"
+PASS window.getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('grid-template-columns') is "minmax(45px, 30%) 15px"
+PASS window.getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('grid-template-rows') is "120px minmax(35%, 10px)"
+PASS window.getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('grid-template-columns') is "minmax(-webkit-min-content, 30%) 15px"
+PASS window.getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('grid-template-rows') is "120px minmax(35%, -webkit-max-content)"
+PASS window.getComputedStyle(gridWithFractionFraction, '').getPropertyValue('grid-template-columns') is "1fr 2fr"
+PASS window.getComputedStyle(gridWithFractionFraction, '').getPropertyValue('grid-template-rows') is "3fr 4fr"
+PASS window.getComputedStyle(gridWithFractionMinMax, '').getPropertyValue('grid-template-columns') is "minmax(-webkit-min-content, 45px) 2fr"
+PASS window.getComputedStyle(gridWithFractionMinMax, '').getPropertyValue('grid-template-rows') is "3fr minmax(14px, -webkit-max-content)"
+PASS window.getComputedStyle(gridWithCalcCalc, '').getPropertyValue('grid-template-columns') is "200px 100px"
+PASS window.getComputedStyle(gridWithCalcCalc, '').getPropertyValue('grid-template-rows') is "150px 75px"
+PASS window.getComputedStyle(gridWithCalcAndFixed, '').getPropertyValue('grid-template-columns') is "50% 80px"
+PASS window.getComputedStyle(gridWithCalcAndFixed, '').getPropertyValue('grid-template-rows') is "88px 25%"
+PASS window.getComputedStyle(gridWithCalcAndMinMax, '').getPropertyValue('grid-template-columns') is "calc(30px + 20%) minmax(-webkit-min-content, 80px)"
+PASS window.getComputedStyle(gridWithCalcAndMinMax, '').getPropertyValue('grid-template-rows') is "minmax(25%, -webkit-max-content) calc(10% - 7px)"
+PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('grid-template-columns') is "minmax(calc(23px + 10%), 400px) 120px"
+PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('grid-template-rows') is "150px minmax(5%, calc(50% - 125px))"
+PASS window.getComputedStyle(gridWithAutoInsideMinMax, '').getPropertyValue('grid-template-columns') is "minmax(auto, 20px) 10%"
+PASS window.getComputedStyle(gridWithAutoInsideMinMax, '').getPropertyValue('grid-template-rows') is "-webkit-max-content minmax(-webkit-min-content, auto)"
Test the initial value
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is 'none'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is 'none'
Test getting and setting grid-template-rows and grid-template-columns through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "18px 22px"
-PASS element.style.webkitGridTemplateColumns is "18px 22px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "66px 70px"
-PASS element.style.webkitGridTemplateRows is "66px 70px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "55% 80%"
-PASS element.style.webkitGridTemplateColumns is "55% 80%"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "40% 63%"
-PASS element.style.webkitGridTemplateRows is "40% 63%"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "auto auto"
-PASS element.style.webkitGridTemplateColumns is "auto auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "auto auto"
-PASS element.style.webkitGridTemplateRows is "auto auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "auto 160px 22px"
-PASS element.style.webkitGridTemplateColumns is "auto 16em 22px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "56% 100px auto"
-PASS element.style.webkitGridTemplateRows is "56% 10em auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "160px minmax(16px, 20px)"
-PASS element.style.webkitGridTemplateColumns is "16em minmax(16px, 20px)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(10%, 15%) auto"
-PASS element.style.webkitGridTemplateRows is "minmax(10%, 15%) auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "160px 2fr"
-PASS element.style.webkitGridTemplateColumns is "16em 2fr"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "14fr auto"
-PASS element.style.webkitGridTemplateRows is "14fr auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "50% 96px"
-PASS element.style.webkitGridTemplateColumns is "50% 12vw"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "5% 510px"
-PASS element.style.webkitGridTemplateRows is "5% 85vh"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "auto minmax(16px, auto)"
-PASS element.style.webkitGridTemplateColumns is "auto minmax(16px, auto)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(auto, 15%) 80px"
-PASS element.style.webkitGridTemplateRows is "minmax(auto, 15%) 10vw"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "18px 22px"
+PASS element.style.gridTemplateColumns is "18px 22px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "66px 70px"
+PASS element.style.gridTemplateRows is "66px 70px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "55% 80%"
+PASS element.style.gridTemplateColumns is "55% 80%"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "40% 63%"
+PASS element.style.gridTemplateRows is "40% 63%"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "auto auto"
+PASS element.style.gridTemplateColumns is "auto auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "auto auto"
+PASS element.style.gridTemplateRows is "auto auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "auto 160px 22px"
+PASS element.style.gridTemplateColumns is "auto 16em 22px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "56% 100px auto"
+PASS element.style.gridTemplateRows is "56% 10em auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "160px minmax(16px, 20px)"
+PASS element.style.gridTemplateColumns is "16em minmax(16px, 20px)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(10%, 15%) auto"
+PASS element.style.gridTemplateRows is "minmax(10%, 15%) auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "160px 2fr"
+PASS element.style.gridTemplateColumns is "16em 2fr"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "14fr auto"
+PASS element.style.gridTemplateRows is "14fr auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "50% 96px"
+PASS element.style.gridTemplateColumns is "50% 12vw"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "5% 510px"
+PASS element.style.gridTemplateRows is "5% 85vh"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "auto minmax(16px, auto)"
+PASS element.style.gridTemplateColumns is "auto minmax(16px, auto)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(auto, 15%) 80px"
+PASS element.style.gridTemplateRows is "minmax(auto, 15%) 10vw"
Test getting wrong values set from CSS
-PASS getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('-webkit-grid-template-columns') is 'none'
-PASS getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('-webkit-grid-template-rows') is 'none'
-PASS getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('-webkit-grid-template-columns') is 'none'
-PASS getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('-webkit-grid-template-rows') is 'none'
+PASS getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('grid-template-columns') is 'none'
+PASS getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('grid-template-rows') is 'none'
+PASS getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('grid-template-columns') is 'none'
+PASS getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('grid-template-rows') is 'none'
Test setting and getting wrong values from JS
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
Test setting grid-template-columns and grid-template-rows to 'inherit' through JS
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "50px 1fr [last]"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "101% [middle] 45px"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "50px 1fr [last]"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "101% [middle] 45px"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "50px 1fr [last]"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "101% [middle] 45px"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "50px 1fr [last]"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "101% [middle] 45px"
Test setting grid-template-columns and grid-template-rows to 'initial' through JS
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "150% [middle] 55px"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "1fr [line] 2fr [line]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is 'none'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is 'none'
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "150% [middle] 55px"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "1fr [line] 2fr [line]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is 'none'
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html b/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html
index c169ccd..d8c7694 100644
--- a/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html
+++ b/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html
@@ -4,88 +4,88 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.gridWithFixed {
- -webkit-grid-template-columns: 7px 11px;
- -webkit-grid-template-rows: 17px 2px;
+ grid-template-columns: 7px 11px;
+ grid-template-rows: 17px 2px;
}
.gridWithPercent {
- -webkit-grid-template-columns: 53% 99%;
- -webkit-grid-template-rows: 27% 52%;
+ grid-template-columns: 53% 99%;
+ grid-template-rows: 27% 52%;
}
.gridWithAuto {
- -webkit-grid-template-columns: auto auto;
- -webkit-grid-template-rows: auto auto;
+ grid-template-columns: auto auto;
+ grid-template-rows: auto auto;
}
.gridWithEM {
- -webkit-grid-template-columns: 10em 12em;
- -webkit-grid-template-rows: 15em 17em;
+ grid-template-columns: 10em 12em;
+ grid-template-rows: 15em 17em;
font: 10px Ahem;
}
.gridWithNoneAndAuto {
- -webkit-grid-template-columns: none auto;
- -webkit-grid-template-rows: none auto;
+ grid-template-columns: none auto;
+ grid-template-rows: none auto;
}
.gridNoneWithAndFixed {
- -webkit-grid-template-columns: none 15px;
- -webkit-grid-template-rows: none 22px;
+ grid-template-columns: none 15px;
+ grid-template-rows: none 22px;
}
.gridWithThreeItems {
- -webkit-grid-template-columns: 15px auto 10em;
- -webkit-grid-template-rows: 12em 18px auto;
+ grid-template-columns: 15px auto 10em;
+ grid-template-rows: 12em 18px auto;
font: 10px Ahem;
}
.gridWithPercentAndViewportPercent {
- -webkit-grid-template-columns: 50% 15vw;
- -webkit-grid-template-rows: 35% 28vh;
+ grid-template-columns: 50% 15vw;
+ grid-template-rows: 35% 28vh;
}
.gridWithFitContentAndFitAvailable {
- -webkit-grid-template-columns: -webkit-content-available;
- -webkit-grid-template-rows: -webkit-fit-content -webkit-fit-available;
+ grid-template-columns: -webkit-content-available;
+ grid-template-rows: -webkit-fit-content -webkit-fit-available;
}
.gridWithMinMaxContent {
- -webkit-grid-template-columns: -webkit-min-content -webkit-max-content;
- -webkit-grid-template-rows: -webkit-max-content -webkit-min-content;
+ grid-template-columns: -webkit-min-content -webkit-max-content;
+ grid-template-rows: -webkit-max-content -webkit-min-content;
}
.gridWithMinMaxAndFixed {
- -webkit-grid-template-columns: minmax(45px, 30%) 15px;
- -webkit-grid-template-rows: 12em minmax(35%, 10px);
+ grid-template-columns: minmax(45px, 30%) 15px;
+ grid-template-rows: 12em minmax(35%, 10px);
font: 10px Ahem;
}
.gridWithMinMaxAndMinMaxContent {
- -webkit-grid-template-columns: minmax(-webkit-min-content, 30%) 15px;
- -webkit-grid-template-rows: 12em minmax(35%, -webkit-max-content);
+ grid-template-columns: minmax(-webkit-min-content, 30%) 15px;
+ grid-template-rows: 12em minmax(35%, -webkit-max-content);
font: 10px Ahem;
}
.gridWithFractionFraction {
- -webkit-grid-template-columns: 1fr 2fr;
- -webkit-grid-template-rows: 3fr 4fr;
+ grid-template-columns: 1fr 2fr;
+ grid-template-rows: 3fr 4fr;
}
.gridWithFractionMinMax {
- -webkit-grid-template-columns: minmax(-webkit-min-content, 45px) 2fr;
- -webkit-grid-template-rows: 3fr minmax(14px, -webkit-max-content);
+ grid-template-columns: minmax(-webkit-min-content, 45px) 2fr;
+ grid-template-rows: 3fr minmax(14px, -webkit-max-content);
}
.gridWithCalcCalc {
- -webkit-grid-template-columns: calc(200px) calc(10em);
- -webkit-grid-template-rows: calc(15em) calc(75px);
+ grid-template-columns: calc(200px) calc(10em);
+ grid-template-rows: calc(15em) calc(75px);
font: 10px Ahem;
}
.gridWithCalcAndFixed {
- -webkit-grid-template-columns: calc(50%) 8em;
- -webkit-grid-template-rows: 88px calc(25%);
+ grid-template-columns: calc(50%) 8em;
+ grid-template-rows: 88px calc(25%);
font: 10px Ahem;
}
.gridWithCalcAndMinMax {
- -webkit-grid-template-columns: calc(30px + 20%) minmax(-webkit-min-content, 80px);
- -webkit-grid-template-rows: minmax(25%, -webkit-max-content) calc(10% - 7px);
+ grid-template-columns: calc(30px + 20%) minmax(-webkit-min-content, 80px);
+ grid-template-rows: minmax(25%, -webkit-max-content) calc(10% - 7px);
}
.gridWithCalcInsideMinMax {
- -webkit-grid-template-columns: minmax(calc(23px + 10%), 400px) 12em;
- -webkit-grid-template-rows: calc(150px) minmax(5%, calc(50% - 125px));
+ grid-template-columns: minmax(calc(23px + 10%), 400px) 12em;
+ grid-template-rows: calc(150px) minmax(5%, calc(50% - 125px));
font: 10px Ahem;
}
.gridWithAutoInsideMinMax {
- -webkit-grid-template-columns: minmax(auto, 20px) 10%;
- -webkit-grid-template-rows: -webkit-max-content minmax(-webkit-min-content, auto);
+ grid-template-columns: minmax(auto, 20px) 10%;
+ grid-template-rows: -webkit-max-content minmax(-webkit-min-content, auto);
}
</style>
<script src="../../resources/js-test-pre.js"></script>
diff --git a/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set.html b/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set.html
index 7cf2479..2b4c3b6 100644
--- a/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set.html
@@ -4,73 +4,73 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.gridWithNone {
- -webkit-grid-template-columns: none;
- -webkit-grid-template-rows: none;
+ grid-template-columns: none;
+ grid-template-rows: none;
}
.gridWithFixed {
- -webkit-grid-template-columns: 10px;
- -webkit-grid-template-rows: 15px;
+ grid-template-columns: 10px;
+ grid-template-rows: 15px;
}
.gridWithPercent {
- -webkit-grid-template-columns: 53%;
- -webkit-grid-template-rows: 27%;
+ grid-template-columns: 53%;
+ grid-template-rows: 27%;
}
.gridWithAuto {
- -webkit-grid-template-columns: auto;
- -webkit-grid-template-rows: auto;
+ grid-template-columns: auto;
+ grid-template-rows: auto;
}
.gridWithEM {
- -webkit-grid-template-columns: 10em;
- -webkit-grid-template-rows: 15em;
+ grid-template-columns: 10em;
+ grid-template-rows: 15em;
font: 10px Ahem;
}
.gridWithViewPortPercentage {
- -webkit-grid-template-columns: 8vw;
- -webkit-grid-template-rows: 10vh;
+ grid-template-columns: 8vw;
+ grid-template-rows: 10vh;
}
.gridWithFitContent {
- -webkit-grid-template-columns: -webkit-fit-content;
- -webkit-grid-template-rows: -webkit-fit-content;
+ grid-template-columns: -webkit-fit-content;
+ grid-template-rows: -webkit-fit-content;
}
.gridWithFitAvailable {
- -webkit-grid-template-columns: -webkit-fit-available;
- -webkit-grid-template-rows: -webkit-fit-available;
+ grid-template-columns: -webkit-fit-available;
+ grid-template-rows: -webkit-fit-available;
}
.gridWithMinMax {
- -webkit-grid-template-columns: minmax(10%, 15px);
- -webkit-grid-template-rows: minmax(20px, 50%);
+ grid-template-columns: minmax(10%, 15px);
+ grid-template-rows: minmax(20px, 50%);
}
.gridWithMinContent {
- -webkit-grid-template-columns: -webkit-min-content;
- -webkit-grid-template-rows: -webkit-min-content;
+ grid-template-columns: -webkit-min-content;
+ grid-template-rows: -webkit-min-content;
}
.gridWithMaxContent {
- -webkit-grid-template-columns: -webkit-max-content;
- -webkit-grid-template-rows: -webkit-max-content;
+ grid-template-columns: -webkit-max-content;
+ grid-template-rows: -webkit-max-content;
}
.gridWithFraction {
- -webkit-grid-template-columns: 1fr;
- -webkit-grid-template-rows: 2fr;
+ grid-template-columns: 1fr;
+ grid-template-rows: 2fr;
}
.gridWithCalc {
- -webkit-grid-template-columns: calc(150px);
- -webkit-grid-template-rows: calc(75px);
+ grid-template-columns: calc(150px);
+ grid-template-rows: calc(75px);
}
.gridWithCalcComplex {
- -webkit-grid-template-columns: calc(50% + 150px);
- -webkit-grid-template-rows: calc(65% + 75px);
+ grid-template-columns: calc(50% + 150px);
+ grid-template-rows: calc(65% + 75px);
}
.gridWithCalcInsideMinMax {
- -webkit-grid-template-columns: minmax(10%, calc(15px));
- -webkit-grid-template-rows: minmax(calc(20px), 50%);
+ grid-template-columns: minmax(10%, calc(15px));
+ grid-template-rows: minmax(calc(20px), 50%);
}
.gridWithCalcComplexInsideMinMax {
- -webkit-grid-template-columns: minmax(10%, calc(50% + 15px));
- -webkit-grid-template-rows: minmax(calc(20px + 10%), 50%);
+ grid-template-columns: minmax(10%, calc(50% + 15px));
+ grid-template-rows: minmax(calc(20px + 10%), 50%);
}
.gridWithAutoInsideMinMax {
- -webkit-grid-template-columns: minmax(auto, 20px);
- -webkit-grid-template-rows: minmax(-webkit-min-content, auto);
+ grid-template-columns: minmax(auto, 20px);
+ grid-template-rows: minmax(-webkit-min-content, auto);
}
</style>
<script src="../../resources/js-test-pre.js"></script>
diff --git a/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set-expected.txt b/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set-expected.txt
index 37be860..f210475 100644
--- a/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set-expected.txt
@@ -4,33 +4,33 @@
Test getting grid-template-columns and grid-template-rows set through CSS
-PASS window.getComputedStyle(singleSingleTrackRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "15%"
-PASS window.getComputedStyle(singleSingleTrackRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "18px"
-PASS window.getComputedStyle(twoSingleTrackRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(15px, 50%) minmax(15px, 50%)"
-PASS window.getComputedStyle(twoSingleTrackRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "auto auto"
-PASS window.getComputedStyle(twoDoubleTrackRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "auto minmax(100px, 120px) auto minmax(100px, 120px)"
-PASS window.getComputedStyle(twoDoubleTrackRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(5px, 10px) auto minmax(5px, 10px) auto"
-PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "auto [middle] 250px [end] auto [middle] 250px [end]"
-PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "10px [start] auto [end] 10px [start] auto [end]"
-PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "[before] auto [before] auto"
-PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "[before] 10px [before] 10px"
-PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "250px [end]"
-PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "10px [end]"
-PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "[start] 250px 250px"
-PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "[start] 10px 10px"
-PASS window.getComputedStyle(mixRepeatAfterNonRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "[start] 140px 250px 250px"
-PASS window.getComputedStyle(mixRepeatAfterNonRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "auto 10px 10px"
-PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "250px 250px 15% [last]"
-PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "10px 10px [end] auto"
+PASS window.getComputedStyle(singleSingleTrackRepeat, '').getPropertyValue('grid-template-columns') is "15%"
+PASS window.getComputedStyle(singleSingleTrackRepeat, '').getPropertyValue('grid-template-rows') is "18px"
+PASS window.getComputedStyle(twoSingleTrackRepeat, '').getPropertyValue('grid-template-columns') is "minmax(15px, 50%) minmax(15px, 50%)"
+PASS window.getComputedStyle(twoSingleTrackRepeat, '').getPropertyValue('grid-template-rows') is "auto auto"
+PASS window.getComputedStyle(twoDoubleTrackRepeat, '').getPropertyValue('grid-template-columns') is "auto minmax(100px, 120px) auto minmax(100px, 120px)"
+PASS window.getComputedStyle(twoDoubleTrackRepeat, '').getPropertyValue('grid-template-rows') is "minmax(5px, 10px) auto minmax(5px, 10px) auto"
+PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineRepeat, '').getPropertyValue('grid-template-columns') is "auto [middle] 250px [end] auto [middle] 250px [end]"
+PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineRepeat, '').getPropertyValue('grid-template-rows') is "10px [start] auto [end] 10px [start] auto [end]"
+PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepeat, '').getPropertyValue('grid-template-columns') is "[before] auto [before] auto"
+PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepeat, '').getPropertyValue('grid-template-rows') is "[before] 10px [before] 10px"
+PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropertyValue('grid-template-columns') is "250px [end]"
+PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropertyValue('grid-template-rows') is "10px [end]"
+PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getPropertyValue('grid-template-columns') is "[start] 250px 250px"
+PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getPropertyValue('grid-template-rows') is "[start] 10px 10px"
+PASS window.getComputedStyle(mixRepeatAfterNonRepeat, '').getPropertyValue('grid-template-columns') is "[start] 140px 250px 250px"
+PASS window.getComputedStyle(mixRepeatAfterNonRepeat, '').getPropertyValue('grid-template-rows') is "auto 10px 10px"
+PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').getPropertyValue('grid-template-columns') is "250px 250px 15% [last]"
+PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').getPropertyValue('grid-template-rows') is "10px 10px [end] auto"
Test invalid repeat syntax.
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set.html b/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set.html
index 0ab74fa..ff3b2f0 100644
--- a/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set.html
@@ -4,48 +4,48 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.singleSingleTrackRepeat {
- -webkit-grid-template-rows: repeat(1, 18px);
- -webkit-grid-template-columns: repeat(1, 15%);
+ grid-template-rows: repeat(1, 18px);
+ grid-template-columns: repeat(1, 15%);
}
.twoSingleTrackRepeat {
- -webkit-grid-template-rows: repeat(2, auto);
- -webkit-grid-template-columns: repeat(2, minmax(15px, 50%));
+ grid-template-rows: repeat(2, auto);
+ grid-template-columns: repeat(2, minmax(15px, 50%));
}
.twoDoubleTrackRepeat {
- -webkit-grid-template-rows: repeat(2, minmax(5px, 10px) auto);
- -webkit-grid-template-columns: repeat(2, auto minmax(100px, 120px));
+ grid-template-rows: repeat(2, minmax(5px, 10px) auto);
+ grid-template-columns: repeat(2, auto minmax(100px, 120px));
}
.twoDoubleTrackWithNamedGridLineRepeat {
- -webkit-grid-template-rows: repeat(2, 10px [start] auto [end]);
- -webkit-grid-template-columns: repeat(2, auto [middle] 250px [end]);
+ grid-template-rows: repeat(2, 10px [start] auto [end]);
+ grid-template-columns: repeat(2, auto [middle] 250px [end]);
}
.twoDoubleTrackWithTrailingNamedGridLineRepeat {
- -webkit-grid-template-rows: repeat(2, [before] 10px);
- -webkit-grid-template-columns: repeat(2, [before] auto);
+ grid-template-rows: repeat(2, [before] 10px);
+ grid-template-columns: repeat(2, [before] auto);
}
.trailingNamedGridLineRepeat {
- -webkit-grid-template-rows: repeat(1, 10px) [end];
- -webkit-grid-template-columns: repeat(1, 250px) [end];
+ grid-template-rows: repeat(1, 10px) [end];
+ grid-template-columns: repeat(1, 250px) [end];
}
.leadingNamedGridLineRepeat {
- -webkit-grid-template-rows: [start] repeat(2, 10px);
- -webkit-grid-template-columns: [start] repeat(2, 250px);
+ grid-template-rows: [start] repeat(2, 10px);
+ grid-template-columns: [start] repeat(2, 250px);
}
.mixRepeatAfterNonRepeat {
- -webkit-grid-template-rows: auto repeat(2, 10px);
- -webkit-grid-template-columns: [start] 140px repeat(2, 250px);
+ grid-template-rows: auto repeat(2, 10px);
+ grid-template-columns: [start] 140px repeat(2, 250px);
}
.mixNonRepeatAfterRepeat {
- -webkit-grid-template-rows: repeat(2, 10px) [end] auto;
- -webkit-grid-template-columns: repeat(2, 250px) 15% [last];
+ grid-template-rows: repeat(2, 10px) [end] auto;
+ grid-template-columns: repeat(2, 250px) 15% [last];
}
</style>
<script src="../../resources/js-test-pre.js"></script>
@@ -82,7 +82,7 @@
element = document.createElement("div");
document.body.appendChild(element);
element.style.gridDefinitionColumns = gridColumn;
- shouldBeEqualToString("window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "none");
+ shouldBeEqualToString("window.getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "none");
document.body.removeChild(element);
}
testInvalidSyntax("repeat(");
diff --git a/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set-expected.txt b/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set-expected.txt
index e93bbe3..2211b9e 100644
--- a/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set-expected.txt
+++ b/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set-expected.txt
@@ -4,74 +4,74 @@
Test getting grid-template-columns and grid-template-rows set through CSS
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-template-columns') is "[first] 10px"
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-template-rows') is "[first] 15px"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-template-columns') is "53% [last]"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-template-rows') is "27% [last]"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-template-columns') is "[first] auto"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-template-rows') is "auto [last]"
-PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('-webkit-grid-template-columns') is "[first] minmax(10%, 15px)"
-PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(20px, 50%) [last]"
-PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue('-webkit-grid-template-columns') is "[first nav] 10px [last]"
-PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue('-webkit-grid-template-rows') is "[first nav] 15px [last]"
-PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, '').getPropertyValue('-webkit-grid-template-columns') is "[first nav] 10% [nav] 15% [last]"
-PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, '').getPropertyValue('-webkit-grid-template-rows') is "[first nav2] 25% [nav2] 75% [last]"
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-columns') is "[first] 10px"
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-rows') is "[first] 15px"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-columns') is "53% [last]"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-rows') is "27% [last]"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-columns') is "[first] auto"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-rows') is "auto [last]"
+PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('grid-template-columns') is "[first] minmax(10%, 15px)"
+PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('grid-template-rows') is "minmax(20px, 50%) [last]"
+PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue('grid-template-columns') is "[first nav] 10px [last]"
+PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue('grid-template-rows') is "[first nav] 15px [last]"
+PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, '').getPropertyValue('grid-template-columns') is "[first nav] 10% [nav] 15% [last]"
+PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, '').getPropertyValue('grid-template-rows') is "[first nav2] 25% [nav2] 75% [last]"
Test getting and setting grid-template-columns and grid-template-rows through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[first] 18px"
-PASS element.style.webkitGridTemplateColumns is "[first] 18px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "66px [last]"
-PASS element.style.webkitGridTemplateRows is "66px [last]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[first] 55%"
-PASS element.style.webkitGridTemplateColumns is "[first] 55%"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "40% [last]"
-PASS element.style.webkitGridTemplateRows is "40% [last]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[first] auto"
-PASS element.style.webkitGridTemplateColumns is "[first] auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "auto [last]"
-PASS element.style.webkitGridTemplateRows is "auto [last]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[first] -webkit-min-content"
-PASS element.style.webkitGridTemplateColumns is "[first] -webkit-min-content"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "-webkit-min-content [last]"
-PASS element.style.webkitGridTemplateRows is "-webkit-min-content [last]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[first] -webkit-max-content"
-PASS element.style.webkitGridTemplateColumns is "[first] -webkit-max-content"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "-webkit-max-content [last]"
-PASS element.style.webkitGridTemplateRows is "-webkit-max-content [last]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[first] minmax(55%, 45px)"
-PASS element.style.webkitGridTemplateColumns is "[first] minmax(55%, 45px)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(30px, 40%) [last]"
-PASS element.style.webkitGridTemplateRows is "minmax(30px, 40%) [last]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[first] minmax(220px, -webkit-max-content)"
-PASS element.style.webkitGridTemplateColumns is "[first] minmax(22em, -webkit-max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(-webkit-max-content, 50px) [last]"
-PASS element.style.webkitGridTemplateRows is "minmax(-webkit-max-content, 5em) [last]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[first] minmax(220px, -webkit-min-content)"
-PASS element.style.webkitGridTemplateColumns is "[first] minmax(22em, -webkit-min-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(-webkit-min-content, 50px) [last]"
-PASS element.style.webkitGridTemplateRows is "minmax(-webkit-min-content, 5em) [last]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[first] minmax(-webkit-min-content, -webkit-max-content)"
-PASS element.style.webkitGridTemplateColumns is "[first] minmax(-webkit-min-content, -webkit-max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(-webkit-max-content, -webkit-min-content) [last]"
-PASS element.style.webkitGridTemplateRows is "minmax(-webkit-max-content, -webkit-min-content) [last]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[first nav] minmax(-webkit-min-content, -webkit-max-content) [last]"
-PASS element.style.webkitGridTemplateColumns is "[first nav] minmax(-webkit-min-content, -webkit-max-content) [last]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "[first nav] minmax(-webkit-max-content, -webkit-min-content) [last]"
-PASS element.style.webkitGridTemplateRows is "[first nav] minmax(-webkit-max-content, -webkit-min-content) [last]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[first nav] minmax(-webkit-min-content, -webkit-max-content) [nav] auto [last]"
-PASS element.style.webkitGridTemplateColumns is "[first nav] minmax(-webkit-min-content, -webkit-max-content) [nav] auto [last]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "[first nav2] minmax(-webkit-max-content, -webkit-min-content) [nav2] minmax(10px, 15px) [last]"
-PASS element.style.webkitGridTemplateRows is "[first nav2] minmax(-webkit-max-content, -webkit-min-content) [nav2] minmax(10px, 15px) [last]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[foo bar] auto [foo] auto [bar]"
-PASS element.style.webkitGridTemplateColumns is "[foo bar] auto [foo] auto [bar]"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "[foo bar] auto [foo] auto [bar]"
-PASS element.style.webkitGridTemplateRows is "[foo bar] auto [foo] auto [bar]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] 18px"
+PASS element.style.gridTemplateColumns is "[first] 18px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "66px [last]"
+PASS element.style.gridTemplateRows is "66px [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] 55%"
+PASS element.style.gridTemplateColumns is "[first] 55%"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "40% [last]"
+PASS element.style.gridTemplateRows is "40% [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] auto"
+PASS element.style.gridTemplateColumns is "[first] auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "auto [last]"
+PASS element.style.gridTemplateRows is "auto [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] -webkit-min-content"
+PASS element.style.gridTemplateColumns is "[first] -webkit-min-content"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "-webkit-min-content [last]"
+PASS element.style.gridTemplateRows is "-webkit-min-content [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] -webkit-max-content"
+PASS element.style.gridTemplateColumns is "[first] -webkit-max-content"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "-webkit-max-content [last]"
+PASS element.style.gridTemplateRows is "-webkit-max-content [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] minmax(55%, 45px)"
+PASS element.style.gridTemplateColumns is "[first] minmax(55%, 45px)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(30px, 40%) [last]"
+PASS element.style.gridTemplateRows is "minmax(30px, 40%) [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] minmax(220px, -webkit-max-content)"
+PASS element.style.gridTemplateColumns is "[first] minmax(22em, -webkit-max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(-webkit-max-content, 50px) [last]"
+PASS element.style.gridTemplateRows is "minmax(-webkit-max-content, 5em) [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] minmax(220px, -webkit-min-content)"
+PASS element.style.gridTemplateColumns is "[first] minmax(22em, -webkit-min-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(-webkit-min-content, 50px) [last]"
+PASS element.style.gridTemplateRows is "minmax(-webkit-min-content, 5em) [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] minmax(-webkit-min-content, -webkit-max-content)"
+PASS element.style.gridTemplateColumns is "[first] minmax(-webkit-min-content, -webkit-max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(-webkit-max-content, -webkit-min-content) [last]"
+PASS element.style.gridTemplateRows is "minmax(-webkit-max-content, -webkit-min-content) [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first nav] minmax(-webkit-min-content, -webkit-max-content) [last]"
+PASS element.style.gridTemplateColumns is "[first nav] minmax(-webkit-min-content, -webkit-max-content) [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "[first nav] minmax(-webkit-max-content, -webkit-min-content) [last]"
+PASS element.style.gridTemplateRows is "[first nav] minmax(-webkit-max-content, -webkit-min-content) [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first nav] minmax(-webkit-min-content, -webkit-max-content) [nav] auto [last]"
+PASS element.style.gridTemplateColumns is "[first nav] minmax(-webkit-min-content, -webkit-max-content) [nav] auto [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "[first nav2] minmax(-webkit-max-content, -webkit-min-content) [nav2] minmax(10px, 15px) [last]"
+PASS element.style.gridTemplateRows is "[first nav2] minmax(-webkit-max-content, -webkit-min-content) [nav2] minmax(10px, 15px) [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[foo bar] auto [foo] auto [bar]"
+PASS element.style.gridTemplateColumns is "[foo bar] auto [foo] auto [bar]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "[foo bar] auto [foo] auto [bar]"
+PASS element.style.gridTemplateRows is "[foo bar] auto [foo] auto [bar]"
Test getting and setting invalid grid-template-columns and grid-template-rows through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set.html b/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set.html
index c37f2bb..ffc3f2f 100644
--- a/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set.html
@@ -4,34 +4,34 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.gridItem {
- -webkit-grid-column: 1;
- -webkit-grid-row: 1;
+ grid-column: 1;
+ grid-row: 1;
height: 22px;
width: 77px;
}
.gridWithFixed {
- -webkit-grid-template-columns: [first] 10px;
- -webkit-grid-template-rows: [first] 15px;
+ grid-template-columns: [first] 10px;
+ grid-template-rows: [first] 15px;
}
.gridWithPercent {
- -webkit-grid-template-columns: 53% [last];
- -webkit-grid-template-rows: 27% [last];
+ grid-template-columns: 53% [last];
+ grid-template-rows: 27% [last];
}
.gridWithAuto {
- -webkit-grid-template-columns: [first] auto;
- -webkit-grid-template-rows: auto [last];
+ grid-template-columns: [first] auto;
+ grid-template-rows: auto [last];
}
.gridWithMinMax {
- -webkit-grid-template-columns: [first] minmax(10%, 15px);
- -webkit-grid-template-rows: minmax(20px, 50%) [last];
+ grid-template-columns: [first] minmax(10%, 15px);
+ grid-template-rows: minmax(20px, 50%) [last];
}
.gridWithFixedMultiple {
- -webkit-grid-template-columns: [first nav] 10px [last];
- -webkit-grid-template-rows: [first nav] 15px [last];
+ grid-template-columns: [first nav] 10px [last];
+ grid-template-rows: [first nav] 15px [last];
}
.gridWithPercentageSameStringMultipleTimes {
- -webkit-grid-template-columns: [first nav] 10% [nav] 15% [last];
- -webkit-grid-template-rows: [first nav2] 25% [nav2] 75% [last];
+ grid-template-columns: [first nav] 10% [nav] 15% [last];
+ grid-template-rows: [first nav2] 25% [nav2] 75% [last];
}
</style>
<script src="../../resources/js-test-pre.js"></script>
@@ -78,17 +78,17 @@
debug("Test getting and setting invalid grid-template-columns and grid-template-rows through JS");
element = document.createElement("div");
document.body.appendChild(element);
- element.style.webkitGridTemplateColumns = "[foo]";
- element.style.webkitGridTemplateRows = "[bar]";
- shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "none");
- shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", "none");
+ element.style.gridTemplateColumns = "[foo]";
+ element.style.gridTemplateRows = "[bar]";
+ shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "none");
+ shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", "none");
element = document.createElement("div");
document.body.appendChild(element);
- element.style.webkitGridTemplateColumns = "[foo bar]";
- element.style.webkitGridTemplateRows = "(bar foo)";
- shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "none");
- shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", "none");
+ element.style.gridTemplateColumns = "[foo bar]";
+ element.style.gridTemplateRows = "(bar foo)";
+ shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "none");
+ shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", "none");
</script>
<script src="../../resources/js-test-post.js"></script>
</body>
diff --git a/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-in-percent-grid.html b/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-in-percent-grid.html
index a5879f4..a4c0cc3 100644
--- a/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-in-percent-grid.html
+++ b/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-in-percent-grid.html
@@ -9,8 +9,8 @@
}
.grid {
- -webkit-grid-template-columns: 40% 60%;
- -webkit-grid-template-rows: 30% 70%;
+ grid-template-columns: 40% 60%;
+ grid-template-rows: 30% 70%;
width: 80%;
height: 50%;
}
diff --git a/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update.html b/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update.html
index 584c731..76525d2 100644
--- a/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update.html
+++ b/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update.html
@@ -3,8 +3,8 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-columns: 70% 30%;
- -webkit-grid-template-rows: 40% 60%;
+ grid-template-columns: 70% 30%;
+ grid-template-rows: 40% 60%;
width: 400px;
height: 300px;
}
@@ -37,12 +37,12 @@
var grid1 = document.getElementsByClassName("grid")[1];
var grid2 = document.getElementsByClassName("grid")[2];
document.body.offsetLeft;
- grid0.style.webkitGridTemplateColumns = "40% 60%";
+ grid0.style.gridTemplateColumns = "40% 60%";
- grid1.style.webkitGridTemplateRows = "30% 70%";
+ grid1.style.gridTemplateRows = "30% 70%";
- grid2.style.webkitGridTemplateColumns = "40% 60%";
- grid2.style.webkitGridTemplateRows = "30% 70%";
+ grid2.style.gridTemplateColumns = "40% 60%";
+ grid2.style.gridTemplateRows = "30% 70%";
checkLayout('.grid');
}
diff --git a/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track.html b/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track.html
index d7b5009..411a3bd 100644
--- a/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track.html
+++ b/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track.html
@@ -3,8 +3,8 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-columns: 40% 60%;
- -webkit-grid-template-rows: 30% 70%;
+ grid-template-columns: 40% 60%;
+ grid-template-rows: 30% 70%;
width: 400px;
height: 300px;
}
diff --git a/LayoutTests/fast/css-grid-layout/percent-intrinsic-track-breadth.html b/LayoutTests/fast/css-grid-layout/percent-intrinsic-track-breadth.html
index 2c69492..f0a4b3d 100644
--- a/LayoutTests/fast/css-grid-layout/percent-intrinsic-track-breadth.html
+++ b/LayoutTests/fast/css-grid-layout/percent-intrinsic-track-breadth.html
@@ -5,15 +5,15 @@
<link href="resources/grid-alignment.css" rel="stylesheet">
<style>
.intrinsic {
- -webkit-grid-template-rows: max-content;
- -webkit-grid-template-columns: max-content;
+ grid-template-rows: max-content;
+ grid-template-columns: max-content;
height: 500px;
width: 500px;
}
.percentage {
- -webkit-grid-template-rows: 100%;
- -webkit-grid-template-columns: 100%;
+ grid-template-rows: 100%;
+ grid-template-columns: 100%;
height: 100%;
width: 100%;
}
diff --git a/LayoutTests/fast/css-grid-layout/percent-of-indefinite-track-size-in-auto.html b/LayoutTests/fast/css-grid-layout/percent-of-indefinite-track-size-in-auto.html
index 1fb3d11..aed25ff 100644
--- a/LayoutTests/fast/css-grid-layout/percent-of-indefinite-track-size-in-auto.html
+++ b/LayoutTests/fast/css-grid-layout/percent-of-indefinite-track-size-in-auto.html
@@ -6,28 +6,28 @@
font: 10px/1 Ahem;
}
.gridWithPercent {
- -webkit-grid-auto-columns: 25%;
- -webkit-grid-auto-rows: 30%;
+ grid-auto-columns: 25%;
+ grid-auto-rows: 30%;
}
.gridWithPercentInMinOfMinMax {
- -webkit-grid-auto-columns: minmax(20%, max-content);
- -webkit-grid-auto-rows: minmax(100%, 15px);
+ grid-auto-columns: minmax(20%, max-content);
+ grid-auto-rows: minmax(100%, 15px);
}
.gridWithPercentInMinOfMinMax2 {
- -webkit-grid-auto-columns: minmax(20%, 50px);
- -webkit-grid-auto-rows: minmax(100%, max-content);
+ grid-auto-columns: minmax(20%, 50px);
+ grid-auto-rows: minmax(100%, max-content);
}
.gridWithPercentInMaxOfMinMax {
- -webkit-grid-auto-columns: minmax(min-content, 25%);
- -webkit-grid-auto-rows: minmax(0px, 1%);
+ grid-auto-columns: minmax(min-content, 25%);
+ grid-auto-rows: minmax(0px, 1%);
}
.gridWithPercentInMaxOfMinMax2 {
- -webkit-grid-auto-columns: minmax(20px, 25%);
- -webkit-grid-auto-rows: minmax(min-content, 1%);
+ grid-auto-columns: minmax(20px, 25%);
+ grid-auto-rows: minmax(min-content, 1%);
}
.gridWithPercentsInMinMax {
- -webkit-grid-auto-columns: minmax(25%, 50%);
- -webkit-grid-auto-rows: minmax(10%, 90%);
+ grid-auto-columns: minmax(25%, 50%);
+ grid-auto-rows: minmax(10%, 90%);
}
</style>
<script src="../../resources/check-layout.js"></script>
diff --git a/LayoutTests/fast/css-grid-layout/percent-of-indefinite-track-size-in-minmax-crash.html b/LayoutTests/fast/css-grid-layout/percent-of-indefinite-track-size-in-minmax-crash.html
index 5b3a676..97d6d55 100644
--- a/LayoutTests/fast/css-grid-layout/percent-of-indefinite-track-size-in-minmax-crash.html
+++ b/LayoutTests/fast/css-grid-layout/percent-of-indefinite-track-size-in-minmax-crash.html
@@ -2,7 +2,7 @@
<style>
.inlineGrid {
display: inline-grid;
- -webkit-grid-template-rows: minmax(100%, max-content);
+ grid-template-rows: minmax(100%, max-content);
}
</style>
<script>
diff --git a/LayoutTests/fast/css-grid-layout/percent-of-indefinite-track-size.html b/LayoutTests/fast/css-grid-layout/percent-of-indefinite-track-size.html
index 500c66e..db706ea 100644
--- a/LayoutTests/fast/css-grid-layout/percent-of-indefinite-track-size.html
+++ b/LayoutTests/fast/css-grid-layout/percent-of-indefinite-track-size.html
@@ -6,28 +6,28 @@
font: 10px/1 Ahem;
}
.gridWithPercent {
- -webkit-grid-template-columns: 25%;
- -webkit-grid-template-rows: 30%;
+ grid-template-columns: 25%;
+ grid-template-rows: 30%;
}
.gridWithPercentInMinOfMinMax {
- -webkit-grid-template-columns: minmax(20%, max-content);
- -webkit-grid-template-rows: minmax(100%, 15px);
+ grid-template-columns: minmax(20%, max-content);
+ grid-template-rows: minmax(100%, 15px);
}
.gridWithPercentInMinOfMinMax2 {
- -webkit-grid-template-columns: minmax(20%, 50px);
- -webkit-grid-template-rows: minmax(100%, max-content);
+ grid-template-columns: minmax(20%, 50px);
+ grid-template-rows: minmax(100%, max-content);
}
.gridWithPercentInMaxOfMinMax {
- -webkit-grid-template-columns: minmax(min-content, 25%);
- -webkit-grid-template-rows: minmax(0px, 1%);
+ grid-template-columns: minmax(min-content, 25%);
+ grid-template-rows: minmax(0px, 1%);
}
.gridWithPercentInMaxOfMinMax2 {
- -webkit-grid-template-columns: minmax(20px, 25%);
- -webkit-grid-template-rows: minmax(min-content, 1%);
+ grid-template-columns: minmax(20px, 25%);
+ grid-template-rows: minmax(min-content, 1%);
}
.gridWithPercentsInMinMax {
- -webkit-grid-template-columns: minmax(25%, 50%);
- -webkit-grid-template-rows: minmax(10%, 90%);
+ grid-template-columns: minmax(25%, 50%);
+ grid-template-rows: minmax(10%, 90%);
}
</style>
<script src="../../resources/check-layout.js"></script>
diff --git a/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update.html b/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update.html
index a2ddc23..ef8ff5b 100644
--- a/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update.html
+++ b/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update.html
@@ -3,8 +3,8 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-columns: 200px 200px;
- -webkit-grid-template-rows: 100px 100px;
+ grid-template-columns: 200px 200px;
+ grid-template-rows: 100px 100px;
height: 200px;
width: 400px;
}
@@ -34,8 +34,8 @@
{
var grid = document.getElementsByClassName("grid")[0];
grid.offsetLeft;
- grid.style.webkitGridTemplateColumns = "100px 300px";
- grid.style.webkitGridTemplateRows = "50px 150px";
+ grid.style.gridTemplateColumns = "100px 300px";
+ grid.style.gridTemplateRows = "50px 150px";
checkLayout('.grid');
}
window.addEventListener("load", changeGridTrackSizesAndCheckLayout, false);
diff --git a/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item.html b/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item.html
index 1d6ef98..1e7a3ca 100644
--- a/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item.html
+++ b/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item.html
@@ -3,8 +3,8 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-columns: 100px 300px;
- -webkit-grid-template-rows: 50px 150px;
+ grid-template-columns: 100px 300px;
+ grid-template-rows: 50px 150px;
height: 200px;
width: 400px;
}
diff --git a/LayoutTests/fast/css-grid-layout/percent-resolution-grid-item.html b/LayoutTests/fast/css-grid-layout/percent-resolution-grid-item.html
index 56dd96d..bff8f33 100644
--- a/LayoutTests/fast/css-grid-layout/percent-resolution-grid-item.html
+++ b/LayoutTests/fast/css-grid-layout/percent-resolution-grid-item.html
@@ -3,8 +3,8 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-columns: 100px 300px;
- -webkit-grid-template-rows: 50px 150px;
+ grid-template-columns: 100px 300px;
+ grid-template-rows: 50px 150px;
height: 200px;
width: 400px;
}
diff --git a/LayoutTests/fast/css-grid-layout/percent-track-breadths-regarding-container-size.html b/LayoutTests/fast/css-grid-layout/percent-track-breadths-regarding-container-size.html
index 7213916..814cfec 100644
--- a/LayoutTests/fast/css-grid-layout/percent-track-breadths-regarding-container-size.html
+++ b/LayoutTests/fast/css-grid-layout/percent-track-breadths-regarding-container-size.html
@@ -7,8 +7,8 @@
<link href="resources/grid-alignment.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-columns: 20% 50% 30%;
- -webkit-grid-template-rows: 40%;
+ grid-template-columns: 20% 50% 30%;
+ grid-template-rows: 40%;
}
.fixedSize {
@@ -47,8 +47,8 @@
.firstRowThirdColumn {
color: brown;
background-color: yellow;
- -webkit-grid-column: 3;
- -webkit-grid-row: 1;
+ grid-column: 3;
+ grid-row: 1;
}
</style>
<script src="../../resources/check-layout.js"></script>
diff --git a/LayoutTests/fast/css-grid-layout/place-cell-by-index.html b/LayoutTests/fast/css-grid-layout/place-cell-by-index.html
index 1f99869..c8a10c6 100644
--- a/LayoutTests/fast/css-grid-layout/place-cell-by-index.html
+++ b/LayoutTests/fast/css-grid-layout/place-cell-by-index.html
@@ -3,8 +3,8 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-columns: 50px 60px;
- -webkit-grid-template-rows: 20px 30px;
+ grid-template-columns: 50px 60px;
+ grid-template-rows: 20px 30px;
max-width: 110px;
}
diff --git a/LayoutTests/fast/css-grid-layout/positioned-grid-items-should-not-create-implicit-tracks.html b/LayoutTests/fast/css-grid-layout/positioned-grid-items-should-not-create-implicit-tracks.html
index 31bf7ae..deb4bc7 100644
--- a/LayoutTests/fast/css-grid-layout/positioned-grid-items-should-not-create-implicit-tracks.html
+++ b/LayoutTests/fast/css-grid-layout/positioned-grid-items-should-not-create-implicit-tracks.html
@@ -3,8 +3,8 @@
<style>
.grid {
- -webkit-grid-auto-columns: 100px;
- -webkit-grid-auto-rows: 50px;
+ grid-auto-columns: 100px;
+ grid-auto-rows: 50px;
width: 400px;
height: 300px;
/* Ensures that the grid container is the containing block of the absolutely positioned grid children. */
@@ -17,8 +17,8 @@
.seventhRowFourthColumn {
background-color: coral;
- -webkit-grid-column: 4;
- -webkit-grid-row: 7;
+ grid-column: 4;
+ grid-row: 7;
}
</style>
diff --git a/LayoutTests/fast/css-grid-layout/positioned-grid-items-should-not-take-up-space.html b/LayoutTests/fast/css-grid-layout/positioned-grid-items-should-not-take-up-space.html
index d83fcb2..da73668 100644
--- a/LayoutTests/fast/css-grid-layout/positioned-grid-items-should-not-take-up-space.html
+++ b/LayoutTests/fast/css-grid-layout/positioned-grid-items-should-not-take-up-space.html
@@ -4,8 +4,8 @@
<style>
.grid {
- -webkit-grid-template-columns: 50px 100px;
- -webkit-grid-template-rows: 50px 100px;
+ grid-template-columns: 50px 100px;
+ grid-template-rows: 50px 100px;
width: 150px;
height: 150px;
/* Ensures that the grid container is the containing block of the absolutely positioned grid children. */
diff --git a/LayoutTests/fast/css-grid-layout/relayout-align-items-changed.html b/LayoutTests/fast/css-grid-layout/relayout-align-items-changed.html
index 62db887..f9a0e25 100644
--- a/LayoutTests/fast/css-grid-layout/relayout-align-items-changed.html
+++ b/LayoutTests/fast/css-grid-layout/relayout-align-items-changed.html
@@ -2,7 +2,7 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid: 150px / 100px 100px;
+ grid: 150px / 100px 100px;
position: relative;
}
#fromStretch { align-items: stretch; }
diff --git a/LayoutTests/fast/css-grid-layout/relayout-align-self-changed.html b/LayoutTests/fast/css-grid-layout/relayout-align-self-changed.html
index 3d431bc..17ac929 100644
--- a/LayoutTests/fast/css-grid-layout/relayout-align-self-changed.html
+++ b/LayoutTests/fast/css-grid-layout/relayout-align-self-changed.html
@@ -2,7 +2,7 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid: 150px / 100px 100px;
+ grid: 150px / 100px 100px;
width: 200px;
position: relative;
}
diff --git a/LayoutTests/fast/css-grid-layout/relayout-indefinite-heights.html b/LayoutTests/fast/css-grid-layout/relayout-indefinite-heights.html
index 849a448..3a735f9 100644
--- a/LayoutTests/fast/css-grid-layout/relayout-indefinite-heights.html
+++ b/LayoutTests/fast/css-grid-layout/relayout-indefinite-heights.html
@@ -2,7 +2,7 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid: minmax(5px, 1fr) minmax(5px, 2fr) / 50px;
+ grid: minmax(5px, 1fr) minmax(5px, 2fr) / 50px;
}
#fromIndefinite { height: auto; }
diff --git a/LayoutTests/fast/css-grid-layout/relayout-justify-items-changed.html b/LayoutTests/fast/css-grid-layout/relayout-justify-items-changed.html
index 2edd662..91022b1 100644
--- a/LayoutTests/fast/css-grid-layout/relayout-justify-items-changed.html
+++ b/LayoutTests/fast/css-grid-layout/relayout-justify-items-changed.html
@@ -2,7 +2,7 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid: 100px 100px / 150px;
+ grid: 100px 100px / 150px;
width: 150px;
position: relative;
}
diff --git a/LayoutTests/fast/css-grid-layout/relayout-justify-self-changed.html b/LayoutTests/fast/css-grid-layout/relayout-justify-self-changed.html
index d6a14fb..271a859 100644
--- a/LayoutTests/fast/css-grid-layout/relayout-justify-self-changed.html
+++ b/LayoutTests/fast/css-grid-layout/relayout-justify-self-changed.html
@@ -2,7 +2,7 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid: 100px 100px / 150px;
+ grid: 100px 100px / 150px;
width: 150px;
position: relative;
}
diff --git a/LayoutTests/fast/css-grid-layout/resources/display-grid-set-get.js b/LayoutTests/fast/css-grid-layout/resources/display-grid-set-get.js
index 4f44727..17b36f4 100644
--- a/LayoutTests/fast/css-grid-layout/resources/display-grid-set-get.js
+++ b/LayoutTests/fast/css-grid-layout/resources/display-grid-set-get.js
@@ -3,19 +3,19 @@
debug("Test getting |display| set through CSS");
var gridElement = document.getElementById("gridElement");
var inlineGridElement = document.getElementById("inlineGridElement");
-shouldBe("getComputedStyle(gridElement, '').getPropertyValue('display')", "'-webkit-grid'");
-shouldBe("getComputedStyle(inlineGridElement, '').getPropertyValue('display')", "'-webkit-inline-grid'");
+shouldBe("getComputedStyle(gridElement, '').getPropertyValue('display')", "'grid'");
+shouldBe("getComputedStyle(inlineGridElement, '').getPropertyValue('display')", "'inline-grid'");
debug("");
debug("Test getting and setting display through JS");
var element = document.createElement("div");
document.body.appendChild(element);
shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'block'");
-element.style.display = "-webkit-grid";
-shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'-webkit-grid'");
+element.style.display = "grid";
+shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'grid'");
element = document.createElement("div");
document.body.appendChild(element);
shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'block'");
-element.style.display = "-webkit-inline-grid";
-shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'-webkit-inline-grid'");
+element.style.display = "inline-grid";
+shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'inline-grid'");
diff --git a/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js b/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js
index 3c41c9f..4a0b56e 100644
--- a/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js
+++ b/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js
@@ -25,8 +25,8 @@
debug("Test the initial value");
var element = document.createElement("div");
document.body.appendChild(element);
-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "'none'");
-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", "'none'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "'none'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", "'none'");
debug("");
debug("Test getting and setting grid-template-rows and grid-template-columns through JS");
@@ -67,14 +67,14 @@
document.body.appendChild(parentElement);
parentElement.style.width = "800px";
parentElement.style.font = "10px Ahem"; // Used to resolve em font consistently.
- parentElement.style.webkitGridTemplateColumns = "50px 1fr [last]";
- parentElement.style.webkitGridTemplateRows = "2em [middle] 45px";
+ parentElement.style.gridTemplateColumns = "50px 1fr [last]";
+ parentElement.style.gridTemplateRows = "2em [middle] 45px";
element = document.createElement("div");
parentElement.appendChild(element);
- element.style.display = "-webkit-grid";
- element.style.webkitGridTemplateColumns = "inherit";
- element.style.webkitGridTemplateRows = "inherit";
+ element.style.display = "grid";
+ element.style.gridTemplateColumns = "inherit";
+ element.style.gridTemplateRows = "inherit";
testGridTemplatesValues(element, "50px 750px [last]", "20px [middle] 45px");
document.body.removeChild(parentElement);
@@ -87,15 +87,15 @@
{
element = document.createElement("div");
document.body.appendChild(element);
- element.style.display = "-webkit-grid";
+ element.style.display = "grid";
element.style.width = "800px";
element.style.height = "600px";
- element.style.webkitGridTemplateColumns = "150% [middle] 55px";
- element.style.webkitGridTemplateRows = "1fr [line] 2fr [line]";
+ element.style.gridTemplateColumns = "150% [middle] 55px";
+ element.style.gridTemplateRows = "1fr [line] 2fr [line]";
testGridTemplatesValues(element, "1200px [middle] 55px", "200px [line] 400px [line]");
- element.style.webkitGridTemplateColumns = "initial";
- element.style.webkitGridTemplateRows = "initial";
+ element.style.gridTemplateColumns = "initial";
+ element.style.gridTemplateRows = "initial";
testGridTemplatesValues(element, "none", "none");
document.body.removeChild(element);
diff --git a/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js b/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js
index 5fc6457..93cd462 100644
--- a/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js
+++ b/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js
@@ -1,6 +1,6 @@
description('Test that setting and getting grid-template-columns and grid-template-rows works as expected');
-debug("Test getting -webkit-grid-template-columns and -webkit-grid-template-rows set through CSS");
+debug("Test getting grid-template-columns and grid-template-rows set through CSS");
testGridTemplatesValues(document.getElementById("gridWithNoneElement"), "none", "none");
testGridTemplatesValues(document.getElementById("gridWithFixedElement"), "10px", "15px");
testGridTemplatesValues(document.getElementById("gridWithPercentElement"), "424px", "162px");
@@ -23,7 +23,7 @@
testGridTemplatesValues(document.getElementById("gridWithAutoInsideMinMaxElement"), "20px", "11px");
debug("");
-debug("Test getting wrong values for -webkit-grid-template-columns and -webkit-grid-template-rows through CSS (they should resolve to the default: 'none')");
+debug("Test getting wrong values for grid-template-columns and grid-template-rows through CSS (they should resolve to the default: 'none')");
var gridWithFitContentElement = document.getElementById("gridWithFitContentElement");
testGridTemplatesValues(gridWithFitContentElement, "none", "none");
@@ -37,7 +37,7 @@
testGridTemplatesValues(element, "none", "none");
debug("");
-debug("Test getting and setting -webkit-grid-template-columns and -webkit-grid-template-rows through JS");
+debug("Test getting and setting grid-template-columns and grid-template-rows through JS");
testGridTemplatesSetJSValues("18px", "66px");
testGridTemplatesSetJSValues("55%", "40%", "440px", "240px");
testGridTemplatesSetJSValues("auto", "auto", "0px", "0px");
@@ -46,7 +46,7 @@
testGridTemplatesSetJSValues("-webkit-max-content", "-webkit-max-content", "0px", "0px");
debug("");
-debug("Test getting and setting -webkit-grid-template-columns and -webkit-grid-template-rows to minmax() values through JS");
+debug("Test getting and setting grid-template-columns and grid-template-rows to minmax() values through JS");
testGridTemplatesSetJSValues("minmax(55%, 45px)", "minmax(30px, 40%)", "440px", "240px");
testGridTemplatesSetJSValues("minmax(22em, 8vh)", "minmax(10vw, 5em)", "220px", "80px");
testGridTemplatesSetJSValues("minmax(-webkit-min-content, 8vh)", "minmax(10vw, -webkit-min-content)", "48px", "80px");
@@ -102,16 +102,16 @@
var parentElement = document.createElement("div");
document.body.appendChild(parentElement);
parentElement.style.font = "10px Ahem"; // Used to resolve em font consistently.
- parentElement.style.webkitGridTemplateColumns = "50px [last]";
- parentElement.style.webkitGridTemplateRows = "[first] 2em";
+ parentElement.style.gridTemplateColumns = "50px [last]";
+ parentElement.style.gridTemplateRows = "[first] 2em";
element = document.createElement("div");
parentElement.appendChild(element);
- element.style.display = "-webkit-grid";
- element.style.webkitGridTemplateColumns = "inherit";
- element.style.webkitGridTemplateRows = "inherit";
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "'50px [last]'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", "'[first] 20px'");
+ element.style.display = "grid";
+ element.style.gridTemplateColumns = "inherit";
+ element.style.gridTemplateRows = "inherit";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "'50px [last]'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", "'[first] 20px'");
document.body.removeChild(parentElement);
}
@@ -123,19 +123,19 @@
{
element = document.createElement("div");
document.body.appendChild(element);
- element.style.display = "-webkit-grid";
+ element.style.display = "grid";
element.style.width = "300px";
element.style.height = "150px";
- element.style.webkitGridTemplateColumns = "150% [last]";
- element.style.webkitGridTemplateRows = "[first] 1fr";
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "'450px [last]'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", "'[first] 150px'");
+ element.style.gridTemplateColumns = "150% [last]";
+ element.style.gridTemplateRows = "[first] 1fr";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "'450px [last]'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", "'[first] 150px'");
- element.style.display = "-webkit-grid";
- element.style.webkitGridTemplateColumns = "initial";
- element.style.webkitGridTemplateRows = "initial";
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "'none'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", "'none'");
+ element.style.display = "grid";
+ element.style.gridTemplateColumns = "initial";
+ element.style.gridTemplateRows = "initial";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "'none'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", "'none'");
document.body.removeChild(element);
}
diff --git a/LayoutTests/fast/css-grid-layout/resources/grid-definitions-parsing-utils.js b/LayoutTests/fast/css-grid-layout/resources/grid-definitions-parsing-utils.js
index 796c549..830fac3 100644
--- a/LayoutTests/fast/css-grid-layout/resources/grid-definitions-parsing-utils.js
+++ b/LayoutTests/fast/css-grid-layout/resources/grid-definitions-parsing-utils.js
@@ -2,8 +2,8 @@
{
window.element = element;
var elementID = element.id || "element";
- shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('-webkit-grid-template-columns')", computedColumnValue || columnValue);
- shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('-webkit-grid-template-rows')", computedRowValue || rowValue);
+ shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('grid-template-columns')", computedColumnValue || columnValue);
+ shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('grid-template-rows')", computedRowValue || rowValue);
}
function testGridTemplatesSetJSValues(columnValue, rowValue, computedColumnValue, computedRowValue, jsColumnValue, jsRowValue)
@@ -21,19 +21,19 @@
window.element = document.createElement("div");
document.body.appendChild(element);
if (useGrid) {
- element.style.display = "-webkit-grid";
+ element.style.display = "grid";
element.style.width = "800px";
element.style.height = "600px";
element.style.justifyContent = "start";
element.style.alignContent = "start";
}
element.style.font = "10px Ahem"; // Used to resolve em font consistently.
- element.style.webkitGridTemplateColumns = columnValue;
- element.style.webkitGridTemplateRows = rowValue;
- shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", computedColumnValue || columnValue);
- shouldBeEqualToString("element.style.webkitGridTemplateColumns", jsColumnValue || columnValue);
- shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", computedRowValue || rowValue);
- shouldBeEqualToString("element.style.webkitGridTemplateRows", jsRowValue || rowValue);
+ element.style.gridTemplateColumns = columnValue;
+ element.style.gridTemplateRows = rowValue;
+ shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", computedColumnValue || columnValue);
+ shouldBeEqualToString("element.style.gridTemplateColumns", jsColumnValue || columnValue);
+ shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", computedRowValue || rowValue);
+ shouldBeEqualToString("element.style.gridTemplateRows", jsRowValue || rowValue);
document.body.removeChild(element);
}
@@ -41,24 +41,24 @@
{
window.element = document.createElement("div");
document.body.appendChild(element);
- element.style.webkitGridTemplateColumns = columnValue;
- element.style.webkitGridTemplateRows = rowValue;
- // We can't use testSetJSValues as element.style.webkitGridTemplateRows returns "".
+ element.style.gridTemplateColumns = columnValue;
+ element.style.gridTemplateRows = rowValue;
+ // We can't use testSetJSValues as element.style.gridTemplateRows returns "".
testGridTemplatesValues(element, "none", "none");
document.body.removeChild(element);
}
function checkGridAutoFlowSetCSSValue(elementId, expectedValue) {
- shouldBe("window.getComputedStyle(" + elementId + ", '').getPropertyValue('-webkit-grid-auto-flow')", "'" + expectedValue + "'");
+ shouldBe("window.getComputedStyle(" + elementId + ", '').getPropertyValue('grid-auto-flow')", "'" + expectedValue + "'");
}
function checkGridAutoFlowSetJSValue(newValue, expectedStyleValue, expectedComputedStyleValue) {
element = document.createElement("div");
document.body.appendChild(element);
if (newValue)
- element.style.webkitGridAutoFlow = newValue;
- shouldBe("element.style.webkitGridAutoFlow", "'" + expectedStyleValue + "'");
- shouldBe("window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow')", "'" + expectedComputedStyleValue + "'");
+ element.style.gridAutoFlow = newValue;
+ shouldBe("element.style.gridAutoFlow", "'" + expectedStyleValue + "'");
+ shouldBe("window.getComputedStyle(element, '').getPropertyValue('grid-auto-flow')", "'" + expectedComputedStyleValue + "'");
document.body.removeChild(element);
}
@@ -66,12 +66,12 @@
{
window.element = element;
var elementID = element.id || "element";
- shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('-webkit-grid-auto-rows')", computedRowValue);
- shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('-webkit-grid-auto-columns')", computedColumnValue);
+ shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('grid-auto-rows')", computedRowValue);
+ shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('grid-auto-columns')", computedColumnValue);
}
function testGridGapDefinitionsValues(element, computedRowGap, computedColumnGap)
{
- shouldBeEqualToString("window.getComputedStyle(" + element + ", '').getPropertyValue('-webkit-grid-row-gap')", computedRowGap);
- shouldBeEqualToString("window.getComputedStyle(" + element + ", '').getPropertyValue('-webkit-grid-column-gap')", computedColumnGap);
+ shouldBeEqualToString("window.getComputedStyle(" + element + ", '').getPropertyValue('grid-row-gap')", computedRowGap);
+ shouldBeEqualToString("window.getComputedStyle(" + element + ", '').getPropertyValue('grid-column-gap')", computedColumnGap);
}
diff --git a/LayoutTests/fast/css-grid-layout/resources/grid-item-column-row-parsing-utils.js b/LayoutTests/fast/css-grid-layout/resources/grid-item-column-row-parsing-utils.js
index db4de6a..8cdeca49 100644
--- a/LayoutTests/fast/css-grid-layout/resources/grid-item-column-row-parsing-utils.js
+++ b/LayoutTests/fast/css-grid-layout/resources/grid-item-column-row-parsing-utils.js
@@ -13,12 +13,12 @@
var gridRowStartValue = gridRowStartEndValues[0].trim();
var gridRowEndValue = gridRowStartEndValues[1].trim();
- shouldBeEqualToString("getComputedStyle(" + gridItemId + ", '').getPropertyValue('-webkit-grid-column')", columnValue);
- shouldBeEqualToString("getComputedStyle(" + gridItemId + ", '').getPropertyValue('-webkit-grid-column-start')", gridColumnStartValue);
- shouldBeEqualToString("getComputedStyle(" + gridItemId + ", '').getPropertyValue('-webkit-grid-column-end')", gridColumnEndValue);
- shouldBeEqualToString("getComputedStyle(" + gridItemId + ", '').getPropertyValue('-webkit-grid-row')", rowValue);
- shouldBeEqualToString("getComputedStyle(" + gridItemId + ", '').getPropertyValue('-webkit-grid-row-start')", gridRowStartValue);
- shouldBeEqualToString("getComputedStyle(" + gridItemId + ", '').getPropertyValue('-webkit-grid-row-end')", gridRowEndValue);
+ shouldBeEqualToString("getComputedStyle(" + gridItemId + ", '').getPropertyValue('grid-column')", columnValue);
+ shouldBeEqualToString("getComputedStyle(" + gridItemId + ", '').getPropertyValue('grid-column-start')", gridColumnStartValue);
+ shouldBeEqualToString("getComputedStyle(" + gridItemId + ", '').getPropertyValue('grid-column-end')", gridColumnEndValue);
+ shouldBeEqualToString("getComputedStyle(" + gridItemId + ", '').getPropertyValue('grid-row')", rowValue);
+ shouldBeEqualToString("getComputedStyle(" + gridItemId + ", '').getPropertyValue('grid-row-start')", gridRowStartValue);
+ shouldBeEqualToString("getComputedStyle(" + gridItemId + ", '').getPropertyValue('grid-row-end')", gridRowEndValue);
}
window.testColumnRowCSSParsing = function(id, columnValue, rowValue)
@@ -32,8 +32,8 @@
var gridItem = document.createElement("div");
var gridElement = document.getElementsByClassName("grid")[0];
gridElement.appendChild(gridItem);
- gridItem.style.webkitGridColumn = columnValue;
- gridItem.style.webkitGridRow = rowValue;
+ gridItem.style.gridColumn = columnValue;
+ gridItem.style.gridRow = rowValue;
checkColumnRowValues(gridItem, expectedColumnValue ? expectedColumnValue : columnValue, expectedRowValue ? expectedRowValue : rowValue);
@@ -44,8 +44,8 @@
{
var gridItem = document.createElement("div");
document.body.appendChild(gridItem);
- gridItem.style.webkitGridColumn = columnValue;
- gridItem.style.webkitGridRow = rowValue;
+ gridItem.style.gridColumn = columnValue;
+ gridItem.style.gridRow = rowValue;
checkColumnRowValues(gridItem, "auto / auto", "auto / auto");
@@ -57,8 +57,8 @@
var gridItem = document.createElement("div");
var gridElement = document.getElementsByClassName("grid")[0];
gridElement.appendChild(gridItem);
- gridItem.style.webkitGridColumnStart = columnStartValue;
- gridItem.style.webkitGridRowStart = rowStartValue;
+ gridItem.style.gridColumnStart = columnStartValue;
+ gridItem.style.gridRowStart = rowStartValue;
if (expectedColumnStartValue === undefined)
expectedColumnStartValue = columnStartValue;
@@ -75,8 +75,8 @@
var gridItem = document.createElement("div");
var gridElement = document.getElementsByClassName("grid")[0];
gridElement.appendChild(gridItem);
- gridItem.style.webkitGridColumnEnd = columnEndValue;
- gridItem.style.webkitGridRowEnd = rowEndValue;
+ gridItem.style.gridColumnEnd = columnEndValue;
+ gridItem.style.gridRowEnd = rowEndValue;
if (expectedColumnEndValue === undefined)
expectedColumnEndValue = columnEndValue;
@@ -106,8 +106,8 @@
{
var parentElement = document.createElement("div");
document.body.appendChild(parentElement);
- parentElement.style.webkitGridColumn = placeholderParentColumnValueForInherit;
- parentElement.style.webkitGridRow = placeholderParentRowValueForInherit;
+ parentElement.style.gridColumn = placeholderParentColumnValueForInherit;
+ parentElement.style.gridRow = placeholderParentRowValueForInherit;
var gridItem = document.createElement("div");
parentElement.appendChild(gridItem);
@@ -118,8 +118,8 @@
{
var gridItem = document.createElement("div");
document.body.appendChild(gridItem);
- gridItem.style.webkitGridColumn = placeholderColumnValueForInitial;
- gridItem.style.webkitGridRow = placeholderRowValueForInitial;
+ gridItem.style.gridColumn = placeholderColumnValueForInitial;
+ gridItem.style.gridRow = placeholderRowValueForInitial;
checkColumnRowValues(gridItem, placeholderColumnValueForInitial, placeholderRowValueForInitial);
return gridItem;
@@ -129,8 +129,8 @@
{
var parentElement = setupInheritTest();
var gridItem = parentElement.firstChild;
- gridItem.style.webkitGridColumn = columnValue;
- gridItem.style.webkitGridRow = rowValue;
+ gridItem.style.gridColumn = columnValue;
+ gridItem.style.gridRow = rowValue;
checkColumnRowValues(gridItem, columnValue !== "inherit" ? columnValue : placeholderParentColumnValueForInherit, rowValue !== "inherit" ? rowValue : placeholderParentRowValueForInherit);
@@ -141,8 +141,8 @@
{
var parentElement = setupInheritTest();
var gridItem = parentElement.firstChild;
- gridItem.style.webkitGridColumnStart = startValue;
- gridItem.style.webkitGridRowStart = beforeValue;
+ gridItem.style.gridColumnStart = startValue;
+ gridItem.style.gridRowStart = beforeValue;
// Initial value is 'auto' but we shouldn't touch the opposite grid line.
var columnValueForInherit = (startValue !== "inherit" ? startValue : placeholderParentStartValueForInherit) + " / auto";
@@ -156,8 +156,8 @@
{
var parentElement = setupInheritTest();
var gridItem = parentElement.firstChild;
- gridItem.style.webkitGridColumnEnd = endValue;
- gridItem.style.webkitGridRowEnd = afterValue;
+ gridItem.style.gridColumnEnd = endValue;
+ gridItem.style.gridRowEnd = afterValue;
// Initial value is 'auto' but we shouldn't touch the opposite grid line.
var columnValueForInherit = "auto / " + (endValue !== "inherit" ? endValue : placeholderParentEndValueForInherit);
@@ -171,10 +171,10 @@
{
var gridItem = setupInitialTest();
- gridItem.style.webkitGridColumn = "initial";
+ gridItem.style.gridColumn = "initial";
checkColumnRowValues(gridItem, "auto / auto", placeholderRowValueForInitial);
- gridItem.style.webkitGridRow = "initial";
+ gridItem.style.gridRow = "initial";
checkColumnRowValues(gridItem, "auto / auto", "auto / auto");
document.body.removeChild(gridItem);
@@ -184,10 +184,10 @@
{
var gridItem = setupInitialTest();
- gridItem.style.webkitGridColumnStart = "initial";
+ gridItem.style.gridColumnStart = "initial";
checkColumnRowValues(gridItem, "auto / " + placeholderEndValueForInitial, placeholderRowValueForInitial);
- gridItem.style.webkitGridRowStart = "initial";
+ gridItem.style.gridRowStart = "initial";
checkColumnRowValues(gridItem, "auto / " + placeholderEndValueForInitial, "auto / " + placeholderAfterValueForInitial);
document.body.removeChild(gridItem);
@@ -197,10 +197,10 @@
{
var gridItem = setupInitialTest();
- gridItem.style.webkitGridColumnEnd = "initial";
+ gridItem.style.gridColumnEnd = "initial";
checkColumnRowValues(gridItem, placeholderStartValueForInitial + " / auto", placeholderRowValueForInitial);
- gridItem.style.webkitGridRowEnd = "initial";
+ gridItem.style.gridRowEnd = "initial";
checkColumnRowValues(gridItem, placeholderStartValueForInitial + " / auto", placeholderBeforeValueForInitial + " / auto");
document.body.removeChild(gridItem);
diff --git a/LayoutTests/fast/css-grid-layout/resources/grid-shorthand-parsing-utils.js b/LayoutTests/fast/css-grid-layout/resources/grid-shorthand-parsing-utils.js
index 30961b2..ba71058 100644
--- a/LayoutTests/fast/css-grid-layout/resources/grid-shorthand-parsing-utils.js
+++ b/LayoutTests/fast/css-grid-layout/resources/grid-shorthand-parsing-utils.js
@@ -2,12 +2,12 @@
{
window.element = element;
var elementID = element.id || "element";
- shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('-webkit-grid-template-columns')", columnsValue);
- shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('-webkit-grid-template-rows')", rowsValue);
- shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('-webkit-grid-template-areas')", areasValue);
- shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('-webkit-grid-auto-flow')", autoFlowValue);
- shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('-webkit-grid-auto-columns')", autoColumnsValue);
- shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('-webkit-grid-auto-rows')", autoRowsValue);
+ shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('grid-template-columns')", columnsValue);
+ shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('grid-template-rows')", rowsValue);
+ shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('grid-template-areas')", areasValue);
+ shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('grid-auto-flow')", autoFlowValue);
+ shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('grid-auto-columns')", autoColumnsValue);
+ shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('grid-auto-rows')", autoRowsValue);
}
function testGridDefinitionsSetJSValues(shorthandValue, computedColumnsValue, computedRowsValue, computedAreasValue, computedAutoFlowValue, computedAutoColumnsValue, computedAutoRowsValue, jsColumnsValue, jsRowsValue, jsAreasValue, jsAutoFlowValue, jsAutoColumnsValue, jsAutoRowsValue)
@@ -25,24 +25,24 @@
window.element = document.createElement("div");
document.body.appendChild(element);
if (useGrid) {
- element.style.display = "-webkit-grid";
+ element.style.display = "grid";
element.style.width = "800px";
element.style.height = "600px";
}
element.style.font = "10px Ahem"; // Used to resolve em font consistently.
- element.style.webkitGrid = shorthandValue;
- shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", computedColumnsValue);
- shouldBeEqualToString("element.style.webkitGridTemplateColumns", jsColumnsValue || computedColumnsValue);
- shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", computedRowsValue);
- shouldBeEqualToString("element.style.webkitGridTemplateRows", jsRowsValue || computedRowsValue);
- shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-areas')", computedAreasValue);
- shouldBeEqualToString("element.style.webkitGridTemplateAreas", jsAreasValue || computedAreasValue);
- shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow')", computedAutoFlowValue);
- shouldBeEqualToString("element.style.webkitGridAutoFlow", jsAutoFlowValue || computedAutoFlowValue);
- shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns')", computedAutoColumnsValue);
- shouldBeEqualToString("element.style.webkitGridAutoColumns", jsAutoColumnsValue || computedAutoColumnsValue);
- shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows')", computedAutoRowsValue);
- shouldBeEqualToString("element.style.webkitGridAutoRows", jsAutoRowsValue || computedAutoRowsValue);
+ element.style.grid = shorthandValue;
+ shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", computedColumnsValue);
+ shouldBeEqualToString("element.style.gridTemplateColumns", jsColumnsValue || computedColumnsValue);
+ shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", computedRowsValue);
+ shouldBeEqualToString("element.style.gridTemplateRows", jsRowsValue || computedRowsValue);
+ shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('grid-template-areas')", computedAreasValue);
+ shouldBeEqualToString("element.style.gridTemplateAreas", jsAreasValue || computedAreasValue);
+ shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('grid-auto-flow')", computedAutoFlowValue);
+ shouldBeEqualToString("element.style.gridAutoFlow", jsAutoFlowValue || computedAutoFlowValue);
+ shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('grid-auto-columns')", computedAutoColumnsValue);
+ shouldBeEqualToString("element.style.gridAutoColumns", jsAutoColumnsValue || computedAutoColumnsValue);
+ shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('grid-auto-rows')", computedAutoRowsValue);
+ shouldBeEqualToString("element.style.gridAutoRows", jsAutoRowsValue || computedAutoRowsValue);
document.body.removeChild(element);
}
@@ -50,8 +50,8 @@
{
window.element = document.createElement("div");
document.body.appendChild(element);
- element.style.webkitGrid = shorthandValue;
- // We can't use testSetJSValues as element.style.webkitGridTemplateRows returns "".
+ element.style.grid = shorthandValue;
+ // We can't use testSetJSValues as element.style.gridTemplateRows returns "".
testGridDefinitionsValues(element, "none", "none", "none");
document.body.removeChild(element);
}
\ No newline at end of file
diff --git a/LayoutTests/fast/css-grid-layout/resources/grid-template-shorthand-parsing-utils.js b/LayoutTests/fast/css-grid-layout/resources/grid-template-shorthand-parsing-utils.js
index 28afc3b..6eec899 100644
--- a/LayoutTests/fast/css-grid-layout/resources/grid-template-shorthand-parsing-utils.js
+++ b/LayoutTests/fast/css-grid-layout/resources/grid-template-shorthand-parsing-utils.js
@@ -2,9 +2,9 @@
{
window.element = element;
var elementID = element.id || "element";
- shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('-webkit-grid-template-columns')", computedColumnsValue);
- shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('-webkit-grid-template-rows')", computedRowsValue);
- shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('-webkit-grid-template-areas')", computedAreasValue);
+ shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('grid-template-columns')", computedColumnsValue);
+ shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('grid-template-rows')", computedRowsValue);
+ shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('grid-template-areas')", computedAreasValue);
}
function testGridDefinitionsSetJSValues(shorthandValue, computedColumnsValue, computedRowsValue, computedAreasValue, jsColumnsValue, jsRowsValue, jsAreasValue)
@@ -22,7 +22,7 @@
window.element = document.createElement("div");
document.body.appendChild(element);
if (useGrid) {
- element.style.display = "-webkit-grid";
+ element.style.display = "grid";
element.style.width = "800px";
element.style.height = "600px";
element.style.justifyContent = "start";
@@ -30,13 +30,13 @@
}
element.style.font = "10px Ahem"; // Used to resolve em font consistently.
- element.style.webkitGridTemplate = shorthandValue;
- shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", computedColumnsValue);
- shouldBeEqualToString("element.style.webkitGridTemplateColumns", jsColumnsValue || computedColumnsValue);
- shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", computedRowsValue);
- shouldBeEqualToString("element.style.webkitGridTemplateRows", jsRowsValue || computedRowsValue);
- shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-areas')", computedAreasValue);
- shouldBeEqualToString("element.style.webkitGridTemplateAreas", jsAreasValue || computedAreasValue);
+ element.style.gridTemplate = shorthandValue;
+ shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", computedColumnsValue);
+ shouldBeEqualToString("element.style.gridTemplateColumns", jsColumnsValue || computedColumnsValue);
+ shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", computedRowsValue);
+ shouldBeEqualToString("element.style.gridTemplateRows", jsRowsValue || computedRowsValue);
+ shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('grid-template-areas')", computedAreasValue);
+ shouldBeEqualToString("element.style.gridTemplateAreas", jsAreasValue || computedAreasValue);
document.body.removeChild(element);
}
@@ -46,8 +46,8 @@
window.element = document.createElement("div");
document.body.appendChild(element);
- element.style.webkitGridTemplate = shorthandValue;
- // We can't use testSetJSValues as element.style.webkitGridTemplateRows returns "".
+ element.style.gridTemplate = shorthandValue;
+ // We can't use testSetJSValues as element.style.gridTemplateRows returns "".
testGridDefinitionsValues(element, "none", "none", "none");
document.body.removeChild(element);
}
diff --git a/LayoutTests/fast/css-grid-layout/resources/grid.css b/LayoutTests/fast/css-grid-layout/resources/grid.css
index 2ca3654..6e836ce 100644
--- a/LayoutTests/fast/css-grid-layout/resources/grid.css
+++ b/LayoutTests/fast/css-grid-layout/resources/grid.css
@@ -1,119 +1,119 @@
.grid {
- display: -webkit-grid;
+ display: grid;
background-color: grey;
}
.inline-grid {
- display: -webkit-inline-grid;
+ display: inline-grid;
background-color: grey;
}
.firstRowFirstColumn {
background-color: blue;
- -webkit-grid-column: 1;
- -webkit-grid-row: 1;
+ grid-column: 1;
+ grid-row: 1;
}
.onlyFirstRowOnlyFirstColumn {
background-color: blue;
- -webkit-grid-column: 1 / 2;
- -webkit-grid-row: 1 / 2;
+ grid-column: 1 / 2;
+ grid-row: 1 / 2;
}
.firstRowSecondColumn {
background-color: lime;
- -webkit-grid-column: 2;
- -webkit-grid-row: 1;
+ grid-column: 2;
+ grid-row: 1;
}
.onlyFirstRowOnlySecondColumn {
background-color: lime;
- -webkit-grid-column: 2 / 3;
- -webkit-grid-row: 1 / 2;
+ grid-column: 2 / 3;
+ grid-row: 1 / 2;
}
.firstRowThirdColumn {
background-color: magenta;
- -webkit-grid-column: 3;
- -webkit-grid-row: 1;
+ grid-column: 3;
+ grid-row: 1;
}
.firstRowFourthColumn {
background-color: green;
- -webkit-grid-column: 4;
- -webkit-grid-row: 1;
+ grid-column: 4;
+ grid-row: 1;
}
.secondRowFirstColumn {
background-color: purple;
- -webkit-grid-column: 1;
- -webkit-grid-row: 2;
+ grid-column: 1;
+ grid-row: 2;
}
.onlySecondRowOnlyFirstColumn {
background-color: purple;
- -webkit-grid-column: 1 / 2;
- -webkit-grid-row: 2 / 3;
+ grid-column: 1 / 2;
+ grid-row: 2 / 3;
}
.secondRowSecondColumn {
background-color: orange;
- -webkit-grid-column: 2;
- -webkit-grid-row: 2;
+ grid-column: 2;
+ grid-row: 2;
}
.onlySecondRowOnlySecondColumn {
background-color: orange;
- -webkit-grid-column: 2 / 3;
- -webkit-grid-row: 2 / 3;
+ grid-column: 2 / 3;
+ grid-row: 2 / 3;
}
.endSecondRowEndSecondColumn {
background-color: orange;
- -webkit-grid-column-end: 3;
- -webkit-grid-row-end: 3;
+ grid-column-end: 3;
+ grid-row-end: 3;
}
.secondRowThirdColumn {
background-color: navy;
- -webkit-grid-column: 3;
- -webkit-grid-row: 2;
+ grid-column: 3;
+ grid-row: 2;
}
.secondRowFourthColumn {
background-color: pink;
- -webkit-grid-column: 4;
- -webkit-grid-row: 2;
+ grid-column: 4;
+ grid-row: 2;
}
.thirdRowFirstColumn {
background-color: olive;
- -webkit-grid-column: 1;
- -webkit-grid-row: 3;
+ grid-column: 1;
+ grid-row: 3;
}
.thirdRowSecondColumn {
background-color: maroon;
- -webkit-grid-column: 2;
- -webkit-grid-row: 3;
+ grid-column: 2;
+ grid-row: 3;
}
.thirdRowThirdColumn {
background-color: yellow;
- -webkit-grid-column: 3;
- -webkit-grid-row: 3;
+ grid-column: 3;
+ grid-row: 3;
}
.fourthRowFirstColumn {
background-color: red;
- -webkit-grid-column: 1;
- -webkit-grid-row: 4;
+ grid-column: 1;
+ grid-row: 4;
}
.fourthRowSecondColumn {
background-color: aqua;
- -webkit-grid-column: 2;
- -webkit-grid-row: 4;
+ grid-column: 2;
+ grid-row: 4;
}
.firstRowThirdColumn {
@@ -141,153 +141,153 @@
}
.firstAutoRowSecondAutoColumn {
- -webkit-grid-row: 1 / auto;
- -webkit-grid-column: 2 / auto;
+ grid-row: 1 / auto;
+ grid-column: 2 / auto;
}
.autoLastRowAutoLastColumn {
- -webkit-grid-row: auto / -1;
- -webkit-grid-column: auto / -1;
+ grid-row: auto / -1;
+ grid-column: auto / -1;
}
.autoSecondRowAutoFirstColumn {
- -webkit-grid-row: auto / 2;
- -webkit-grid-column: auto / 1;
+ grid-row: auto / 2;
+ grid-column: auto / 1;
}
.firstRowBothColumn {
- -webkit-grid-row: 1;
- -webkit-grid-column: 1 / -1;
+ grid-row: 1;
+ grid-column: 1 / -1;
}
.secondRowBothColumn {
- -webkit-grid-row: 2;
- -webkit-grid-column: 1 / -1;
+ grid-row: 2;
+ grid-column: 1 / -1;
}
.bothRowFirstColumn {
- -webkit-grid-row: 1 / -1;
- -webkit-grid-column: 1;
+ grid-row: 1 / -1;
+ grid-column: 1;
}
.bothRowSecondColumn {
- -webkit-grid-row: 1 / -1;
- -webkit-grid-column: 2;
+ grid-row: 1 / -1;
+ grid-column: 2;
}
.bothRowBothColumn {
- -webkit-grid-row: 1 / -1;
- -webkit-grid-column: 1 / -1;
+ grid-row: 1 / -1;
+ grid-column: 1 / -1;
}
/* Auto column / row. */
.autoRowAutoColumn {
background-color: pink;
- -webkit-grid-column: auto;
- -webkit-grid-row: auto;
+ grid-column: auto;
+ grid-row: auto;
}
.firstRowAutoColumn {
background-color: blue;
- -webkit-grid-column: auto;
- -webkit-grid-row: 1;
+ grid-column: auto;
+ grid-row: 1;
}
.secondRowAutoColumn {
background-color: purple;
- -webkit-grid-column: auto;
- -webkit-grid-row: 2;
+ grid-column: auto;
+ grid-row: 2;
}
.thirdRowAutoColumn {
background-color: navy;
- -webkit-grid-column: auto;
- -webkit-grid-row: 3;
+ grid-column: auto;
+ grid-row: 3;
}
.autoRowFirstColumn {
background-color: lime;
- -webkit-grid-column: 1;
- -webkit-grid-row: auto;
+ grid-column: 1;
+ grid-row: auto;
}
.autoRowSecondColumn {
background-color: orange;
- -webkit-grid-column: 2;
- -webkit-grid-row: auto;
+ grid-column: 2;
+ grid-row: auto;
}
.autoRowThirdColumn {
background-color: magenta;
- -webkit-grid-column: 3;
- -webkit-grid-row: auto;
+ grid-column: 3;
+ grid-row: auto;
}
.autoRowAutoColumnSpanning2 {
background-color: maroon;
- -webkit-grid-column: span 2;
- -webkit-grid-row: auto;
+ grid-column: span 2;
+ grid-row: auto;
}
.autoRowSpanning2AutoColumn {
background-color: aqua;
- -webkit-grid-column: auto;
- -webkit-grid-row: span 2;
+ grid-column: auto;
+ grid-row: span 2;
}
.autoRowSpanning2AutoColumnSpanning3 {
background-color: olive;
- -webkit-grid-column: span 3;
- -webkit-grid-row: span 2;
+ grid-column: span 3;
+ grid-row: span 2;
}
.autoRowSpanning3AutoColumnSpanning2 {
background-color: indigo;
- -webkit-grid-column: span 2;
- -webkit-grid-row: span 3;
+ grid-column: span 2;
+ grid-row: span 3;
}
.autoRowFirstColumnSpanning2 {
background-color: maroon;
- -webkit-grid-column: 1 / span 2;
- -webkit-grid-row: auto;
+ grid-column: 1 / span 2;
+ grid-row: auto;
}
.autoRowSecondColumnSpanning2 {
background-color: olive;
- -webkit-grid-column: 2 / span 2;
- -webkit-grid-row: auto;
+ grid-column: 2 / span 2;
+ grid-row: auto;
}
.firstRowSpanning2AutoColumn {
background-color: maroon;
- -webkit-grid-column: auto;
- -webkit-grid-row: 1 / span 2;
+ grid-column: auto;
+ grid-row: 1 / span 2;
height: 100%;
}
.secondRowSpanning2AutoColumn {
background-color: olive;
- -webkit-grid-column: auto;
- -webkit-grid-row: 2 / span 2;
+ grid-column: auto;
+ grid-row: 2 / span 2;
height: 100%;
}
/* Grid element flow. */
.gridAutoFlowColumnSparse {
- -webkit-grid-auto-flow: column;
+ grid-auto-flow: column;
}
.gridAutoFlowColumnDense {
- -webkit-grid-auto-flow: column dense;
+ grid-auto-flow: column dense;
}
.gridAutoFlowRowSparse {
- -webkit-grid-auto-flow: row;
+ grid-auto-flow: row;
}
.gridAutoFlowRowDense {
- -webkit-grid-auto-flow: row dense;
+ grid-auto-flow: row dense;
}
/* This rule makes sure the container is smaller than any grid items to avoid distributing any extra logical space to them. */
diff --git a/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js b/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js
index b780d82..b4e81c1 100644
--- a/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js
+++ b/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js
@@ -23,8 +23,8 @@
debug("Test the initial value");
var element = document.createElement("div");
document.body.appendChild(element);
-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "'none'");
-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", "'none'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "'none'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", "'none'");
debug("");
debug("Test getting and setting grid-template-rows and grid-template-columns through JS");
@@ -40,12 +40,12 @@
debug("");
debug("Test getting wrong values set from CSS");
var gridWithNoneAndAuto = document.getElementById("gridWithNoneAndAuto");
-shouldBe("getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('-webkit-grid-template-columns')", "'none'");
-shouldBe("getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('-webkit-grid-template-rows')", "'none'");
+shouldBe("getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('grid-template-columns')", "'none'");
+shouldBe("getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('grid-template-rows')", "'none'");
var gridWithNoneAndFixed = document.getElementById("gridWithNoneAndFixed");
-shouldBe("getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('-webkit-grid-template-columns')", "'none'");
-shouldBe("getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('-webkit-grid-template-rows')", "'none'");
+shouldBe("getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('grid-template-columns')", "'none'");
+shouldBe("getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('grid-template-rows')", "'none'");
debug("");
debug("Test setting and getting wrong values from JS");
@@ -63,14 +63,14 @@
{
var parentElement = document.createElement("div");
document.body.appendChild(parentElement);
- parentElement.style.webkitGridTemplateColumns = "50px 1fr [last]";
- parentElement.style.webkitGridTemplateRows = "101% [middle] 45px";
+ parentElement.style.gridTemplateColumns = "50px 1fr [last]";
+ parentElement.style.gridTemplateRows = "101% [middle] 45px";
testGridTemplatesValues(parentElement, "50px 1fr [last]", "101% [middle] 45px");
element = document.createElement("div");
parentElement.appendChild(element);
- element.style.webkitGridTemplateColumns = "inherit";
- element.style.webkitGridTemplateRows = "inherit";
+ element.style.gridTemplateColumns = "inherit";
+ element.style.gridTemplateRows = "inherit";
testGridTemplatesValues(element, "50px 1fr [last]", "101% [middle] 45px");
document.body.removeChild(parentElement);
@@ -83,14 +83,14 @@
{
element = document.createElement("div");
document.body.appendChild(element);
- element.style.webkitGridTemplateColumns = "150% [middle] 55px";
- element.style.webkitGridTemplateRows = "1fr [line] 2fr [line]";
+ element.style.gridTemplateColumns = "150% [middle] 55px";
+ element.style.gridTemplateRows = "1fr [line] 2fr [line]";
testGridTemplatesValues(element, "150% [middle] 55px", "1fr [line] 2fr [line]");
- element.style.webkitGridTemplateColumns = "initial";
- element.style.webkitGridTemplateRows = "initial";
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "'none'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", "'none'");
+ element.style.gridTemplateColumns = "initial";
+ element.style.gridTemplateRows = "initial";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "'none'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", "'none'");
document.body.removeChild(element);
}
diff --git a/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js b/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js
index 52ae56f..9fb1f9c 100644
--- a/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js
+++ b/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js
@@ -30,8 +30,8 @@
var element = document.createElement("div");
document.body.appendChild(element);
testGridTemplatesValues(element, "none", "none");
-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "'none'");
-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", "'none'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "'none'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", "'none'");
debug("");
debug("Test getting and setting grid-template-columns and grid-template-rows through JS");
@@ -84,15 +84,15 @@
{
var parentElement = document.createElement("div");
document.body.appendChild(parentElement);
- parentElement.style.webkitGridTemplateColumns = "50px [last]";
- parentElement.style.webkitGridTemplateRows = "[first] 101%";
+ parentElement.style.gridTemplateColumns = "50px [last]";
+ parentElement.style.gridTemplateRows = "[first] 101%";
element = document.createElement("div");
parentElement.appendChild(element);
- element.style.webkitGridTemplateColumns = "inherit";
- element.style.webkitGridTemplateRows = "inherit";
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "'50px [last]'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", "'[first] 101%'");
+ element.style.gridTemplateColumns = "inherit";
+ element.style.gridTemplateRows = "inherit";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "'50px [last]'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", "'[first] 101%'");
document.body.removeChild(parentElement);
}
@@ -104,15 +104,15 @@
{
element = document.createElement("div");
document.body.appendChild(element);
- element.style.webkitGridTemplateColumns = "150% [last]";
- element.style.webkitGridTemplateRows = "[first] 1fr";
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "'150% [last]'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", "'[first] 1fr'");
+ element.style.gridTemplateColumns = "150% [last]";
+ element.style.gridTemplateRows = "[first] 1fr";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "'150% [last]'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", "'[first] 1fr'");
- element.style.webkitGridTemplateColumns = "initial";
- element.style.webkitGridTemplateRows = "initial";
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "'none'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", "'none'");
+ element.style.gridTemplateColumns = "initial";
+ element.style.gridTemplateRows = "initial";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "'none'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", "'none'");
document.body.removeChild(element);
}
diff --git a/LayoutTests/fast/css-grid-layout/should-not-collapse-anonymous-blocks.html b/LayoutTests/fast/css-grid-layout/should-not-collapse-anonymous-blocks.html
index 6e1855d..c114618 100644
--- a/LayoutTests/fast/css-grid-layout/should-not-collapse-anonymous-blocks.html
+++ b/LayoutTests/fast/css-grid-layout/should-not-collapse-anonymous-blocks.html
@@ -12,7 +12,7 @@
</style>
<body>
<p>This test passes if it does not crash.</p>
-<div style="display: -webkit-grid;">
+<div style="display: grid;">
<div id=a></div>
<div style="display: inline; "></div>
</div>
diff --git a/LayoutTests/fast/css-grid-layout/swap-lines-if-start-is-further-endward-than-end-line-expected.html b/LayoutTests/fast/css-grid-layout/swap-lines-if-start-is-further-endward-than-end-line-expected.html
index 7741c3a..7b28c49 100644
--- a/LayoutTests/fast/css-grid-layout/swap-lines-if-start-is-further-endward-than-end-line-expected.html
+++ b/LayoutTests/fast/css-grid-layout/swap-lines-if-start-is-further-endward-than-end-line-expected.html
@@ -2,31 +2,31 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-columns: [a] 50px [b] 50px [c] 50px [d];
- -webkit-grid-auto-rows: 20px;
- -webkit-grid-auto-columns: 20px;
+ grid-template-columns: [a] 50px [b] 50px [c] 50px [d];
+ grid-auto-rows: 20px;
+ grid-auto-columns: 20px;
}
</style>
<div class="grid">
- <div style="-webkit-grid-column: 1 / 3; background-color: gray"></div>
- <div style="-webkit-grid-column: 1 / -2; background-color: purple"></div>
- <div style="-webkit-grid-column: -2 / 4; background-color: orange"></div>
+ <div style="grid-column: 1 / 3; background-color: gray"></div>
+ <div style="grid-column: 1 / -2; background-color: purple"></div>
+ <div style="grid-column: -2 / 4; background-color: orange"></div>
- <div style="-webkit-grid-column: 2 / d; background-color: gray"></div>
- <div style="-webkit-grid-column: b / -1; background-color: purple"></div>
- <div style="-webkit-grid-column: c / d; background-color: orange"></div>
+ <div style="grid-column: 2 / d; background-color: gray"></div>
+ <div style="grid-column: b / -1; background-color: purple"></div>
+ <div style="grid-column: c / d; background-color: orange"></div>
- <div style="-webkit-grid-column: a -1 / 3; background-color: gray"></div>
- <div style="-webkit-grid-column: b 1 / -1; background-color: purple"></div>
- <div style="-webkit-grid-column: c -1 / d; background-color: orange"></div>
+ <div style="grid-column: a -1 / 3; background-color: gray"></div>
+ <div style="grid-column: b 1 / -1; background-color: purple"></div>
+ <div style="grid-column: c -1 / d; background-color: orange"></div>
- <div style="-webkit-grid-column: 2 / 3; background-color: blue"></div>
- <div style="-webkit-grid-column: 1 / 3; background-color: lightblue"></div>
- <div style="-webkit-grid-column: 2 / 4; background-color: maroon"></div>
+ <div style="grid-column: 2 / 3; background-color: blue"></div>
+ <div style="grid-column: 1 / 3; background-color: lightblue"></div>
+ <div style="grid-column: 2 / 4; background-color: maroon"></div>
- <div style="-webkit-grid-column: -3 / -3; background-color: lightgreen"></div>
- <div style="-webkit-grid-column: 3 / 3; background-color: green"></div>
+ <div style="grid-column: -3 / -3; background-color: lightgreen"></div>
+ <div style="grid-column: 3 / 3; background-color: green"></div>
</div>
diff --git a/LayoutTests/fast/css-grid-layout/swap-lines-if-start-is-further-endward-than-end-line.html b/LayoutTests/fast/css-grid-layout/swap-lines-if-start-is-further-endward-than-end-line.html
index c8023c9..6175d04 100644
--- a/LayoutTests/fast/css-grid-layout/swap-lines-if-start-is-further-endward-than-end-line.html
+++ b/LayoutTests/fast/css-grid-layout/swap-lines-if-start-is-further-endward-than-end-line.html
@@ -2,32 +2,32 @@
<link href="resources/grid.css" rel="stylesheet">
<style>
.grid {
- -webkit-grid-template-columns: [a] 50px [b] 50px [c] 50px [d];
- -webkit-grid-auto-rows: 20px;
- -webkit-grid-auto-columns: 20px;
+ grid-template-columns: [a] 50px [b] 50px [c] 50px [d];
+ grid-auto-rows: 20px;
+ grid-auto-columns: 20px;
}
</style>
<div class="grid">
- <div style="-webkit-grid-column: 3 / 1; background-color: gray"></div>
- <div style="-webkit-grid-column: -2 / 1; background-color: purple"></div>
- <div style="-webkit-grid-column: 4 / -2; background-color: orange"></div>
+ <div style="grid-column: 3 / 1; background-color: gray"></div>
+ <div style="grid-column: -2 / 1; background-color: purple"></div>
+ <div style="grid-column: 4 / -2; background-color: orange"></div>
- <div style="-webkit-grid-column: d / 2; background-color: gray"></div>
- <div style="-webkit-grid-column: -1 / b; background-color: purple"></div>
- <div style="-webkit-grid-column: d / c; background-color: orange"></div>
+ <div style="grid-column: d / 2; background-color: gray"></div>
+ <div style="grid-column: -1 / b; background-color: purple"></div>
+ <div style="grid-column: d / c; background-color: orange"></div>
- <div style="-webkit-grid-column: 3 / a -1; background-color: gray"></div>
- <div style="-webkit-grid-column: -1 / b 1; background-color: purple"></div>
- <div style="-webkit-grid-column: d / c -1; background-color: orange"></div>
+ <div style="grid-column: 3 / a -1; background-color: gray"></div>
+ <div style="grid-column: -1 / b 1; background-color: purple"></div>
+ <div style="grid-column: d / c -1; background-color: orange"></div>
<!-- Check that we do not break already valid use cases. -->
- <div style="-webkit-grid-column: -3 / -2; background-color: blue"></div>
- <div style="-webkit-grid-column: -4 / -2; background-color: lightblue"></div>
- <div style="-webkit-grid-column: -3 / -1; background-color: maroon"></div>
+ <div style="grid-column: -3 / -2; background-color: blue"></div>
+ <div style="grid-column: -4 / -2; background-color: lightblue"></div>
+ <div style="grid-column: -3 / -1; background-color: maroon"></div>
- <div style="-webkit-grid-column: 2 / 2; background-color: lightgreen"></div>
- <div style="-webkit-grid-column: c / c; background-color: green"></div>
+ <div style="grid-column: 2 / 2; background-color: lightgreen"></div>
+ <div style="grid-column: c / c; background-color: green"></div>
</div>
diff --git a/LayoutTests/fast/css-grid-layout/tracks-number-greatly-exceeding-available-size-crash.html b/LayoutTests/fast/css-grid-layout/tracks-number-greatly-exceeding-available-size-crash.html
index 732ede7..86f23b9 100644
--- a/LayoutTests/fast/css-grid-layout/tracks-number-greatly-exceeding-available-size-crash.html
+++ b/LayoutTests/fast/css-grid-layout/tracks-number-greatly-exceeding-available-size-crash.html
@@ -10,19 +10,19 @@
<p>The test PASSES if it does not crash on Debug builds.</p>
<div style="position: relative;">
<div class="grid">
- <div style="width: 1px; -webkit-grid-column-start: span 100;"></div>
+ <div style="width: 1px; grid-column-start: span 100;"></div>
</div>
</div>
<div style="position: relative;">
<div class="grid">
- <div style="width: 1px; -webkit-grid-column: span 100;"></div>
+ <div style="width: 1px; grid-column: span 100;"></div>
</div>
</div>
<div style="position: relative;">
<div class="grid">
- <div style="width: 1px; -webkit-grid-column-end: span 100;"></div>
+ <div style="width: 1px; grid-column-end: span 100;"></div>
</div>
</div>
