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

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

Issue 680063005: [CSS Grid Layout] Redefining grids inside media queries does not work (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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/resolver/StyleBuilderConverter.h ('k') | Source/core/css/resolver/StyleBuilderCustom.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/StyleBuilderConverter.cpp
diff --git a/Source/core/css/resolver/StyleBuilderConverter.cpp b/Source/core/css/resolver/StyleBuilderConverter.cpp
index dadc1ec303a7ca5137b07683f4f382574e585638..38cba6312aa13096ccbbc19e421417264429ac8d 100644
--- a/Source/core/css/resolver/StyleBuilderConverter.cpp
+++ b/Source/core/css/resolver/StyleBuilderConverter.cpp
@@ -481,6 +481,26 @@ bool StyleBuilderConverter::convertGridTrackList(CSSValue* value, Vector<GridTra
return true;
}
+void StyleBuilderConverter::convertOrderedNamedGridLinesMapToNamedGridLinesMap(const OrderedNamedGridLines& orderedNamedGridLines, NamedGridLinesMap& namedGridLines)
+{
+ ASSERT(namedGridLines.size() == 0);
+
+ if (orderedNamedGridLines.size() == 0)
+ return;
+
+ for (auto& orderedNamedGridLine : orderedNamedGridLines) {
+ for (auto& lineName : orderedNamedGridLine.value) {
+ NamedGridLinesMap::AddResult startResult = namedGridLines.add(lineName, Vector<size_t>());
+ startResult.storedValue->value.append(orderedNamedGridLine.key);
+ }
+ }
+
+ for (auto& namedGridLine : namedGridLines) {
+ Vector<size_t> gridLineIndexes = namedGridLine.value;
+ std::sort(gridLineIndexes.begin(), gridLineIndexes.end());
Julien - ping for review 2014/11/10 16:03:33 We may know do 2 sorting as we generate the implic
+ }
+}
+
void StyleBuilderConverter::createImplicitNamedGridLinesFromGridArea(const NamedGridAreaMap& namedGridAreas, NamedGridLinesMap& namedGridLines, GridTrackSizingDirection direction)
{
for (const auto& namedGridAreaEntry : namedGridAreas) {
« no previous file with comments | « Source/core/css/resolver/StyleBuilderConverter.h ('k') | Source/core/css/resolver/StyleBuilderCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698