Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(351)

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

Issue 17601010: [CSS Grid Layout] Rename grid placement properties (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: missing webposed/ changes 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
« no previous file with comments | « LayoutTests/webexposed/css-properties-as-js-properties-expected.txt ('k') | Source/core/css/CSSParser.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/CSSComputedStyleDeclaration.cpp
diff --git a/Source/core/css/CSSComputedStyleDeclaration.cpp b/Source/core/css/CSSComputedStyleDeclaration.cpp
index 2a0d470352dbadc93f1b68756438377ec7196351..f0f308782671a9e52ec4b5d5cdc7ed8f2d1eacba 100644
--- a/Source/core/css/CSSComputedStyleDeclaration.cpp
+++ b/Source/core/css/CSSComputedStyleDeclaration.cpp
@@ -259,12 +259,12 @@ static const CSSPropertyID staticComputableProperties[] = {
CSSPropertyGridAutoColumns,
CSSPropertyGridAutoFlow,
CSSPropertyGridAutoRows,
+ CSSPropertyGridColumnEnd,
+ CSSPropertyGridColumnStart,
CSSPropertyGridDefinitionColumns,
CSSPropertyGridDefinitionRows,
- CSSPropertyGridStart,
- CSSPropertyGridEnd,
- CSSPropertyGridBefore,
- CSSPropertyGridAfter,
+ CSSPropertyGridRowEnd,
+ CSSPropertyGridRowStart,
CSSPropertyWebkitHighlight,
CSSPropertyWebkitHyphenateCharacter,
CSSPropertyWebkitHyphenateLimitAfter,
@@ -1947,14 +1947,14 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert
case CSSPropertyGridDefinitionRows:
return valueForGridTrackList(style->gridDefinitionRows(), style->namedGridRowLines(), style.get(), m_node->document()->renderView());
- case CSSPropertyGridStart:
- return valueForGridPosition(style->gridStart());
- case CSSPropertyGridEnd:
- return valueForGridPosition(style->gridEnd());
- case CSSPropertyGridBefore:
- return valueForGridPosition(style->gridBefore());
- case CSSPropertyGridAfter:
- return valueForGridPosition(style->gridAfter());
+ case CSSPropertyGridColumnStart:
+ return valueForGridPosition(style->gridColumnStart());
+ case CSSPropertyGridColumnEnd:
+ return valueForGridPosition(style->gridColumnEnd());
+ case CSSPropertyGridRowStart:
+ return valueForGridPosition(style->gridRowStart());
+ case CSSPropertyGridRowEnd:
+ return valueForGridPosition(style->gridRowEnd());
case CSSPropertyGridColumn:
return getCSSPropertyValuesForGridShorthand(gridColumnShorthand());
case CSSPropertyGridRow:
« no previous file with comments | « LayoutTests/webexposed/css-properties-as-js-properties-expected.txt ('k') | Source/core/css/CSSParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698