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

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

Issue 677843004: Remove text-combine. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: 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
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 2423 matching lines...) Expand 10 before | Expand all | Expand 10 after
2434 case CSSValueRtl: 2434 case CSSValueRtl:
2435 return RTL; 2435 return RTL;
2436 default: 2436 default:
2437 break; 2437 break;
2438 } 2438 }
2439 2439
2440 ASSERT_NOT_REACHED(); 2440 ASSERT_NOT_REACHED();
2441 return LTR; 2441 return LTR;
2442 } 2442 }
2443 2443
2444 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextCombine e)
2445 : CSSValue(PrimitiveClass)
2446 {
2447 m_primitiveUnitType = CSS_VALUE_ID;
2448 switch (e) {
2449 case TextCombineNone:
2450 m_value.valueID = CSSValueNone;
2451 break;
2452 case TextCombineHorizontal:
2453 m_value.valueID = CSSValueHorizontal;
2454 break;
2455 }
2456 }
2457
2458 template<> inline CSSPrimitiveValue::operator TextCombine() const
2459 {
2460 ASSERT(isValueID());
2461 switch (m_value.valueID) {
2462 case CSSValueNone:
2463 return TextCombineNone;
2464 case CSSValueHorizontal:
2465 return TextCombineHorizontal;
2466 default:
2467 break;
2468 }
2469
2470 ASSERT_NOT_REACHED();
2471 return TextCombineNone;
2472 }
2473
2474 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextEmphasisPosition posi tion) 2444 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextEmphasisPosition posi tion)
2475 : CSSValue(PrimitiveClass) 2445 : CSSValue(PrimitiveClass)
2476 { 2446 {
2477 m_primitiveUnitType = CSS_VALUE_ID; 2447 m_primitiveUnitType = CSS_VALUE_ID;
2478 switch (position) { 2448 switch (position) {
2479 case TextEmphasisPositionOver: 2449 case TextEmphasisPositionOver:
2480 m_value.valueID = CSSValueOver; 2450 m_value.valueID = CSSValueOver;
2481 break; 2451 break;
2482 case TextEmphasisPositionUnder: 2452 case TextEmphasisPositionUnder:
2483 m_value.valueID = CSSValueUnder; 2453 m_value.valueID = CSSValueUnder;
(...skipping 1335 matching lines...) Expand 10 before | Expand all | Expand 10 after
3819 default: 3789 default:
3820 break; 3790 break;
3821 } 3791 }
3822 ASSERT_NOT_REACHED(); 3792 ASSERT_NOT_REACHED();
3823 return ScrollBehaviorInstant; 3793 return ScrollBehaviorInstant;
3824 } 3794 }
3825 3795
3826 } 3796 }
3827 3797
3828 #endif 3798 #endif
OLDNEW
« no previous file with comments | « sky/engine/core/css/CSSComputedStyleDeclaration.cpp ('k') | sky/engine/core/css/CSSProperties.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698