[css-grid] Unprefix CSS Grid Layout properties
authorrego@igalia.com <rego@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 6 May 2016 08:17:12 +0000 (08:17 +0000)
committerrego@igalia.com <rego@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 6 May 2016 08:17:12 +0000 (08:17 +0000)
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: https://svn.webkit.org/repository/webkit/trunk@200510 268f45cc-cd09-0410-ab3c-d52691b4dbfc

329 files changed:
ChangeLog
LayoutTests/ChangeLog
LayoutTests/css3/parse-align-content.html
LayoutTests/css3/parse-align-items.html
LayoutTests/css3/parse-align-self.html
LayoutTests/css3/parse-justify-content.html
LayoutTests/fast/css-grid-layout/absolute-positioning-definite-sizes.html
LayoutTests/fast/css-grid-layout/absolute-positioning-grid-container-containing-block.html
LayoutTests/fast/css-grid-layout/absolute-positioning-grid-container-parent.html
LayoutTests/fast/css-grid-layout/anonymous-grid-items-expected.html
LayoutTests/fast/css-grid-layout/anonymous-grid-items.html
LayoutTests/fast/css-grid-layout/auto-content-resolution-columns.html
LayoutTests/fast/css-grid-layout/auto-content-resolution-rows.html
LayoutTests/fast/css-grid-layout/breadth-size-resolution-grid.html
LayoutTests/fast/css-grid-layout/calc-resolution-grid-item.html
LayoutTests/fast/css-grid-layout/compute-intrinsic-widths-scrollbar.html
LayoutTests/fast/css-grid-layout/display-grid-set-get-expected.txt
LayoutTests/fast/css-grid-layout/explicit-grid-size.html
LayoutTests/fast/css-grid-layout/flex-and-content-sized-resolution-columns-expected.txt
LayoutTests/fast/css-grid-layout/flex-and-content-sized-resolution-columns.html
LayoutTests/fast/css-grid-layout/flex-and-intrinsic-sizes.html
LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-columns.html
LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-rows.html
LayoutTests/fast/css-grid-layout/flex-content-distribution.html
LayoutTests/fast/css-grid-layout/flex-content-resolution-columns.html
LayoutTests/fast/css-grid-layout/flex-content-resolution-rows.html
LayoutTests/fast/css-grid-layout/flex-content-sized-column-use-available-width.html
LayoutTests/fast/css-grid-layout/flex-content-sized-columns-resize.html
LayoutTests/fast/css-grid-layout/flex-factor-sum-less-than-1.html
LayoutTests/fast/css-grid-layout/float-not-protruding-into-next-grid-item.html
LayoutTests/fast/css-grid-layout/floating-empty-grids.html
LayoutTests/fast/css-grid-layout/grid-align-content-distribution-vertical-lr.html
LayoutTests/fast/css-grid-layout/grid-align-content-distribution-vertical-rl.html
LayoutTests/fast/css-grid-layout/grid-align-content-distribution.html
LayoutTests/fast/css-grid-layout/grid-align-content-vertical-lr.html
LayoutTests/fast/css-grid-layout/grid-align-content-vertical-rl.html
LayoutTests/fast/css-grid-layout/grid-align-content.html
LayoutTests/fast/css-grid-layout/grid-align-justify-margin-border-padding-vertical-lr.html
LayoutTests/fast/css-grid-layout/grid-align-justify-margin-border-padding-vertical-rl.html
LayoutTests/fast/css-grid-layout/grid-align-justify-margin-border-padding.html
LayoutTests/fast/css-grid-layout/grid-align-justify-overflow.html
LayoutTests/fast/css-grid-layout/grid-align-justify-stretch.html
LayoutTests/fast/css-grid-layout/grid-align-stretching-replaced-items.html
LayoutTests/fast/css-grid-layout/grid-align.html
LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html
LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set-expected.txt
LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html
LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-resolution.html
LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-update.html
LayoutTests/fast/css-grid-layout/grid-auto-flow-get-set-expected.txt
LayoutTests/fast/css-grid-layout/grid-auto-flow-get-set.html
LayoutTests/fast/css-grid-layout/grid-auto-flow-resolution.html
LayoutTests/fast/css-grid-layout/grid-auto-flow-sparse.html
LayoutTests/fast/css-grid-layout/grid-auto-flow-update.html
LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-columns-expected.txt
LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-columns.html
LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-rows-expected.txt
LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-rows.html
LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt
LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt
LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html
LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html
LayoutTests/fast/css-grid-layout/grid-container-change-named-grid-lines-recompute-child.html
LayoutTests/fast/css-grid-layout/grid-container-ignore-first-letter.html
LayoutTests/fast/css-grid-layout/grid-content-alignment-and-self-alignment-spanning.html
LayoutTests/fast/css-grid-layout/grid-content-alignment-and-self-alignment.html
LayoutTests/fast/css-grid-layout/grid-content-alignment-overflow.html
LayoutTests/fast/css-grid-layout/grid-content-alignment-stretch-only-valid-for-auto-sized-tracks.html
LayoutTests/fast/css-grid-layout/grid-content-alignment-stretch-with-different-sized-tracks.html
LayoutTests/fast/css-grid-layout/grid-content-alignment-with-span-vertical-lr.html
LayoutTests/fast/css-grid-layout/grid-content-alignment-with-span-vertical-rl.html
LayoutTests/fast/css-grid-layout/grid-content-alignment-with-span.html
LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution-expected.txt
LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution.html
LayoutTests/fast/css-grid-layout/grid-disable.html
LayoutTests/fast/css-grid-layout/grid-dynamic-updates-relayout.html
LayoutTests/fast/css-grid-layout/grid-element-auto-repeat-get-set-expected.txt
LayoutTests/fast/css-grid-layout/grid-element-auto-repeat-get-set.html
LayoutTests/fast/css-grid-layout/grid-element-border-grid-item.html
LayoutTests/fast/css-grid-layout/grid-element-border-padding-grid-item.html
LayoutTests/fast/css-grid-layout/grid-element-change-columns-repaint.html
LayoutTests/fast/css-grid-layout/grid-element-change-rows-repaint.html
LayoutTests/fast/css-grid-layout/grid-element-empty-row-column.html
LayoutTests/fast/css-grid-layout/grid-element-min-max-height.html
LayoutTests/fast/css-grid-layout/grid-element-min-max-width.html
LayoutTests/fast/css-grid-layout/grid-element-padding-grid-item.html
LayoutTests/fast/css-grid-layout/grid-element-padding-margin.html
LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set-expected.txt
LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set.html
LayoutTests/fast/css-grid-layout/grid-element-shrink-to-fit.html
LayoutTests/fast/css-grid-layout/grid-grow-tracks-to-their-max-expected.txt
LayoutTests/fast/css-grid-layout/grid-grow-tracks-to-their-max.html
LayoutTests/fast/css-grid-layout/grid-gutters-and-alignment.html
LayoutTests/fast/css-grid-layout/grid-gutters-and-flex-content.html
LayoutTests/fast/css-grid-layout/grid-gutters-and-tracks.html
LayoutTests/fast/css-grid-layout/grid-gutters-get-set-expected.txt
LayoutTests/fast/css-grid-layout/grid-gutters-get-set.html
LayoutTests/fast/css-grid-layout/grid-indefinite-calculated-height-crash-expected.txt
LayoutTests/fast/css-grid-layout/grid-indefinite-calculated-height-crash.html
LayoutTests/fast/css-grid-layout/grid-initialize-span-one-items-expected.txt
LayoutTests/fast/css-grid-layout/grid-initialize-span-one-items.html
LayoutTests/fast/css-grid-layout/grid-item-addition-auto-placement-update.html
LayoutTests/fast/css-grid-layout/grid-item-addition-track-breadth-update.html
LayoutTests/fast/css-grid-layout/grid-item-area-get-set-expected.txt
LayoutTests/fast/css-grid-layout/grid-item-area-get-set.html
LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-lr.html
LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-rl.html
LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment.html
LayoutTests/fast/css-grid-layout/grid-item-auto-margins-and-stretch.html
LayoutTests/fast/css-grid-layout/grid-item-auto-margins-must-respect-specified-margins.html
LayoutTests/fast/css-grid-layout/grid-item-auto-placement-automatic-span.html
LayoutTests/fast/css-grid-layout/grid-item-auto-placement-definite-span.html
LayoutTests/fast/css-grid-layout/grid-item-auto-placement-fixed-row-column.html
LayoutTests/fast/css-grid-layout/grid-item-auto-sized-align-justify-margin-border-padding.html
LayoutTests/fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html
LayoutTests/fast/css-grid-layout/grid-item-bad-resolution-double-span.html
LayoutTests/fast/css-grid-layout/grid-item-change-column-repaint.html
LayoutTests/fast/css-grid-layout/grid-item-change-row-repaint.html
LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set-expected.txt
LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set.html
LayoutTests/fast/css-grid-layout/grid-item-display.html
LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set-expected.txt
LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set.html
LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-ltr.html
LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-rtl.html
LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-ltr.html
LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-rtl.html
LayoutTests/fast/css-grid-layout/grid-item-margin-resolution.html
LayoutTests/fast/css-grid-layout/grid-item-margins-not-collapse.html
LayoutTests/fast/css-grid-layout/grid-item-multiple-minmax-content-resolution.html
LayoutTests/fast/css-grid-layout/grid-item-named-grid-area-resolution.html
LayoutTests/fast/css-grid-layout/grid-item-named-grid-line-resolution.html
LayoutTests/fast/css-grid-layout/grid-item-negative-indexes.html
LayoutTests/fast/css-grid-layout/grid-item-negative-integer-explicit-grid-resolution.html
LayoutTests/fast/css-grid-layout/grid-item-negative-position-resolution.html
LayoutTests/fast/css-grid-layout/grid-item-order-auto-flow-resolution.html
LayoutTests/fast/css-grid-layout/grid-item-order-in-content-sized-columns-resolution.html
LayoutTests/fast/css-grid-layout/grid-item-order-paint-order.html
LayoutTests/fast/css-grid-layout/grid-item-position-changed-dynamic.html
LayoutTests/fast/css-grid-layout/grid-item-removal-auto-placement-update.html
LayoutTests/fast/css-grid-layout/grid-item-removal-track-breadth-update.html
LayoutTests/fast/css-grid-layout/grid-item-spanning-resolution.html
LayoutTests/fast/css-grid-layout/grid-item-start-before-get-set-expected.txt
LayoutTests/fast/css-grid-layout/grid-item-start-before-get-set.html
LayoutTests/fast/css-grid-layout/grid-item-stretch-with-margins-borders-padding-vertical-lr.html
LayoutTests/fast/css-grid-layout/grid-item-stretch-with-margins-borders-padding-vertical-rl.html
LayoutTests/fast/css-grid-layout/grid-item-stretch-with-margins-borders-padding.html
LayoutTests/fast/css-grid-layout/grid-item-text-background-not-interleaved.html
LayoutTests/fast/css-grid-layout/grid-item-unknown-named-grid-line-resolution.html
LayoutTests/fast/css-grid-layout/grid-item-with-border-in-fr.html
LayoutTests/fast/css-grid-layout/grid-item-with-border-in-intrinsic.html
LayoutTests/fast/css-grid-layout/grid-item-with-percent-height-in-auto-height-grid-resolution.html
LayoutTests/fast/css-grid-layout/grid-item-with-percent-min-max-height-dynamic.html
LayoutTests/fast/css-grid-layout/grid-item-z-index-change-repaint-expected.html
LayoutTests/fast/css-grid-layout/grid-item-z-index-change-repaint.html
LayoutTests/fast/css-grid-layout/grid-item-z-index-stacking-context-expected.html
LayoutTests/fast/css-grid-layout/grid-item-z-index-stacking-context.html
LayoutTests/fast/css-grid-layout/grid-item-z-index-support.html
LayoutTests/fast/css-grid-layout/grid-items-should-not-be-stretched-when-height-or-width-or-margin-change.html
LayoutTests/fast/css-grid-layout/grid-justify-content-distribution-vertical-lr.html
LayoutTests/fast/css-grid-layout/grid-justify-content-distribution-vertical-rl.html
LayoutTests/fast/css-grid-layout/grid-justify-content-distribution.html
LayoutTests/fast/css-grid-layout/grid-justify-content-vertical-lr.html
LayoutTests/fast/css-grid-layout/grid-justify-content-vertical-rl.html
LayoutTests/fast/css-grid-layout/grid-justify-content.html
LayoutTests/fast/css-grid-layout/grid-percent-track-margin-border-padding.html
LayoutTests/fast/css-grid-layout/grid-percent-track-scrollbar.html
LayoutTests/fast/css-grid-layout/grid-positioned-children-writing-modes.html
LayoutTests/fast/css-grid-layout/grid-positioned-items-background-rtl.html
LayoutTests/fast/css-grid-layout/grid-positioned-items-background.html
LayoutTests/fast/css-grid-layout/grid-positioned-items-content-alignment-rtl.html
LayoutTests/fast/css-grid-layout/grid-positioned-items-content-alignment.html
LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps-rtl.html
LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps.html
LayoutTests/fast/css-grid-layout/grid-positioned-items-implicit-grid-line.html
LayoutTests/fast/css-grid-layout/grid-positioned-items-implicit-grid.html
LayoutTests/fast/css-grid-layout/grid-positioned-items-padding.html
LayoutTests/fast/css-grid-layout/grid-positioned-items-unknown-named-grid-line.html
LayoutTests/fast/css-grid-layout/grid-positioned-items-within-grid-implicit-track.html
LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths.html
LayoutTests/fast/css-grid-layout/grid-repeat-calc-expected.txt
LayoutTests/fast/css-grid-layout/grid-repeat-calc.html
LayoutTests/fast/css-grid-layout/grid-shorthand-computed-style-crash.html
LayoutTests/fast/css-grid-layout/grid-shorthand-get-set-expected.txt
LayoutTests/fast/css-grid-layout/grid-shorthand-get-set.html
LayoutTests/fast/css-grid-layout/grid-sizing-positioned-items.html
LayoutTests/fast/css-grid-layout/grid-strict-ordering-crash.html
LayoutTests/fast/css-grid-layout/grid-template-areas-empty-string-crash.html
LayoutTests/fast/css-grid-layout/grid-template-areas-get-set-expected.txt
LayoutTests/fast/css-grid-layout/grid-template-areas-get-set.html
LayoutTests/fast/css-grid-layout/grid-template-areas-infinite-loop.html
LayoutTests/fast/css-grid-layout/grid-template-columns-rows-computed-style-gaps-content-alignment-expected.txt
LayoutTests/fast/css-grid-layout/grid-template-columns-rows-computed-style-gaps-content-alignment.html
LayoutTests/fast/css-grid-layout/grid-template-shorthand-computed-style-crash.html
LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set-expected.txt
LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set.html
LayoutTests/fast/css-grid-layout/grid-update-sizes-after-distributing-all-expected.txt
LayoutTests/fast/css-grid-layout/grid-update-sizes-after-distributing-all.html
LayoutTests/fast/css-grid-layout/grid-was-populated-assert.html
LayoutTests/fast/css-grid-layout/grid-with-relative-font-length-crash.html
LayoutTests/fast/css-grid-layout/implicit-columns-auto-resolution.html
LayoutTests/fast/css-grid-layout/implicit-position-dynamic-change-expected.txt
LayoutTests/fast/css-grid-layout/implicit-position-dynamic-change.html
LayoutTests/fast/css-grid-layout/implicit-rows-auto-resolution.html
LayoutTests/fast/css-grid-layout/implicit-tracks-before-explicit.html
LayoutTests/fast/css-grid-layout/justify-self-cell.html
LayoutTests/fast/css-grid-layout/mark-as-infinitely-growable-expected.txt
LayoutTests/fast/css-grid-layout/mark-as-infinitely-growable.html
LayoutTests/fast/css-grid-layout/maximize-tracks-definite-indefinite-height.html
LayoutTests/fast/css-grid-layout/min-content-row-must-shrink-when-column-grows.html
LayoutTests/fast/css-grid-layout/min-height-border-box.html
LayoutTests/fast/css-grid-layout/min-width-height-auto-and-margins.html
LayoutTests/fast/css-grid-layout/min-width-height-auto-overflow.html
LayoutTests/fast/css-grid-layout/min-width-height-auto.html
LayoutTests/fast/css-grid-layout/min-width-margin-box.html
LayoutTests/fast/css-grid-layout/minmax-fixed-logical-height-only.html
LayoutTests/fast/css-grid-layout/minmax-fixed-logical-width-only.html
LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-columns.html
LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-rows.html
LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-columns.html
LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-rows.html
LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-columns.html
LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-rows.html
LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expected.txt
LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html
LayoutTests/fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks-expected.txt
LayoutTests/fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks.html
LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-dynamic-get-set.html
LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-get-set-expected.txt
LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-get-set.html
LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-resolution.html
LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt
LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt
LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html
LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set.html
LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set-expected.txt
LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set.html
LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set-expected.txt
LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set.html
LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-in-percent-grid.html
LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update.html
LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track.html
LayoutTests/fast/css-grid-layout/percent-intrinsic-track-breadth.html
LayoutTests/fast/css-grid-layout/percent-of-indefinite-track-size-in-auto.html
LayoutTests/fast/css-grid-layout/percent-of-indefinite-track-size-in-minmax-crash.html
LayoutTests/fast/css-grid-layout/percent-of-indefinite-track-size.html
LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update.html
LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item.html
LayoutTests/fast/css-grid-layout/percent-resolution-grid-item.html
LayoutTests/fast/css-grid-layout/percent-track-breadths-regarding-container-size.html
LayoutTests/fast/css-grid-layout/place-cell-by-index.html
LayoutTests/fast/css-grid-layout/positioned-grid-items-should-not-create-implicit-tracks.html
LayoutTests/fast/css-grid-layout/positioned-grid-items-should-not-take-up-space.html
LayoutTests/fast/css-grid-layout/relayout-align-items-changed.html
LayoutTests/fast/css-grid-layout/relayout-align-self-changed.html
LayoutTests/fast/css-grid-layout/relayout-indefinite-heights.html
LayoutTests/fast/css-grid-layout/relayout-justify-items-changed.html
LayoutTests/fast/css-grid-layout/relayout-justify-self-changed.html
LayoutTests/fast/css-grid-layout/resources/display-grid-set-get.js
LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js
LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js
LayoutTests/fast/css-grid-layout/resources/grid-definitions-parsing-utils.js
LayoutTests/fast/css-grid-layout/resources/grid-item-column-row-parsing-utils.js
LayoutTests/fast/css-grid-layout/resources/grid-shorthand-parsing-utils.js
LayoutTests/fast/css-grid-layout/resources/grid-template-shorthand-parsing-utils.js
LayoutTests/fast/css-grid-layout/resources/grid.css
LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js
LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js
LayoutTests/fast/css-grid-layout/should-not-collapse-anonymous-blocks.html
LayoutTests/fast/css-grid-layout/swap-lines-if-start-is-further-endward-than-end-line-expected.html
LayoutTests/fast/css-grid-layout/swap-lines-if-start-is-further-endward-than-end-line.html
LayoutTests/fast/css-grid-layout/tracks-number-greatly-exceeding-available-size-crash.html
LayoutTests/fast/css/auto-min-size.html
LayoutTests/fast/css/first-letter-ignores-display-property.html
LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt
LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
LayoutTests/fast/css/getComputedStyle/resources/property-names.js
LayoutTests/fast/css/parse-justify-items.html
LayoutTests/fast/events/key-events-in-editable-gridbox.html
LayoutTests/fast/repaint/align-items-overflow-change.html
LayoutTests/fast/repaint/align-self-change.html
LayoutTests/fast/repaint/align-self-overflow-change.html
LayoutTests/fast/repaint/justify-items-change.html
LayoutTests/fast/repaint/justify-items-legacy-change.html
LayoutTests/fast/repaint/justify-items-overflow-change.html
LayoutTests/fast/repaint/justify-self-change.html
LayoutTests/fast/repaint/justify-self-overflow-change.html
LayoutTests/fast/text-autosizing/cluster-inline-grid-flex-box-expected.html
LayoutTests/fast/text-autosizing/cluster-inline-grid-flex-box.html
LayoutTests/ietestcenter/css3/grid/display-grid-001-expected.htm
LayoutTests/ietestcenter/css3/grid/display-grid-001.htm
LayoutTests/ietestcenter/css3/grid/display-grid-002-expected.htm
LayoutTests/ietestcenter/css3/grid/display-grid-002.htm
LayoutTests/ietestcenter/css3/grid/grid-column-001-expected.htm
LayoutTests/ietestcenter/css3/grid/grid-column-001.htm
LayoutTests/ietestcenter/css3/grid/grid-column-002-expected.htm
LayoutTests/ietestcenter/css3/grid/grid-column-002.htm
LayoutTests/ietestcenter/css3/grid/grid-column-003-expected.htm
LayoutTests/ietestcenter/css3/grid/grid-column-003.htm
LayoutTests/ietestcenter/css3/grid/grid-columns-001-expected.htm
LayoutTests/ietestcenter/css3/grid/grid-columns-001.htm
LayoutTests/ietestcenter/css3/grid/grid-items-001-expected.htm
LayoutTests/ietestcenter/css3/grid/grid-items-001.htm
LayoutTests/ietestcenter/css3/grid/grid-items-002-expected.htm
LayoutTests/ietestcenter/css3/grid/grid-items-002.htm
LayoutTests/ietestcenter/css3/grid/grid-items-003-expected.htm
LayoutTests/ietestcenter/css3/grid/grid-items-003.htm
LayoutTests/ietestcenter/css3/grid/grid-items-004-expected.htm
LayoutTests/ietestcenter/css3/grid/grid-items-004.htm
LayoutTests/ietestcenter/css3/grid/grid-items-005-expected.htm
LayoutTests/ietestcenter/css3/grid/grid-items-005.htm
LayoutTests/svg/css/getComputedStyle-basic-expected.txt
ManualTests/css-grid-layout-item-with-huge-span-crash.html
PerformanceTests/ChangeLog
PerformanceTests/Layout/auto-grid-lots-of-data.html
PerformanceTests/Layout/fixed-grid-lots-of-data.html
PerformanceTests/Layout/fixed-grid-lots-of-stretched-data.html
Source/WebCore/ChangeLog
Source/WebCore/css/CSSComputedStyleDeclaration.cpp
Source/WebCore/css/CSSParser.cpp
Source/WebCore/css/CSSPrimitiveValueMappings.h
Source/WebCore/css/CSSPropertyNames.in
Source/WebCore/css/CSSValueKeywords.in
Source/WebCore/css/StyleBuilderCustom.h
Source/WebCore/css/StyleProperties.cpp
Source/WebInspectorUI/ChangeLog
Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js
Tools/ChangeLog
Tools/TestWebKitAPI/Tests/WebCore/CSSParser.cpp

index adbf729..0047561 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2016-05-06  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [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:
+
 2016-05-02  Per Arne Vollan  <peavo@outlook.com>
 
         [Win] Enable IndexedDB.
index 36cc6b3..40d0f7a 100644 (file)
@@ -1,3 +1,406 @@
+2016-05-06  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [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.
+
+        * 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:
+
 2016-05-06  Nan Wang  <n_wang@apple.com>
 
         AX: <attachment> element should have a replacement character
index 7ea1643..408b895 100644 (file)
@@ -300,7 +300,7 @@ element.style.display = "-webkit-flex";
 element.style.alignContent = "normal";
 checkValues(element, "alignContent", "align-content",  "normal", "normal");
 
-element.style.display = "-webkit-grid";
+element.style.display = "grid";
 element.style.alignContent = "normal";
 checkValues(element, "alignContent", "align-content",  "normal", "normal");
 
@@ -342,7 +342,7 @@ checkInitialValues(element, "alignContent", "align-content", "stretch center", "
 
 debug("");
 debug("Test the value 'initial' for grid containers");
-element.style.display = "-webkit-grid";
+element.style.display = "grid";
 checkInitialValues(element, "alignContent", "align-content", "space-between left", "normal");
 
 debug("");
index ea8c7b1..efce730 100644 (file)
@@ -207,7 +207,7 @@ element.style.display = "-webkit-flex";
 element.style.webkitAlignItems = "auto";
 checkValues(element, "webkitAlignItems", "-webkit-align-items",  "auto", "stretch");
 
-element.style.display = "-webkit-grid";
+element.style.display = "grid";
 element.style.webkitAlignItems = "auto";
 checkValues(element, "webkitAlignItems", "-webkit-align-items",  "auto", "stretch");
 
@@ -251,7 +251,7 @@ checkInitialValues(element, "webkitAlignItems", "-webkit-align-items", "center",
 
 debug("");
 debug("Test the value 'initial' for grid containers");
-element.style.display = "-webkit-grid";
+element.style.display = "grid";
 checkInitialValues(element, "webkitAlignItems", "-webkit-align-items", "left safe", "stretch");
 
 debug("");
index b06454d..051603f 100644 (file)
@@ -208,7 +208,7 @@ container.style.display = "-webkit-flex";
 element.style.webkitAlignSelf = "auto";
 checkValues(element, "webkitAlignSelf", "-webkit-align-self",  "auto", "stretch");
 
-container.style.display = "-webkit-grid";
+container.style.display = "grid";
 element.style.webkitAlignSelf = "auto";
 checkValues(element, "webkitAlignSelf", "-webkit-align-self",  "auto", "stretch");
 
@@ -254,7 +254,7 @@ checkInitialValues(element, "webkitAlignSelf", "-webkit-align-self", "center", "
 
 debug("");
 debug("Test the value 'initial' for grid containers");
-container.style.display = "-webkit-grid";
+container.style.display = "grid";
 checkInitialValues(element, "webkitAlignSelf", "-webkit-align-self", "left safe", "stretch");
 
 debug("");
@@ -270,7 +270,7 @@ checkInitialValues(element, "webkitAlignSelf", "-webkit-align-self", "left", "au
 
 debug("");
 debug("Test the value 'initial' for positioned elements in grid containers");
-container.style.display = "-webkit-grid";
+container.style.display = "grid";
 element.style.position = "absolute";
 checkInitialValues(element, "webkitAlignSelf", "-webkit-align-self", "right", "auto");
 
index 0900484..a3f66ee 100644 (file)
@@ -296,7 +296,7 @@ element.style.display = "-webkit-flex";
 element.style.justifyContent = "normal";
 checkValues(element, "justifyContent", "justify-content",  "normal", "normal");
 
-element.style.display = "-webkit-grid";
+element.style.display = "grid";
 element.style.justifyContent = "normal";
 checkValues(element, "justifyContent", "justify-content",  "normal", "normal");
 
@@ -338,7 +338,7 @@ checkInitialValues(element, "justifyContent", "justify-content", "stretch center
 
 debug("");
 debug("Test the value 'initial' for grid containers");
-element.style.display = "-webkit-grid";
+element.style.display = "grid";
 checkInitialValues(element, "justifyContent", "justify-content", "space-between left", "normal");
 
 debug("");
index e74c4e9..1fbd9b8 100644 (file)
@@ -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;
index 918fd9c..e7ed349 100644 (file)
@@ -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;
 }
 
 .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;
 }
 
index b286f77..1a128d6 100644 (file)
@@ -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;
index c591744..d73553b 100644 (file)
@@ -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>
index c6aee04..0b5ca90 100644 (file)
@@ -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>
index dcf4a67..d3874d0 100644 (file)
@@ -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 {
index fc8898a..907565a 100644 (file)
@@ -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 {
index 34d27c7..1245c2b 100644 (file)
@@ -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 {
index e6bf3f1..9026f55 100644 (file)
@@ -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;
 }
index 2b25116..0bf9cd7 100644 (file)
     }
 
     .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>
index 3fe18e3..faaa00f 100644 (file)
@@ -4,14 +4,14 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 
 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
index 11e7dfe..e1e6b81 100644 (file)
@@ -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";
 }
 
index 328eb16..aea55e2 100644 (file)
@@ -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
index d4ec1b2..f04b5d6 100644 (file)
@@ -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>
 
 <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");
index 18ee9a0..3510dc9 100644 (file)
@@ -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; }
index 200ef10..a6d455a 100644 (file)
@@ -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>
index f16ebd6..37ea06a 100644 (file)
@@ -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>
index fc432e8..4ee0513 100644 (file)
@@ -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;
 }
index 54b5069..d586333 100644 (file)
@@ -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>
index e1d2559..b2a8a47 100644 (file)
@@ -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>
index b0e5edf..4133d46 100644 (file)
@@ -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>
index 3ae81b1..ec2db05 100644 (file)
@@ -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>
index e913a3b..d8cf2ed 100644 (file)
@@ -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>
index 9051f67..82cb209 100644 (file)
@@ -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;
 }
 
index 073439f..742639a 100644 (file)
@@ -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>
index 4298d6e..cbd8610 100644 (file)
@@ -9,15 +9,15 @@ body {
 }
 
 .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 {
index a19cc71..e8422e4 100644 (file)
@@ -9,15 +9,15 @@ body {
 }
 
 .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 {
index 9b31850..d51f29c 100644 (file)
@@ -9,15 +9,15 @@ body {
 }
 
 .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 {
index f5e2b64..c7c252e 100644 (file)
@@ -9,7 +9,7 @@ body {
 }
 
 .grid {
-    -webkit-grid: 100px 100px / 50px 50px;
+    grid: 100px 100px / 50px 50px;
     position: relative;
     width: 300px;
     height: 200px;
index cf95fcc..8b58a46 100644 (file)
@@ -9,7 +9,7 @@ body {
 }
 
 .grid {
-    -webkit-grid: 100px 100px / 50px 50px;
+    grid: 100px 100px / 50px 50px;
     position: relative;
     width: 300px;
     height: 200px;
index 804aa68..f697eae 100644 (file)
@@ -10,7 +10,7 @@ body {
 }
 
 .grid {
-    -webkit-grid: 100px 100px / 50px 50px;
+    grid: 100px 100px / 50px 50px;
     position: relative;
     width: 200px;
     height: 300px;
index a4639e0..24b301f 100644 (file)
@@ -11,8 +11,8 @@ body {
 }
 
 .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;
index c10b442..c1d26e0 100644 (file)
@@ -11,8 +11,8 @@ body {
 }
 
 .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;
index 7d3d4c5..8a2b37f 100644 (file)
@@ -11,8 +11,8 @@ body {
 }
 
 .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;
index 99693ac..b09531e 100644 (file)
@@ -10,8 +10,8 @@ body {
     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 @@ body {
 }
 .thirdRowFirstColumn {
     background-color: green;
-    -webkit-grid-column: 1;
-    -webkit-grid-row: 3;
+    grid-column: 1;
+    grid-row: 3;
 }
 </style>
 </head>
index 6401321..3a1d661 100644 (file)
@@ -11,8 +11,8 @@ body {
 }
 
 .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;
 }
 
index 5fd750b..274de17 100644 (file)
@@ -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;
index 7455136..b628063 100644 (file)
@@ -11,8 +11,8 @@ body {
 }
 
 .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;
 }
 
index e48f636..3581559 100644 (file)
@@ -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>
index 2736cb3..5fd67fd 100644 (file)
@@ -3,65 +3,65 @@ Test that setting and getting grid-auto-columns and grid-auto-rows works as expe
 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
index 73ba0a9..559b115 100644 (file)
@@ -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("");
 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 @@ function testInitial()
 {
     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.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 = "150%";
+    element.style.gridAutoRows = "1fr";
+    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-auto-columns')", "'150%'");
+    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-auto-rows')", "'1fr'");
+
+    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);
 }
index a5c6122..1167940 100644 (file)
@@ -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>
index 055e19e..5d84f87 100644 (file)
@@ -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);
index 49c0cbd..17bdd60 100644 (file)
@@ -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 -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 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 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'
-
-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 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 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'
+PASS element.style.gridAutoFlow is ''
+PASS window.getComputedStyle(element, '').getPropertyValue('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 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 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
index 9355d0c..cb02484 100644 (file)
@@ -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");
     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>
index 9f76c4f..4aa31dd 100644 (file)
@@ -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 {
index dbba0c8..dea7643 100644 (file)
@@ -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 {
index b453eb4..8aab95c 100644 (file)
@@ -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);
index 5bab828..f115277 100644 (file)
@@ -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
index 29f2627..e4f2daa 100644 (file)
 .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>
 <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.");
index eb9d6f2..b4cd04b 100644 (file)
@@ -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
index 9857458..6f8d94b 100644 (file)
 .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>
 <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("");
index 30d8687..8413244 100644 (file)
@@ -3,185 +3,185 @@ Test that setting and getting grid-template-columns and grid-template-rows works
 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
index 4385132..07a029e 100644 (file)
@@ -4,124 +4,124 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 
 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
index 7803507..2718dea 100644 (file)
     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>
index 1f67187..b101eeb 100644 (file)
     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>
index a2da8d0..72fd4f9 100644 (file)
@@ -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);
index 4e06f4e..d1786d5 100644 (file)
 
     .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 {
index 8329837..f87f8da 100644 (file)
@@ -10,33 +10,33 @@ body {
 }
 
 .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);
 }
 
 
index 8580a58..a04bb5b 100644 (file)
@@ -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>
index 1064f60..cd4b791 100644 (file)
@@ -10,8 +10,8 @@ body {
 }
 
 .grid {
-    -webkit-grid-template-columns: 50px 50px;
-    -webkit-grid-template-rows: 100px 100px;
+    grid-template-columns: 50px 50px;
+    grid-template-rows: 100px 100px;
 }
 
 .overflowWidth {
index 849d7db..f488309 100644 (file)
@@ -33,15 +33,15 @@ body {
 }
 
 /* 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>
index aacf194..d42cede 100644 (file)
@@ -16,12 +16,12 @@ body {
     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>
index e03333e..ae1564a 100644 (file)
@@ -10,33 +10,33 @@ body {
 }
 
 .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>
index 14b4ebb..e160c0c 100644 (file)
@@ -10,33 +10,33 @@ body {
 }
 
 .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>
index c559c69..5c66455 100644 (file)
@@ -10,33 +10,33 @@ body {
 }
 
 .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>
index 5127415..bc4aac3 100644 (file)
@@ -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
index 62b62ea..1c2a165 100644 (file)
@@ -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>
 
 <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");
index be51d4a..8ce12f0 100644 (file)
@@ -4,8 +4,8 @@ if (window.internals)
     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>
index 65950dc..2804105 100644 (file)
@@ -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);
index 14c5697..4792a91 100644 (file)
@@ -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
index f7defed..0d22c84 100644 (file)
@@ -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);
     }
 
index 6c49c54..29202e9 100644 (file)
@@ -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>
index 2ab3452..52824c8 100644 (file)
@@ -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>
index a8c799c..00e57f1 100644 (file)
@@ -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 @@ body {
 }
 
 .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;
index 495829f..c3345ce 100644 (file)
@@ -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 @@ body {
 }
 
 .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;
index 79d4680..89008e2 100644 (file)
@@ -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;
 }
index 33afcc3..c00c339 100644 (file)
@@ -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 {
index 3f3288a..88ef528 100644 (file)
@@ -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 {
index 50e7a07..a243aa9 100644 (file)
@@ -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>
index a4da3e6..84da5aa 100644 (file)
@@ -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;
 }
index 7e3b7ec..deb7d26 100644 (file)
@@ -4,40 +4,40 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 
 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
index 9fbe010..fade1f7 100644 (file)
     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>
     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(");
index f2ed52d..1b0f564 100644 (file)
@@ -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 {
index 660423a..b0bcfb7 100644 (file)
@@ -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
index 4007322..3ca9701 100644 (file)
@@ -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; }
index 0b70a47..313d613 100644 (file)
@@ -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 @@ body { margin: 0px; }
 }
 
 .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; }
index baf6421..5beb856 100644 (file)
@@ -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.grid > div { font: 10px/1 Ahem; }
 
 <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">
-