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

Side by Side Diff: sky/engine/core/css/CSSPrimitiveValueMappings.h

Issue 708843002: Remove -webkit-auto, -webkit-center, -webkit-left, -webkit-right. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: merge to ToT Created 6 years, 1 month 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 | sky/engine/core/css/CSSValueKeywords.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 1732 matching lines...) Expand 10 before | Expand all | Expand 10 after
1743 break; 1743 break;
1744 case RIGHT: 1744 case RIGHT:
1745 m_value.valueID = CSSValueRight; 1745 m_value.valueID = CSSValueRight;
1746 break; 1746 break;
1747 case CENTER: 1747 case CENTER:
1748 m_value.valueID = CSSValueCenter; 1748 m_value.valueID = CSSValueCenter;
1749 break; 1749 break;
1750 case JUSTIFY: 1750 case JUSTIFY:
1751 m_value.valueID = CSSValueJustify; 1751 m_value.valueID = CSSValueJustify;
1752 break; 1752 break;
1753 case WEBKIT_LEFT:
1754 m_value.valueID = CSSValueWebkitLeft;
1755 break;
1756 case WEBKIT_RIGHT:
1757 m_value.valueID = CSSValueWebkitRight;
1758 break;
1759 case WEBKIT_CENTER:
1760 m_value.valueID = CSSValueWebkitCenter;
1761 break;
1762 } 1753 }
1763 } 1754 }
1764 1755
1765 template<> inline CSSPrimitiveValue::operator ETextAlign() const 1756 template<> inline CSSPrimitiveValue::operator ETextAlign() const
1766 { 1757 {
1767 ASSERT(isValueID()); 1758 ASSERT(isValueID());
1768 switch (m_value.valueID) { 1759 switch (m_value.valueID) {
1769 case CSSValueWebkitAuto: // Legacy -webkit-auto. Eqiuvalent to start.
1770 case CSSValueStart: 1760 case CSSValueStart:
1771 return TASTART; 1761 return TASTART;
1772 case CSSValueEnd: 1762 case CSSValueEnd:
1773 return TAEND; 1763 return TAEND;
1774 default: 1764 default:
1775 return static_cast<ETextAlign>(m_value.valueID - CSSValueLeft); 1765 return static_cast<ETextAlign>(m_value.valueID - CSSValueLeft);
1776 } 1766 }
1777 } 1767 }
1778 1768
1779 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextAlignLast e) 1769 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextAlignLast e)
(...skipping 1892 matching lines...) Expand 10 before | Expand all | Expand 10 after
3672 default: 3662 default:
3673 break; 3663 break;
3674 } 3664 }
3675 ASSERT_NOT_REACHED(); 3665 ASSERT_NOT_REACHED();
3676 return ScrollBehaviorInstant; 3666 return ScrollBehaviorInstant;
3677 } 3667 }
3678 3668
3679 } 3669 }
3680 3670
3681 #endif 3671 #endif
OLDNEW
« no previous file with comments | « no previous file | sky/engine/core/css/CSSValueKeywords.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698