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

Side by Side Diff: Source/core/css/StylePropertyShorthand.cpp

Issue 17101024: Add support for CSS3 "text-decoration" shorthand (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Added missing code pointed out by Alexis Created 7 years, 6 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 | « Source/core/css/StylePropertyShorthand.h ('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 * (C) 1999-2003 Lars Knoll (knoll@kde.org) 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
4 * Copyright (C) 2013 Intel Corporation. All rights reserved. 4 * Copyright (C) 2013 Intel Corporation. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 return webkitMaskPositionLonghands; 458 return webkitMaskPositionLonghands;
459 } 459 }
460 460
461 const StylePropertyShorthand& webkitMaskRepeatShorthand() 461 const StylePropertyShorthand& webkitMaskRepeatShorthand()
462 { 462 {
463 static const CSSPropertyID maskRepeatProperties[] = { CSSPropertyWebkitMaskR epeatX, CSSPropertyWebkitMaskRepeatY }; 463 static const CSSPropertyID maskRepeatProperties[] = { CSSPropertyWebkitMaskR epeatX, CSSPropertyWebkitMaskRepeatY };
464 DEFINE_STATIC_LOCAL(StylePropertyShorthand, webkitMaskRepeatLonghands, (CSSP ropertyWebkitMaskRepeat, maskRepeatProperties, WTF_ARRAY_LENGTH(maskRepeatProper ties))); 464 DEFINE_STATIC_LOCAL(StylePropertyShorthand, webkitMaskRepeatLonghands, (CSSP ropertyWebkitMaskRepeat, maskRepeatProperties, WTF_ARRAY_LENGTH(maskRepeatProper ties)));
465 return webkitMaskRepeatLonghands; 465 return webkitMaskRepeatLonghands;
466 } 466 }
467 467
468 const StylePropertyShorthand& textDecorationShorthand()
469 {
470 static const CSSPropertyID textDecorationProperties[] = {
471 CSSPropertyTextDecorationLine,
472 CSSPropertyTextDecorationStyle,
473 CSSPropertyTextDecorationColor
474 };
475 DEFINE_STATIC_LOCAL(StylePropertyShorthand, textDecorationLonghands, (CSSPro pertyTextDecoration, textDecorationProperties, WTF_ARRAY_LENGTH(textDecorationPr operties)));
476 return textDecorationLonghands;
477 }
478
468 const StylePropertyShorthand& webkitTextEmphasisShorthand() 479 const StylePropertyShorthand& webkitTextEmphasisShorthand()
469 { 480 {
470 static const CSSPropertyID textEmphasisProperties[] = { 481 static const CSSPropertyID textEmphasisProperties[] = {
471 CSSPropertyWebkitTextEmphasisStyle, 482 CSSPropertyWebkitTextEmphasisStyle,
472 CSSPropertyWebkitTextEmphasisColor 483 CSSPropertyWebkitTextEmphasisColor
473 }; 484 };
474 DEFINE_STATIC_LOCAL(StylePropertyShorthand, webkitTextEmphasisLonghands, (CS SPropertyWebkitTextEmphasis, textEmphasisProperties, WTF_ARRAY_LENGTH(textEmphas isProperties))); 485 DEFINE_STATIC_LOCAL(StylePropertyShorthand, webkitTextEmphasisLonghands, (CS SPropertyWebkitTextEmphasis, textEmphasisProperties, WTF_ARRAY_LENGTH(textEmphas isProperties)));
475 return webkitTextEmphasisLonghands; 486 return webkitTextEmphasisLonghands;
476 } 487 }
477 488
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
562 case CSSPropertyFont: 573 case CSSPropertyFont:
563 return fontShorthand(); 574 return fontShorthand();
564 case CSSPropertyMargin: 575 case CSSPropertyMargin:
565 return marginShorthand(); 576 return marginShorthand();
566 case CSSPropertyOutline: 577 case CSSPropertyOutline:
567 return outlineShorthand(); 578 return outlineShorthand();
568 case CSSPropertyOverflow: 579 case CSSPropertyOverflow:
569 return overflowShorthand(); 580 return overflowShorthand();
570 case CSSPropertyPadding: 581 case CSSPropertyPadding:
571 return paddingShorthand(); 582 return paddingShorthand();
583 case CSSPropertyTextDecoration:
584 return textDecorationShorthand();
572 case CSSPropertyTransition: 585 case CSSPropertyTransition:
573 return transitionShorthand(); 586 return transitionShorthand();
574 case CSSPropertyWebkitAnimation: 587 case CSSPropertyWebkitAnimation:
575 return webkitAnimationShorthand(); 588 return webkitAnimationShorthand();
576 case CSSPropertyWebkitBorderAfter: 589 case CSSPropertyWebkitBorderAfter:
577 return webkitBorderAfterShorthand(); 590 return webkitBorderAfterShorthand();
578 case CSSPropertyWebkitBorderBefore: 591 case CSSPropertyWebkitBorderBefore:
579 return webkitBorderBeforeShorthand(); 592 return webkitBorderBeforeShorthand();
580 case CSSPropertyWebkitBorderEnd: 593 case CSSPropertyWebkitBorderEnd:
581 return webkitBorderEndShorthand(); 594 return webkitBorderEndShorthand();
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
898 Vector<StylePropertyShorthand, 1> maskPosition; 911 Vector<StylePropertyShorthand, 1> maskPosition;
899 maskPosition.uncheckedAppend(webkitMaskPositionShorthand()); 912 maskPosition.uncheckedAppend(webkitMaskPositionShorthand());
900 map.set(CSSPropertyWebkitMaskPositionX, maskPosition); 913 map.set(CSSPropertyWebkitMaskPositionX, maskPosition);
901 map.set(CSSPropertyWebkitMaskPositionY, maskPosition); 914 map.set(CSSPropertyWebkitMaskPositionY, maskPosition);
902 915
903 Vector<StylePropertyShorthand, 1> maskRepeat; 916 Vector<StylePropertyShorthand, 1> maskRepeat;
904 maskRepeat.uncheckedAppend(webkitMaskRepeatShorthand()); 917 maskRepeat.uncheckedAppend(webkitMaskRepeatShorthand());
905 map.set(CSSPropertyWebkitMaskRepeatX, maskRepeat); 918 map.set(CSSPropertyWebkitMaskRepeatX, maskRepeat);
906 map.set(CSSPropertyWebkitMaskRepeatY, maskRepeat); 919 map.set(CSSPropertyWebkitMaskRepeatY, maskRepeat);
907 920
921 Vector<StylePropertyShorthand, 1> textDecoration;
922 textDecoration.uncheckedAppend(textDecorationShorthand());
923 map.set(CSSPropertyTextDecorationLine, textDecoration);
924 map.set(CSSPropertyTextDecorationStyle, textDecoration);
925 map.set(CSSPropertyTextDecorationColor, textDecoration);
926
908 Vector<StylePropertyShorthand, 1> textEmphasis; 927 Vector<StylePropertyShorthand, 1> textEmphasis;
909 textEmphasis.uncheckedAppend(webkitTextEmphasisShorthand()); 928 textEmphasis.uncheckedAppend(webkitTextEmphasisShorthand());
910 map.set(CSSPropertyWebkitTextEmphasisStyle, textEmphasis); 929 map.set(CSSPropertyWebkitTextEmphasisStyle, textEmphasis);
911 map.set(CSSPropertyWebkitTextEmphasisColor, textEmphasis); 930 map.set(CSSPropertyWebkitTextEmphasisColor, textEmphasis);
912 931
913 Vector<StylePropertyShorthand, 1> textStroke; 932 Vector<StylePropertyShorthand, 1> textStroke;
914 textStroke.uncheckedAppend(webkitTextStrokeShorthand()); 933 textStroke.uncheckedAppend(webkitTextStrokeShorthand());
915 map.set(CSSPropertyWebkitTextStrokeWidth, textStroke); 934 map.set(CSSPropertyWebkitTextStrokeWidth, textStroke);
916 map.set(CSSPropertyWebkitTextStrokeColor, textStroke); 935 map.set(CSSPropertyWebkitTextStrokeColor, textStroke);
917 936
(...skipping 27 matching lines...) Expand all
945 { 964 {
946 for (unsigned i = 0; i < shorthands.size(); ++i) { 965 for (unsigned i = 0; i < shorthands.size(); ++i) {
947 if (shorthands.at(i).id() == shorthandID) 966 if (shorthands.at(i).id() == shorthandID)
948 return i; 967 return i;
949 } 968 }
950 ASSERT_NOT_REACHED(); 969 ASSERT_NOT_REACHED();
951 return 0; 970 return 0;
952 } 971 }
953 972
954 } // namespace WebCore 973 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/StylePropertyShorthand.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698