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

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

Issue 14576017: Implement CSS3TextDecorations runtime flag in favor of CSS3_TEXT (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Removed updated on text-underline-position for now (to be discussed & re-added later) Created 7 years, 7 months 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 | « Source/core/css/CSSParser.cpp ('k') | Source/core/css/CSSProperty.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. (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 2286 matching lines...) Expand 10 before | Expand all | Expand 10 after
2297 case CSSValueLineThrough: 2297 case CSSValueLineThrough:
2298 return LINE_THROUGH; 2298 return LINE_THROUGH;
2299 case CSSValueBlink: 2299 case CSSValueBlink:
2300 return BLINK; 2300 return BLINK;
2301 } 2301 }
2302 2302
2303 ASSERT_NOT_REACHED(); 2303 ASSERT_NOT_REACHED();
2304 return TDNONE; 2304 return TDNONE;
2305 } 2305 }
2306 2306
2307 #if ENABLE(CSS3_TEXT)
2308 template<> inline CSSPrimitiveValue::operator TextDecorationStyle() const 2307 template<> inline CSSPrimitiveValue::operator TextDecorationStyle() const
2309 { 2308 {
2310 switch (m_value.ident) { 2309 switch (m_value.ident) {
2311 case CSSValueSolid: 2310 case CSSValueSolid:
2312 return TextDecorationStyleSolid; 2311 return TextDecorationStyleSolid;
2313 case CSSValueDouble: 2312 case CSSValueDouble:
2314 return TextDecorationStyleDouble; 2313 return TextDecorationStyleDouble;
2315 case CSSValueDotted: 2314 case CSSValueDotted:
2316 return TextDecorationStyleDotted; 2315 return TextDecorationStyleDotted;
2317 case CSSValueDashed: 2316 case CSSValueDashed:
2318 return TextDecorationStyleDashed; 2317 return TextDecorationStyleDashed;
2319 case CSSValueWavy: 2318 case CSSValueWavy:
2320 return TextDecorationStyleWavy; 2319 return TextDecorationStyleWavy;
2321 } 2320 }
2322 2321
2323 ASSERT_NOT_REACHED(); 2322 ASSERT_NOT_REACHED();
2324 return TextDecorationStyleSolid; 2323 return TextDecorationStyleSolid;
2325 } 2324 }
2326 2325
2326 #if ENABLE(CSS3_TEXT)
2327 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextUnderlinePosition e) 2327 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextUnderlinePosition e)
2328 : CSSValue(PrimitiveClass) 2328 : CSSValue(PrimitiveClass)
2329 { 2329 {
2330 m_primitiveUnitType = CSS_IDENT; 2330 m_primitiveUnitType = CSS_IDENT;
2331 switch (e) { 2331 switch (e) {
2332 case TextUnderlinePositionAuto: 2332 case TextUnderlinePositionAuto:
2333 m_value.ident = CSSValueAuto; 2333 m_value.ident = CSSValueAuto;
2334 break; 2334 break;
2335 case TextUnderlinePositionAlphabetic: 2335 case TextUnderlinePositionAlphabetic:
2336 m_value.ident = CSSValueAlphabetic; 2336 m_value.ident = CSSValueAlphabetic;
(...skipping 2166 matching lines...) Expand 10 before | Expand all | Expand 10 after
4503 4503
4504 ASSERT_NOT_REACHED(); 4504 ASSERT_NOT_REACHED();
4505 return MT_LUMINANCE; 4505 return MT_LUMINANCE;
4506 } 4506 }
4507 4507
4508 #endif // ENABLE(SVG) 4508 #endif // ENABLE(SVG)
4509 4509
4510 } 4510 }
4511 4511
4512 #endif 4512 #endif
OLDNEW
« no previous file with comments | « Source/core/css/CSSParser.cpp ('k') | Source/core/css/CSSProperty.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698