| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * * Redistributions of source code must retain the above copyright | 4 * * Redistributions of source code must retain the above copyright |
| 5 * notice, this list of conditions and the following disclaimer. | 5 * notice, this list of conditions and the following disclaimer. |
| 6 * * Redistributions in binary form must reproduce the above | 6 * * Redistributions in binary form must reproduce the above |
| 7 * copyright notice, this list of conditions and the following disclaimer | 7 * copyright notice, this list of conditions and the following disclaimer |
| 8 * in the documentation and/or other materials provided with the | 8 * in the documentation and/or other materials provided with the |
| 9 * distribution. | 9 * distribution. |
| 10 * * Neither the name of Google Inc. nor the names of its | 10 * * Neither the name of Google Inc. nor the names of its |
| (...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 499 std::sort(gridLineIndexes.begin(), gridLineIndexes.end()); | 499 std::sort(gridLineIndexes.begin(), gridLineIndexes.end()); |
| 500 } | 500 } |
| 501 } | 501 } |
| 502 | 502 |
| 503 void StyleBuilderConverter::createImplicitNamedGridLinesFromGridArea(const Named
GridAreaMap& namedGridAreas, NamedGridLinesMap& namedGridLines, GridTrackSizingD
irection direction) | 503 void StyleBuilderConverter::createImplicitNamedGridLinesFromGridArea(const Named
GridAreaMap& namedGridAreas, NamedGridLinesMap& namedGridLines, GridTrackSizingD
irection direction) |
| 504 { | 504 { |
| 505 for (const auto& namedGridAreaEntry : namedGridAreas) { | 505 for (const auto& namedGridAreaEntry : namedGridAreas) { |
| 506 GridSpan areaSpan = direction == ForRows ? namedGridAreaEntry.value.rows
: namedGridAreaEntry.value.columns; | 506 GridSpan areaSpan = direction == ForRows ? namedGridAreaEntry.value.rows
: namedGridAreaEntry.value.columns; |
| 507 { | 507 { |
| 508 NamedGridLinesMap::AddResult startResult = namedGridLines.add(namedG
ridAreaEntry.key + "-start", Vector<size_t>()); | 508 NamedGridLinesMap::AddResult startResult = namedGridLines.add(namedG
ridAreaEntry.key + "-start", Vector<size_t>()); |
| 509 startResult.storedValue->value.append(areaSpan.resolvedInitialPositi
on()); | 509 startResult.storedValue->value.append(areaSpan.startLine()); |
| 510 std::sort(startResult.storedValue->value.begin(), startResult.stored
Value->value.end()); | 510 std::sort(startResult.storedValue->value.begin(), startResult.stored
Value->value.end()); |
| 511 } | 511 } |
| 512 { | 512 { |
| 513 NamedGridLinesMap::AddResult endResult = namedGridLines.add(namedGri
dAreaEntry.key + "-end", Vector<size_t>()); | 513 NamedGridLinesMap::AddResult endResult = namedGridLines.add(namedGri
dAreaEntry.key + "-end", Vector<size_t>()); |
| 514 endResult.storedValue->value.append(areaSpan.resolvedFinalPosition()
); | 514 endResult.storedValue->value.append(areaSpan.endLine()); |
| 515 std::sort(endResult.storedValue->value.begin(), endResult.storedValu
e->value.end()); | 515 std::sort(endResult.storedValue->value.begin(), endResult.storedValu
e->value.end()); |
| 516 } | 516 } |
| 517 } | 517 } |
| 518 } | 518 } |
| 519 | 519 |
| 520 Length StyleBuilderConverter::convertLength(const StyleResolverState& state, con
st CSSValue& value) | 520 Length StyleBuilderConverter::convertLength(const StyleResolverState& state, con
st CSSValue& value) |
| 521 { | 521 { |
| 522 return toCSSPrimitiveValue(value).convertToLength(state.cssToLengthConversio
nData()); | 522 return toCSSPrimitiveValue(value).convertToLength(state.cssToLengthConversio
nData()); |
| 523 } | 523 } |
| 524 | 524 |
| (...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 942 | 942 |
| 943 PassRefPtr<StylePath> StyleBuilderConverter::convertPathOrNone(StyleResolverStat
e& state, const CSSValue& value) | 943 PassRefPtr<StylePath> StyleBuilderConverter::convertPathOrNone(StyleResolverStat
e& state, const CSSValue& value) |
| 944 { | 944 { |
| 945 if (value.isPathValue()) | 945 if (value.isPathValue()) |
| 946 return toCSSPathValue(value).stylePath(); | 946 return toCSSPathValue(value).stylePath(); |
| 947 ASSERT(value.isPrimitiveValue() && toCSSPrimitiveValue(value).getValueID() =
= CSSValueNone); | 947 ASSERT(value.isPrimitiveValue() && toCSSPrimitiveValue(value).getValueID() =
= CSSValueNone); |
| 948 return nullptr; | 948 return nullptr; |
| 949 } | 949 } |
| 950 | 950 |
| 951 } // namespace blink | 951 } // namespace blink |
| OLD | NEW |