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

Side by Side Diff: Source/core/css/CSSPrimitiveValueMappings.h

Issue 16690004: [CSS Regions] Rename region-overflow to region-fragment (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch Created 7 years, 6 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 unified diff | Download patch
« no previous file with comments | « Source/core/css/CSSParser.cpp ('k') | Source/core/css/CSSProperties.in » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007 Alexey Proskuryakov <ap@nypop.com>. 2 * Copyright (C) 2007 Alexey Proskuryakov <ap@nypop.com>.
3 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
4 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 4 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
5 * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com> 5 * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com>
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
(...skipping 1940 matching lines...) Expand 10 before | Expand all | Expand 10 after
1951 case CSSValueAlternate: 1951 case CSSValueAlternate:
1952 return MALTERNATE; 1952 return MALTERNATE;
1953 default: 1953 default:
1954 break; 1954 break;
1955 } 1955 }
1956 1956
1957 ASSERT_NOT_REACHED(); 1957 ASSERT_NOT_REACHED();
1958 return MNONE; 1958 return MNONE;
1959 } 1959 }
1960 1960
1961 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(RegionOverflow e) 1961 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(RegionFragment e)
1962 : CSSValue(PrimitiveClass) 1962 : CSSValue(PrimitiveClass)
1963 { 1963 {
1964 m_primitiveUnitType = CSS_VALUE_ID; 1964 m_primitiveUnitType = CSS_VALUE_ID;
1965 switch (e) { 1965 switch (e) {
1966 case AutoRegionOverflow: 1966 case AutoRegionFragment:
1967 m_value.valueID = CSSValueAuto; 1967 m_value.valueID = CSSValueAuto;
1968 break; 1968 break;
1969 case BreakRegionOverflow: 1969 case BreakRegionFragment:
1970 m_value.valueID = CSSValueBreak; 1970 m_value.valueID = CSSValueBreak;
1971 break; 1971 break;
1972 } 1972 }
1973 } 1973 }
1974 1974
1975 template<> inline CSSPrimitiveValue::operator RegionOverflow() const 1975 template<> inline CSSPrimitiveValue::operator RegionFragment() const
1976 { 1976 {
1977 switch (m_value.valueID) { 1977 switch (m_value.valueID) {
1978 case CSSValueAuto: 1978 case CSSValueAuto:
1979 return AutoRegionOverflow; 1979 return AutoRegionFragment;
1980 case CSSValueBreak: 1980 case CSSValueBreak:
1981 return BreakRegionOverflow; 1981 return BreakRegionFragment;
1982 default: 1982 default:
1983 break; 1983 break;
1984 } 1984 }
1985 1985
1986 ASSERT_NOT_REACHED(); 1986 ASSERT_NOT_REACHED();
1987 return AutoRegionOverflow; 1987 return AutoRegionFragment;
1988 } 1988 }
1989 1989
1990 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EMarqueeDirection e) 1990 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EMarqueeDirection e)
1991 : CSSValue(PrimitiveClass) 1991 : CSSValue(PrimitiveClass)
1992 { 1992 {
1993 m_primitiveUnitType = CSS_VALUE_ID; 1993 m_primitiveUnitType = CSS_VALUE_ID;
1994 switch (e) { 1994 switch (e) {
1995 case MFORWARD: 1995 case MFORWARD:
1996 m_value.valueID = CSSValueForwards; 1996 m_value.valueID = CSSValueForwards;
1997 break; 1997 break;
(...skipping 2679 matching lines...) Expand 10 before | Expand all | Expand 10 after
4677 break; 4677 break;
4678 } 4678 }
4679 4679
4680 ASSERT_NOT_REACHED(); 4680 ASSERT_NOT_REACHED();
4681 return TouchActionNone; 4681 return TouchActionNone;
4682 } 4682 }
4683 4683
4684 } 4684 }
4685 4685
4686 #endif 4686 #endif
OLDNEW
« no previous file with comments | « Source/core/css/CSSParser.cpp ('k') | Source/core/css/CSSProperties.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698