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

Side by Side Diff: Source/core/css/resolver/StyleResolver.cpp

Issue 19516002: [WebVTT] Support text-decoration-{text,color,style} on CSS ::cue pseudo-element (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Added FIXME with info on 'text-decoration' shorthand Created 7 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « LayoutTests/media/track/track-css-all-cues-expected.txt ('k') | no next file » | 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 1129 matching lines...) Expand 10 before | Expand all | Expand 10 after
1140 case CSSPropertyFontWeight: 1140 case CSSPropertyFontWeight:
1141 case CSSPropertyLineHeight: 1141 case CSSPropertyLineHeight:
1142 case CSSPropertyOpacity: 1142 case CSSPropertyOpacity:
1143 case CSSPropertyOutline: 1143 case CSSPropertyOutline:
1144 case CSSPropertyOutlineColor: 1144 case CSSPropertyOutlineColor:
1145 case CSSPropertyOutlineOffset: 1145 case CSSPropertyOutlineOffset:
1146 case CSSPropertyOutlineStyle: 1146 case CSSPropertyOutlineStyle:
1147 case CSSPropertyOutlineWidth: 1147 case CSSPropertyOutlineWidth:
1148 case CSSPropertyVisibility: 1148 case CSSPropertyVisibility:
1149 case CSSPropertyWhiteSpace: 1149 case CSSPropertyWhiteSpace:
1150 // FIXME: 'text-decoration' shorthand to be handled when available.
1151 // See https://chromiumcodereview.appspot.com/19516002 for details.
1150 case CSSPropertyTextDecoration: 1152 case CSSPropertyTextDecoration:
1151 case CSSPropertyTextShadow: 1153 case CSSPropertyTextShadow:
1152 case CSSPropertyBorderStyle: 1154 case CSSPropertyBorderStyle:
1153 return true; 1155 return true;
1156 case CSSPropertyTextDecorationLine:
1157 case CSSPropertyTextDecorationStyle:
1158 case CSSPropertyTextDecorationColor:
1159 return RuntimeEnabledFeatures::css3TextDecorationsEnabled();
1154 default: 1160 default:
1155 break; 1161 break;
1156 } 1162 }
1157 return false; 1163 return false;
1158 } 1164 }
1159 1165
1160 template <StyleResolver::StyleApplicationPass pass> 1166 template <StyleResolver::StyleApplicationPass pass>
1161 bool StyleResolver::isPropertyForPass(CSSPropertyID property) 1167 bool StyleResolver::isPropertyForPass(CSSPropertyID property)
1162 { 1168 {
1163 COMPILE_ASSERT(CSSPropertyVariable < firstCSSProperty, CSS_variable_is_befor e_first_property); 1169 COMPILE_ASSERT(CSSPropertyVariable < firstCSSProperty, CSS_variable_is_befor e_first_property);
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
1573 info.addMember(m_state, "state"); 1579 info.addMember(m_state, "state");
1574 1580
1575 // FIXME: move this to a place where it would be called only once? 1581 // FIXME: move this to a place where it would be called only once?
1576 info.addMember(CSSDefaultStyleSheets::defaultStyle, "defaultStyle"); 1582 info.addMember(CSSDefaultStyleSheets::defaultStyle, "defaultStyle");
1577 info.addMember(CSSDefaultStyleSheets::defaultQuirksStyle, "defaultQuirksStyl e"); 1583 info.addMember(CSSDefaultStyleSheets::defaultQuirksStyle, "defaultQuirksStyl e");
1578 info.addMember(CSSDefaultStyleSheets::defaultPrintStyle, "defaultPrintStyle" ); 1584 info.addMember(CSSDefaultStyleSheets::defaultPrintStyle, "defaultPrintStyle" );
1579 info.addMember(CSSDefaultStyleSheets::defaultViewSourceStyle, "defaultViewSo urceStyle"); 1585 info.addMember(CSSDefaultStyleSheets::defaultViewSourceStyle, "defaultViewSo urceStyle");
1580 } 1586 }
1581 1587
1582 } // namespace WebCore 1588 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/media/track/track-css-all-cues-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698