OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "config.h" | 5 #include "config.h" |
6 #include "core/css/parser/CSSPropertyParser.h" | 6 #include "core/css/parser/CSSPropertyParser.h" |
7 | 7 |
8 #include "core/StylePropertyShorthand.h" | 8 #include "core/StylePropertyShorthand.h" |
9 #include "core/css/CSSCalculationValue.h" | 9 #include "core/css/CSSCalculationValue.h" |
10 #include "core/css/CSSCustomIdentValue.h" | 10 #include "core/css/CSSCustomIdentValue.h" |
(...skipping 784 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
795 } while (!range.atEnd()); | 795 } while (!range.atEnd()); |
796 | 796 |
797 if (!hasLengthOrPercentage) | 797 if (!hasLengthOrPercentage) |
798 return nullptr; | 798 return nullptr; |
799 | 799 |
800 return list.release(); | 800 return list.release(); |
801 } | 801 } |
802 | 802 |
803 static bool validWidthOrHeightKeyword(CSSValueID id, const CSSParserContext& con
text) | 803 static bool validWidthOrHeightKeyword(CSSValueID id, const CSSParserContext& con
text) |
804 { | 804 { |
805 if (id == CSSValueIntrinsic || id == CSSValueMinIntrinsic | 805 if (id == CSSValueWebkitMinContent || id == CSSValueWebkitMaxContent || id =
= CSSValueWebkitFillAvailable || id == CSSValueWebkitFitContent |
806 || id == CSSValueWebkitMinContent || id == CSSValueWebkitMaxContent || i
d == CSSValueWebkitFillAvailable || id == CSSValueWebkitFitContent | |
807 || id == CSSValueMinContent || id == CSSValueMaxContent || id == CSSValu
eFitContent) { | 806 || id == CSSValueMinContent || id == CSSValueMaxContent || id == CSSValu
eFitContent) { |
808 if (context.useCounter()) { | 807 if (context.useCounter()) { |
809 switch (id) { | 808 switch (id) { |
810 case CSSValueIntrinsic: | |
811 case CSSValueMinIntrinsic: | |
812 // These two will be counted in StyleAdjuster because they emit
a deprecation | |
813 // message, and we don't have access to a Document/LocalFrame he
re. | |
814 break; | |
815 case CSSValueWebkitMinContent: | 809 case CSSValueWebkitMinContent: |
816 context.useCounter()->count(UseCounter::CSSValuePrefixedMinConte
nt); | 810 context.useCounter()->count(UseCounter::CSSValuePrefixedMinConte
nt); |
817 break; | 811 break; |
818 case CSSValueWebkitMaxContent: | 812 case CSSValueWebkitMaxContent: |
819 context.useCounter()->count(UseCounter::CSSValuePrefixedMaxConte
nt); | 813 context.useCounter()->count(UseCounter::CSSValuePrefixedMaxConte
nt); |
820 break; | 814 break; |
821 case CSSValueWebkitFillAvailable: | 815 case CSSValueWebkitFillAvailable: |
822 context.useCounter()->count(UseCounter::CSSValuePrefixedFillAvai
lable); | 816 context.useCounter()->count(UseCounter::CSSValuePrefixedFillAvai
lable); |
823 break; | 817 break; |
824 case CSSValueWebkitFitContent: | 818 case CSSValueWebkitFitContent: |
(...skipping 905 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1730 m_currentShorthand = oldShorthand; | 1724 m_currentShorthand = oldShorthand; |
1731 return consumeColumns(important); | 1725 return consumeColumns(important); |
1732 } | 1726 } |
1733 default: | 1727 default: |
1734 m_currentShorthand = oldShorthand; | 1728 m_currentShorthand = oldShorthand; |
1735 return false; | 1729 return false; |
1736 } | 1730 } |
1737 } | 1731 } |
1738 | 1732 |
1739 } // namespace blink | 1733 } // namespace blink |
OLD | NEW |