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

Unified Diff: Source/core/css/resolver/StyleBuilderCustom.cpp

Issue 22929020: Dumping named grid line should use the author's order (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 4 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 | « Source/core/css/CSSComputedStyleDeclaration.cpp ('k') | Source/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/StyleBuilderCustom.cpp
diff --git a/Source/core/css/resolver/StyleBuilderCustom.cpp b/Source/core/css/resolver/StyleBuilderCustom.cpp
index 59372a39a4468f9d0bd9084d0db2b58691b21dbc..05be141688d92b7f6a61c57bb4e4a6b6b1f806a9 100644
--- a/Source/core/css/resolver/StyleBuilderCustom.cpp
+++ b/Source/core/css/resolver/StyleBuilderCustom.cpp
@@ -982,7 +982,7 @@ static bool createGridTrackSize(CSSValue* value, GridTrackSize& trackSize, const
return true;
}
-static bool createGridTrackList(CSSValue* value, Vector<GridTrackSize>& trackSizes, NamedGridLinesMap& namedGridLines, const StyleResolverState& state)
+static bool createGridTrackList(CSSValue* value, Vector<GridTrackSize>& trackSizes, NamedGridLinesMap& namedGridLines, OrderedNamedGridLines& orderedNamedGridLines, const StyleResolverState& state)
{
// Handle 'none'.
if (value->isPrimitiveValue()) {
@@ -999,8 +999,11 @@ static bool createGridTrackList(CSSValue* value, Vector<GridTrackSize>& trackSiz
if (currValue->isPrimitiveValue()) {
CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(currValue);
if (primitiveValue->isString()) {
- NamedGridLinesMap::AddResult result = namedGridLines.add(primitiveValue->getStringValue(), Vector<size_t>());
+ String namedGridLine = primitiveValue->getStringValue();
+ NamedGridLinesMap::AddResult result = namedGridLines.add(namedGridLine, Vector<size_t>());
result.iterator->value.append(currentNamedGridLine);
+ OrderedNamedGridLines::AddResult orderedInsertionResult = orderedNamedGridLines.add(currentNamedGridLine, Vector<String>());
+ orderedInsertionResult.iterator->value.append(namedGridLine);
continue;
}
}
@@ -1724,40 +1727,48 @@ void StyleBuilder::oldApplyProperty(CSSPropertyID id, StyleResolverState& state,
if (isInherit) {
state.style()->setGridDefinitionColumns(state.parentStyle()->gridDefinitionColumns());
state.style()->setNamedGridColumnLines(state.parentStyle()->namedGridColumnLines());
+ state.style()->setOrderedNamedGridColumnLines(state.parentStyle()->orderedNamedGridColumnLines());
return;
}
if (isInitial) {
state.style()->setGridDefinitionColumns(RenderStyle::initialGridDefinitionColumns());
state.style()->setNamedGridColumnLines(RenderStyle::initialNamedGridColumnLines());
+ state.style()->setOrderedNamedGridColumnLines(RenderStyle::initialOrderedNamedGridColumnLines());
return;
}
Vector<GridTrackSize> trackSizes;
NamedGridLinesMap namedGridLines;
- if (!createGridTrackList(value, trackSizes, namedGridLines, state))
+ OrderedNamedGridLines orderedNamedGridLines;
+ if (!createGridTrackList(value, trackSizes, namedGridLines, orderedNamedGridLines, state))
return;
state.style()->setGridDefinitionColumns(trackSizes);
state.style()->setNamedGridColumnLines(namedGridLines);
+ state.style()->setOrderedNamedGridColumnLines(orderedNamedGridLines);
return;
}
case CSSPropertyGridDefinitionRows: {
if (isInherit) {
state.style()->setGridDefinitionRows(state.parentStyle()->gridDefinitionRows());
state.style()->setNamedGridRowLines(state.parentStyle()->namedGridRowLines());
+ state.style()->setOrderedNamedGridRowLines(state.parentStyle()->orderedNamedGridRowLines());
return;
}
if (isInitial) {
state.style()->setGridDefinitionRows(RenderStyle::initialGridDefinitionRows());
state.style()->setNamedGridRowLines(RenderStyle::initialNamedGridRowLines());
+ state.style()->setOrderedNamedGridRowLines(RenderStyle::initialOrderedNamedGridRowLines());
return;
}
Vector<GridTrackSize> trackSizes;
NamedGridLinesMap namedGridLines;
- if (!createGridTrackList(value, trackSizes, namedGridLines, state))
+ OrderedNamedGridLines orderedNamedGridLines;
+ if (!createGridTrackList(value, trackSizes, namedGridLines, orderedNamedGridLines, state))
return;
state.style()->setGridDefinitionRows(trackSizes);
state.style()->setNamedGridRowLines(namedGridLines);
+ state.style()->setOrderedNamedGridRowLines(orderedNamedGridLines);
return;
}
« no previous file with comments | « Source/core/css/CSSComputedStyleDeclaration.cpp ('k') | Source/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698