Source/core/css/CSSComputedStyleDeclaration.cpp - Issue 16959008: [CSS Grid Layout] Rename grid-{rows|columns} to grid-definition-{rows|columns}

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/css/CSSComputedStyleDeclaration.cpp

Issue 16959008: [CSS Grid Layout] Rename grid-{rows|columns} to grid-definition-{rows|columns} (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Added a missing fix for a test in webexposed/ Created 7 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« LayoutTests/fast/css-grid-layout/grid-element-change-rows-repaint-expected.txt ('K') | « LayoutTests/webexposed/css-properties-as-js-properties-expected.txt ('k') | Source/core/css/CSSParser.cpp » ('j') | Source/core/css/CSSProperty.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/css/CSSComputedStyleDeclaration.cpp

diff --git a/Source/core/css/CSSComputedStyleDeclaration.cpp b/Source/core/css/CSSComputedStyleDeclaration.cpp

index 64defa56deadd233156d5206a76a7e3b2f516fb8..d0764f8bb437bc840ba833629eff95d330fed726 100644

--- a/Source/core/css/CSSComputedStyleDeclaration.cpp

+++ b/Source/core/css/CSSComputedStyleDeclaration.cpp

@@ -259,8 +259,8 @@ static const CSSPropertyID staticComputableProperties[] = {

CSSPropertyGridAutoColumns,

CSSPropertyGridAutoFlow,

CSSPropertyGridAutoRows,

- CSSPropertyGridColumns,

- CSSPropertyGridRows,

+ CSSPropertyGridDefinitionColumns,

+ CSSPropertyGridDefinitionRows,

CSSPropertyGridStart,

CSSPropertyGridEnd,

CSSPropertyGridBefore,

@@ -1919,10 +1919,10 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert

return cssValuePool().createValue(style->gridAutoFlow());

case CSSPropertyGridAutoRows:

return valueForGridTrackSize(style->gridAutoRows(), style.get(), m_node->document()->renderView());

- case CSSPropertyGridColumns:

- return valueForGridTrackList(style->gridColumns(), style->namedGridColumnLines(), style.get(), m_node->document()->renderView());

- case CSSPropertyGridRows:

- return valueForGridTrackList(style->gridRows(), style->namedGridRowLines(), style.get(), m_node->document()->renderView());

+ case CSSPropertyGridDefinitionColumns:

+ return valueForGridTrackList(style->gridDefinitionColumns(), style->namedGridColumnLines(), style.get(), m_node->document()->renderView());

+ case CSSPropertyGridDefinitionRows:

+ return valueForGridTrackList(style->gridDefinitionRows(), style->namedGridRowLines(), style.get(), m_node->document()->renderView());

case CSSPropertyGridStart:

return valueForGridPosition(style->gridStart());