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

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

Issue 40733004: Replace compile flag with runtime check for text-underline-position (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed a typo in static function compileUnderlineOffset signature / Rebase Created 7 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 | Annotate | Revision Log
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 2485 matching lines...) Expand 10 before | Expand all | Expand 10 after
2496 case CSSValueWavy: 2496 case CSSValueWavy:
2497 return TextDecorationStyleWavy; 2497 return TextDecorationStyleWavy;
2498 default: 2498 default:
2499 break; 2499 break;
2500 } 2500 }
2501 2501
2502 ASSERT_NOT_REACHED(); 2502 ASSERT_NOT_REACHED();
2503 return TextDecorationStyleSolid; 2503 return TextDecorationStyleSolid;
2504 } 2504 }
2505 2505
2506 #if ENABLE(CSS3_TEXT)
2507 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextUnderlinePosition e) 2506 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextUnderlinePosition e)
2508 : CSSValue(PrimitiveClass) 2507 : CSSValue(PrimitiveClass)
2509 { 2508 {
2510 m_primitiveUnitType = CSS_VALUE_ID; 2509 m_primitiveUnitType = CSS_VALUE_ID;
2511 switch (e) { 2510 switch (e) {
2512 case TextUnderlinePositionAuto: 2511 case TextUnderlinePositionAuto:
2513 m_value.valueID = CSSValueAuto; 2512 m_value.valueID = CSSValueAuto;
2514 break; 2513 break;
2515 case TextUnderlinePositionAlphabetic: 2514 case TextUnderlinePositionAlphabetic:
2516 m_value.valueID = CSSValueAlphabetic; 2515 m_value.valueID = CSSValueAlphabetic;
(...skipping 18 matching lines...) Expand all
2535 return TextUnderlinePositionUnder; 2534 return TextUnderlinePositionUnder;
2536 default: 2535 default:
2537 break; 2536 break;
2538 } 2537 }
2539 2538
2540 // FIXME: Implement support for 'under left' and 'under right' values. 2539 // FIXME: Implement support for 'under left' and 'under right' values.
2541 2540
2542 ASSERT_NOT_REACHED(); 2541 ASSERT_NOT_REACHED();
2543 return TextUnderlinePositionAuto; 2542 return TextUnderlinePositionAuto;
2544 } 2543 }
2545 #endif // CSS3_TEXT
2546 2544
2547 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ETextSecurity e) 2545 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ETextSecurity e)
2548 : CSSValue(PrimitiveClass) 2546 : CSSValue(PrimitiveClass)
2549 { 2547 {
2550 m_primitiveUnitType = CSS_VALUE_ID; 2548 m_primitiveUnitType = CSS_VALUE_ID;
2551 switch (e) { 2549 switch (e) {
2552 case TSNONE: 2550 case TSNONE:
2553 m_value.valueID = CSSValueNone; 2551 m_value.valueID = CSSValueNone;
2554 break; 2552 break;
2555 case TSDISC: 2553 case TSDISC:
(...skipping 2410 matching lines...) Expand 10 before | Expand all | Expand 10 after
4966 break; 4964 break;
4967 } 4965 }
4968 4966
4969 ASSERT_NOT_REACHED(); 4967 ASSERT_NOT_REACHED();
4970 return TouchActionDelayNone; 4968 return TouchActionDelayNone;
4971 } 4969 }
4972 4970
4973 } 4971 }
4974 4972
4975 #endif 4973 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698