| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org> | 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org> |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
All rights reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
All rights reserved. |
| 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> |
| 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> | 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> |
| 6 * Copyright (C) 2011 Sencha, Inc. All rights reserved. | 6 * Copyright (C) 2011 Sencha, Inc. All rights reserved. |
| 7 * Copyright (C) 2015 Google Inc. All rights reserved. | 7 * Copyright (C) 2015 Google Inc. All rights reserved. |
| 8 * | 8 * |
| 9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
| 10 * modify it under the terms of the GNU Lesser General Public | 10 * modify it under the terms of the GNU Lesser General Public |
| (...skipping 701 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 712 const Length& trackBreadthLength = trackBreadth.length(); | 712 const Length& trackBreadthLength = trackBreadth.length(); |
| 713 if (trackBreadthLength.isAuto()) | 713 if (trackBreadthLength.isAuto()) |
| 714 return CSSPrimitiveValue::createIdentifier(CSSValueAuto); | 714 return CSSPrimitiveValue::createIdentifier(CSSValueAuto); |
| 715 return zoomAdjustedPixelValueForLength(trackBreadthLength, style); | 715 return zoomAdjustedPixelValueForLength(trackBreadthLength, style); |
| 716 } | 716 } |
| 717 | 717 |
| 718 static CSSValue* specifiedValueForGridTrackSize(const GridTrackSize& trackSize,
const ComputedStyle& style) | 718 static CSSValue* specifiedValueForGridTrackSize(const GridTrackSize& trackSize,
const ComputedStyle& style) |
| 719 { | 719 { |
| 720 switch (trackSize.type()) { | 720 switch (trackSize.type()) { |
| 721 case LengthTrackSizing: | 721 case LengthTrackSizing: |
| 722 return specifiedValueForGridTrackBreadth(trackSize.length(), style); | 722 return specifiedValueForGridTrackBreadth(trackSize.minTrackBreadth(), st
yle); |
| 723 case MinMaxTrackSizing: { | 723 case MinMaxTrackSizing: { |
| 724 auto* minMaxTrackBreadths = CSSFunctionValue::create(CSSValueMinmax); | 724 auto* minMaxTrackBreadths = CSSFunctionValue::create(CSSValueMinmax); |
| 725 minMaxTrackBreadths->append(*specifiedValueForGridTrackBreadth(trackSize
.minTrackBreadth(), style)); | 725 minMaxTrackBreadths->append(*specifiedValueForGridTrackBreadth(trackSize
.minTrackBreadth(), style)); |
| 726 minMaxTrackBreadths->append(*specifiedValueForGridTrackBreadth(trackSize
.maxTrackBreadth(), style)); | 726 minMaxTrackBreadths->append(*specifiedValueForGridTrackBreadth(trackSize
.maxTrackBreadth(), style)); |
| 727 return minMaxTrackBreadths; | 727 return minMaxTrackBreadths; |
| 728 } case FitContentTrackSizing: { | 728 } case FitContentTrackSizing: { |
| 729 auto* fitContentTrackBreadth = CSSFunctionValue::create(CSSValueFitConte
nt); | 729 auto* fitContentTrackBreadth = CSSFunctionValue::create(CSSValueFitConte
nt); |
| 730 fitContentTrackBreadth->append(*specifiedValueForGridTrackBreadth(trackS
ize.length(), style)); | 730 fitContentTrackBreadth->append(*specifiedValueForGridTrackBreadth(trackS
ize.fitContentTrackBreadth(), style)); |
| 731 return fitContentTrackBreadth; | 731 return fitContentTrackBreadth; |
| 732 } | 732 } |
| 733 } | 733 } |
| 734 ASSERT_NOT_REACHED(); | 734 ASSERT_NOT_REACHED(); |
| 735 return nullptr; | 735 return nullptr; |
| 736 } | 736 } |
| 737 | 737 |
| 738 class OrderedNamedLinesCollector { | 738 class OrderedNamedLinesCollector { |
| 739 STACK_ALLOCATED(); | 739 STACK_ALLOCATED(); |
| 740 WTF_MAKE_NONCOPYABLE(OrderedNamedLinesCollector); | 740 WTF_MAKE_NONCOPYABLE(OrderedNamedLinesCollector); |
| (...skipping 2266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3007 case CSSPropertyAll: | 3007 case CSSPropertyAll: |
| 3008 return nullptr; | 3008 return nullptr; |
| 3009 default: | 3009 default: |
| 3010 break; | 3010 break; |
| 3011 } | 3011 } |
| 3012 ASSERT_NOT_REACHED(); | 3012 ASSERT_NOT_REACHED(); |
| 3013 return nullptr; | 3013 return nullptr; |
| 3014 } | 3014 } |
| 3015 | 3015 |
| 3016 } // namespace blink | 3016 } // namespace blink |
| OLD | NEW |