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

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

Issue 2569013006: Changed EOverflow to an enum class and renamed its members (Closed)
Patch Set: Rebase Created 4 years 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 1878 matching lines...) Expand 10 before | Expand all | Expand 10 after
1889 } 1889 }
1890 1890
1891 ASSERT_NOT_REACHED(); 1891 ASSERT_NOT_REACHED();
1892 return MarginCollapseCollapse; 1892 return MarginCollapseCollapse;
1893 } 1893 }
1894 1894
1895 template <> 1895 template <>
1896 inline CSSIdentifierValue::CSSIdentifierValue(EOverflow e) 1896 inline CSSIdentifierValue::CSSIdentifierValue(EOverflow e)
1897 : CSSValue(IdentifierClass) { 1897 : CSSValue(IdentifierClass) {
1898 switch (e) { 1898 switch (e) {
1899 case OverflowVisible: 1899 case EOverflow::Visible:
1900 m_valueID = CSSValueVisible; 1900 m_valueID = CSSValueVisible;
1901 break; 1901 break;
1902 case OverflowHidden: 1902 case EOverflow::Hidden:
1903 m_valueID = CSSValueHidden; 1903 m_valueID = CSSValueHidden;
1904 break; 1904 break;
1905 case OverflowScroll: 1905 case EOverflow::Scroll:
1906 m_valueID = CSSValueScroll; 1906 m_valueID = CSSValueScroll;
1907 break; 1907 break;
1908 case OverflowAuto: 1908 case EOverflow::Auto:
1909 m_valueID = CSSValueAuto; 1909 m_valueID = CSSValueAuto;
1910 break; 1910 break;
1911 case OverflowOverlay: 1911 case EOverflow::Overlay:
1912 m_valueID = CSSValueOverlay; 1912 m_valueID = CSSValueOverlay;
1913 break; 1913 break;
1914 case OverflowPagedX: 1914 case EOverflow::PagedX:
1915 m_valueID = CSSValueWebkitPagedX; 1915 m_valueID = CSSValueWebkitPagedX;
1916 break; 1916 break;
1917 case OverflowPagedY: 1917 case EOverflow::PagedY:
1918 m_valueID = CSSValueWebkitPagedY; 1918 m_valueID = CSSValueWebkitPagedY;
1919 break; 1919 break;
1920 } 1920 }
1921 } 1921 }
1922 1922
1923 template <> 1923 template <>
1924 inline EOverflow CSSIdentifierValue::convertTo() const { 1924 inline EOverflow CSSIdentifierValue::convertTo() const {
1925 switch (m_valueID) { 1925 switch (m_valueID) {
1926 case CSSValueVisible: 1926 case CSSValueVisible:
1927 return OverflowVisible; 1927 return EOverflow::Visible;
1928 case CSSValueHidden: 1928 case CSSValueHidden:
1929 return OverflowHidden; 1929 return EOverflow::Hidden;
1930 case CSSValueScroll: 1930 case CSSValueScroll:
1931 return OverflowScroll; 1931 return EOverflow::Scroll;
1932 case CSSValueAuto: 1932 case CSSValueAuto:
1933 return OverflowAuto; 1933 return EOverflow::Auto;
1934 case CSSValueOverlay: 1934 case CSSValueOverlay:
1935 return OverflowOverlay; 1935 return EOverflow::Overlay;
1936 case CSSValueWebkitPagedX: 1936 case CSSValueWebkitPagedX:
1937 return OverflowPagedX; 1937 return EOverflow::PagedX;
1938 case CSSValueWebkitPagedY: 1938 case CSSValueWebkitPagedY:
1939 return OverflowPagedY; 1939 return EOverflow::PagedY;
1940 default: 1940 default:
1941 break; 1941 break;
1942 } 1942 }
1943 1943
1944 ASSERT_NOT_REACHED(); 1944 ASSERT_NOT_REACHED();
1945 return OverflowVisible; 1945 return EOverflow::Visible;
1946 } 1946 }
1947 1947
1948 template <> 1948 template <>
1949 inline CSSIdentifierValue::CSSIdentifierValue(EBreak e) 1949 inline CSSIdentifierValue::CSSIdentifierValue(EBreak e)
1950 : CSSValue(IdentifierClass) { 1950 : CSSValue(IdentifierClass) {
1951 switch (e) { 1951 switch (e) {
1952 default: 1952 default:
1953 ASSERT_NOT_REACHED(); 1953 ASSERT_NOT_REACHED();
1954 case BreakAuto: 1954 case BreakAuto:
1955 m_valueID = CSSValueAuto; 1955 m_valueID = CSSValueAuto;
(...skipping 2829 matching lines...) Expand 10 before | Expand all | Expand 10 after
4785 default: 4785 default:
4786 break; 4786 break;
4787 } 4787 }
4788 ASSERT_NOT_REACHED(); 4788 ASSERT_NOT_REACHED();
4789 return ContainsNone; 4789 return ContainsNone;
4790 } 4790 }
4791 4791
4792 } // namespace blink 4792 } // namespace blink
4793 4793
4794 #endif 4794 #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