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

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

Issue 2660423004: Rename EOverflow values with k prefix. (Closed)
Patch Set: Rebase Created 3 years, 10 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 | « no previous file | third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp » ('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. 4 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved.
5 * (http://www.torchmobile.com/) 5 * (http://www.torchmobile.com/)
6 * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com> 6 * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com>
7 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 7 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
(...skipping 1883 matching lines...) Expand 10 before | Expand all | Expand 10 after
1894 } 1894 }
1895 1895
1896 ASSERT_NOT_REACHED(); 1896 ASSERT_NOT_REACHED();
1897 return MarginCollapseCollapse; 1897 return MarginCollapseCollapse;
1898 } 1898 }
1899 1899
1900 template <> 1900 template <>
1901 inline CSSIdentifierValue::CSSIdentifierValue(EOverflow e) 1901 inline CSSIdentifierValue::CSSIdentifierValue(EOverflow e)
1902 : CSSValue(IdentifierClass) { 1902 : CSSValue(IdentifierClass) {
1903 switch (e) { 1903 switch (e) {
1904 case EOverflow::Visible: 1904 case EOverflow::kVisible:
1905 m_valueID = CSSValueVisible; 1905 m_valueID = CSSValueVisible;
1906 break; 1906 break;
1907 case EOverflow::Hidden: 1907 case EOverflow::kHidden:
1908 m_valueID = CSSValueHidden; 1908 m_valueID = CSSValueHidden;
1909 break; 1909 break;
1910 case EOverflow::Scroll: 1910 case EOverflow::kScroll:
1911 m_valueID = CSSValueScroll; 1911 m_valueID = CSSValueScroll;
1912 break; 1912 break;
1913 case EOverflow::Auto: 1913 case EOverflow::kAuto:
1914 m_valueID = CSSValueAuto; 1914 m_valueID = CSSValueAuto;
1915 break; 1915 break;
1916 case EOverflow::Overlay: 1916 case EOverflow::kOverlay:
1917 m_valueID = CSSValueOverlay; 1917 m_valueID = CSSValueOverlay;
1918 break; 1918 break;
1919 case EOverflow::PagedX: 1919 case EOverflow::kWebkitPagedX:
1920 m_valueID = CSSValueWebkitPagedX; 1920 m_valueID = CSSValueWebkitPagedX;
1921 break; 1921 break;
1922 case EOverflow::PagedY: 1922 case EOverflow::kWebkitPagedY:
1923 m_valueID = CSSValueWebkitPagedY; 1923 m_valueID = CSSValueWebkitPagedY;
1924 break; 1924 break;
1925 } 1925 }
1926 } 1926 }
1927 1927
1928 template <> 1928 template <>
1929 inline EOverflow CSSIdentifierValue::convertTo() const { 1929 inline EOverflow CSSIdentifierValue::convertTo() const {
1930 switch (m_valueID) { 1930 switch (m_valueID) {
1931 case CSSValueVisible: 1931 case CSSValueVisible:
1932 return EOverflow::Visible; 1932 return EOverflow::kVisible;
1933 case CSSValueHidden: 1933 case CSSValueHidden:
1934 return EOverflow::Hidden; 1934 return EOverflow::kHidden;
1935 case CSSValueScroll: 1935 case CSSValueScroll:
1936 return EOverflow::Scroll; 1936 return EOverflow::kScroll;
1937 case CSSValueAuto: 1937 case CSSValueAuto:
1938 return EOverflow::Auto; 1938 return EOverflow::kAuto;
1939 case CSSValueOverlay: 1939 case CSSValueOverlay:
1940 return EOverflow::Overlay; 1940 return EOverflow::kOverlay;
1941 case CSSValueWebkitPagedX: 1941 case CSSValueWebkitPagedX:
1942 return EOverflow::PagedX; 1942 return EOverflow::kWebkitPagedX;
1943 case CSSValueWebkitPagedY: 1943 case CSSValueWebkitPagedY:
1944 return EOverflow::PagedY; 1944 return EOverflow::kWebkitPagedY;
1945 default: 1945 default:
1946 break; 1946 break;
1947 } 1947 }
1948 1948
1949 ASSERT_NOT_REACHED(); 1949 ASSERT_NOT_REACHED();
1950 return EOverflow::Visible; 1950 return EOverflow::kVisible;
1951 } 1951 }
1952 1952
1953 template <> 1953 template <>
1954 inline CSSIdentifierValue::CSSIdentifierValue(EBreak e) 1954 inline CSSIdentifierValue::CSSIdentifierValue(EBreak e)
1955 : CSSValue(IdentifierClass) { 1955 : CSSValue(IdentifierClass) {
1956 switch (e) { 1956 switch (e) {
1957 default: 1957 default:
1958 ASSERT_NOT_REACHED(); 1958 ASSERT_NOT_REACHED();
1959 case BreakAuto: 1959 case BreakAuto:
1960 m_valueID = CSSValueAuto; 1960 m_valueID = CSSValueAuto;
(...skipping 2829 matching lines...) Expand 10 before | Expand all | Expand 10 after
4790 default: 4790 default:
4791 break; 4791 break;
4792 } 4792 }
4793 ASSERT_NOT_REACHED(); 4793 ASSERT_NOT_REACHED();
4794 return ContainsNone; 4794 return ContainsNone;
4795 } 4795 }
4796 4796
4797 } // namespace blink 4797 } // namespace blink
4798 4798
4799 #endif 4799 #endif
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698