| 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 545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 556 toCSSContentDistributionValue(value); | 556 toCSSContentDistributionValue(value); |
| 557 if (contentValue.distribution()->getValueID() != CSSValueInvalid) | 557 if (contentValue.distribution()->getValueID() != CSSValueInvalid) |
| 558 alignmentData.setDistribution( | 558 alignmentData.setDistribution( |
| 559 contentValue.distribution()->convertTo<ContentDistributionType>()); | 559 contentValue.distribution()->convertTo<ContentDistributionType>()); |
| 560 if (contentValue.position()->getValueID() != CSSValueInvalid) | 560 if (contentValue.position()->getValueID() != CSSValueInvalid) |
| 561 alignmentData.setPosition( | 561 alignmentData.setPosition( |
| 562 contentValue.position()->convertTo<ContentPosition>()); | 562 contentValue.position()->convertTo<ContentPosition>()); |
| 563 if (contentValue.overflow()->getValueID() != CSSValueInvalid) | 563 if (contentValue.overflow()->getValueID() != CSSValueInvalid) |
| 564 alignmentData.setOverflow( | 564 alignmentData.setOverflow( |
| 565 contentValue.overflow()->convertTo<OverflowAlignment>()); | 565 contentValue.overflow()->convertTo<OverflowAlignment>()); |
| 566 |
| 566 return alignmentData; | 567 return alignmentData; |
| 567 } | 568 } |
| 568 | 569 |
| 569 GridAutoFlow StyleBuilderConverter::convertGridAutoFlow(StyleResolverState&, | 570 GridAutoFlow StyleBuilderConverter::convertGridAutoFlow(StyleResolverState&, |
| 570 const CSSValue& value) { | 571 const CSSValue& value) { |
| 571 const CSSValueList& list = toCSSValueList(value); | 572 const CSSValueList& list = toCSSValueList(value); |
| 572 | 573 |
| 573 ASSERT(list.length() >= 1); | 574 ASSERT(list.length() >= 1); |
| 574 const CSSIdentifierValue& first = toCSSIdentifierValue(list.item(0)); | 575 const CSSIdentifierValue& first = toCSSIdentifierValue(list.item(0)); |
| 575 const CSSIdentifierValue* second = | 576 const CSSIdentifierValue* second = |
| (...skipping 825 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1401 } | 1402 } |
| 1402 | 1403 |
| 1403 const CSSValue& StyleBuilderConverter::convertRegisteredPropertyValue( | 1404 const CSSValue& StyleBuilderConverter::convertRegisteredPropertyValue( |
| 1404 const StyleResolverState& state, | 1405 const StyleResolverState& state, |
| 1405 const CSSValue& value) { | 1406 const CSSValue& value) { |
| 1406 return computeRegisteredPropertyValue(state.cssToLengthConversionData(), | 1407 return computeRegisteredPropertyValue(state.cssToLengthConversionData(), |
| 1407 value); | 1408 value); |
| 1408 } | 1409 } |
| 1409 | 1410 |
| 1410 } // namespace blink | 1411 } // namespace blink |
| OLD | NEW |