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

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

Issue 1419813004: Remove the "horizontal-bt" value from -webkit-writing-mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add static_assert to ensure TransformedWritingMode matches to WritingMode Created 5 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
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 2650 matching lines...) Expand 10 before | Expand all | Expand 10 after
2661 switch (e) { 2661 switch (e) {
2662 case TopToBottomWritingMode: 2662 case TopToBottomWritingMode:
2663 m_value.valueID = CSSValueHorizontalTb; 2663 m_value.valueID = CSSValueHorizontalTb;
2664 break; 2664 break;
2665 case RightToLeftWritingMode: 2665 case RightToLeftWritingMode:
2666 m_value.valueID = CSSValueVerticalRl; 2666 m_value.valueID = CSSValueVerticalRl;
2667 break; 2667 break;
2668 case LeftToRightWritingMode: 2668 case LeftToRightWritingMode:
2669 m_value.valueID = CSSValueVerticalLr; 2669 m_value.valueID = CSSValueVerticalLr;
2670 break; 2670 break;
2671 case BottomToTopWritingMode:
2672 m_value.valueID = CSSValueHorizontalBt;
2673 break;
2674 } 2671 }
2675 } 2672 }
2676 2673
2677 template<> inline WritingMode CSSPrimitiveValue::convertTo() const 2674 template<> inline WritingMode CSSPrimitiveValue::convertTo() const
2678 { 2675 {
2679 ASSERT(isValueID()); 2676 ASSERT(isValueID());
2680 switch (m_value.valueID) { 2677 switch (m_value.valueID) {
2681 case CSSValueHorizontalTb: 2678 case CSSValueHorizontalTb:
2682 case CSSValueLr: 2679 case CSSValueLr:
2683 case CSSValueLrTb: 2680 case CSSValueLrTb:
2684 case CSSValueRl: 2681 case CSSValueRl:
2685 case CSSValueRlTb: 2682 case CSSValueRlTb:
2686 return TopToBottomWritingMode; 2683 return TopToBottomWritingMode;
2687 case CSSValueVerticalRl: 2684 case CSSValueVerticalRl:
2688 case CSSValueTb: 2685 case CSSValueTb:
2689 case CSSValueTbRl: 2686 case CSSValueTbRl:
2690 return RightToLeftWritingMode; 2687 return RightToLeftWritingMode;
2691 case CSSValueVerticalLr: 2688 case CSSValueVerticalLr:
2692 return LeftToRightWritingMode; 2689 return LeftToRightWritingMode;
2693 case CSSValueHorizontalBt:
2694 return BottomToTopWritingMode;
2695 default: 2690 default:
2696 break; 2691 break;
2697 } 2692 }
2698 2693
2699 ASSERT_NOT_REACHED(); 2694 ASSERT_NOT_REACHED();
2700 return TopToBottomWritingMode; 2695 return TopToBottomWritingMode;
2701 } 2696 }
2702 2697
2703 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextCombine e) 2698 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextCombine e)
2704 : CSSValue(PrimitiveClass) 2699 : CSSValue(PrimitiveClass)
(...skipping 1913 matching lines...) Expand 10 before | Expand all | Expand 10 after
4618 default: 4613 default:
4619 break; 4614 break;
4620 } 4615 }
4621 ASSERT_NOT_REACHED(); 4616 ASSERT_NOT_REACHED();
4622 return ScrollSnapTypeNone; 4617 return ScrollSnapTypeNone;
4623 } 4618 }
4624 4619
4625 } // namespace blink 4620 } // namespace blink
4626 4621
4627 #endif 4622 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/ManualTests/caret-in-columns-flipped.html ('k') | third_party/WebKit/Source/core/css/CSSProperty.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698