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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: Source/core/rendering/style/RenderStyle.h

Issue 16337002: Revert "Revert "Implement CSS3TextDecorations runtime flag in favor of CSS3_TEXT"" (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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
« no previous file with comments | « Source/core/rendering/RenderObject.cpp ('k') | Source/core/rendering/style/RenderStyle.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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 539
540 Length textIndent() const { return rareInheritedData->indent; } 540 Length textIndent() const { return rareInheritedData->indent; }
541 #if ENABLE(CSS3_TEXT) 541 #if ENABLE(CSS3_TEXT)
542 TextIndentLine textIndentLine() const { return static_cast<TextIndentLine>(r areInheritedData->m_textIndentLine); } 542 TextIndentLine textIndentLine() const { return static_cast<TextIndentLine>(r areInheritedData->m_textIndentLine); }
543 #endif 543 #endif
544 ETextAlign textAlign() const { return static_cast<ETextAlign>(inherited_flag s._text_align); } 544 ETextAlign textAlign() const { return static_cast<ETextAlign>(inherited_flag s._text_align); }
545 ETextTransform textTransform() const { return static_cast<ETextTransform>(in herited_flags._text_transform); } 545 ETextTransform textTransform() const { return static_cast<ETextTransform>(in herited_flags._text_transform); }
546 TextDecoration textDecorationsInEffect() const { return static_cast<TextDeco ration>(inherited_flags._text_decorations); } 546 TextDecoration textDecorationsInEffect() const { return static_cast<TextDeco ration>(inherited_flags._text_decorations); }
547 TextDecoration textDecoration() const { return static_cast<TextDecoration>(v isual->textDecoration); } 547 TextDecoration textDecoration() const { return static_cast<TextDecoration>(v isual->textDecoration); }
548 #if ENABLE(CSS3_TEXT) 548 #if ENABLE(CSS3_TEXT)
549 TextDecorationStyle textDecorationStyle() const { return static_cast<TextDec orationStyle>(rareNonInheritedData->m_textDecorationStyle); }
550 TextAlignLast textAlignLast() const { return static_cast<TextAlignLast>(rare InheritedData->m_textAlignLast); } 549 TextAlignLast textAlignLast() const { return static_cast<TextAlignLast>(rare InheritedData->m_textAlignLast); }
551 TextUnderlinePosition textUnderlinePosition() const { return static_cast<Tex tUnderlinePosition>(rareInheritedData->m_textUnderlinePosition); } 550 TextUnderlinePosition textUnderlinePosition() const { return static_cast<Tex tUnderlinePosition>(rareInheritedData->m_textUnderlinePosition); }
552 #else
553 TextDecorationStyle textDecorationStyle() const { return TextDecorationStyle Solid; }
554 #endif // CSS3_TEXT 551 #endif // CSS3_TEXT
552 TextDecorationStyle textDecorationStyle() const { return static_cast<TextDec orationStyle>(rareNonInheritedData->m_textDecorationStyle); }
555 int wordSpacing() const; 553 int wordSpacing() const;
556 int letterSpacing() const; 554 int letterSpacing() const;
557 555
558 float zoom() const { return visual->m_zoom; } 556 float zoom() const { return visual->m_zoom; }
559 float effectiveZoom() const { return rareInheritedData->m_effectiveZoom; } 557 float effectiveZoom() const { return rareInheritedData->m_effectiveZoom; }
560 558
561 TextDirection direction() const { return static_cast<TextDirection>(inherite d_flags._direction); } 559 TextDirection direction() const { return static_cast<TextDirection>(inherite d_flags._direction); }
562 bool isLeftToRightDirection() const { return direction() == LTR; } 560 bool isLeftToRightDirection() const { return direction() == LTR; }
563 561
564 Length specifiedLineHeight() const; 562 Length specifiedLineHeight() const;
(...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after
1054 void setTextIndent(Length v) { SET_VAR(rareInheritedData, indent, v); } 1052 void setTextIndent(Length v) { SET_VAR(rareInheritedData, indent, v); }
1055 #if ENABLE(CSS3_TEXT) 1053 #if ENABLE(CSS3_TEXT)
1056 void setTextIndentLine(TextIndentLine v) { SET_VAR(rareInheritedData, m_text IndentLine, v); } 1054 void setTextIndentLine(TextIndentLine v) { SET_VAR(rareInheritedData, m_text IndentLine, v); }
1057 #endif 1055 #endif
1058 void setTextAlign(ETextAlign v) { inherited_flags._text_align = v; } 1056 void setTextAlign(ETextAlign v) { inherited_flags._text_align = v; }
1059 void setTextTransform(ETextTransform v) { inherited_flags._text_transform = v; } 1057 void setTextTransform(ETextTransform v) { inherited_flags._text_transform = v; }
1060 void addToTextDecorationsInEffect(TextDecoration v) { inherited_flags._text_ decorations |= v; } 1058 void addToTextDecorationsInEffect(TextDecoration v) { inherited_flags._text_ decorations |= v; }
1061 void setTextDecorationsInEffect(TextDecoration v) { inherited_flags._text_de corations = v; } 1059 void setTextDecorationsInEffect(TextDecoration v) { inherited_flags._text_de corations = v; }
1062 void setTextDecoration(TextDecoration v) { SET_VAR(visual, textDecoration, v ); } 1060 void setTextDecoration(TextDecoration v) { SET_VAR(visual, textDecoration, v ); }
1063 #if ENABLE(CSS3_TEXT) 1061 #if ENABLE(CSS3_TEXT)
1064 void setTextDecorationStyle(TextDecorationStyle v) { SET_VAR(rareNonInherite dData, m_textDecorationStyle, v); }
1065 void setTextAlignLast(TextAlignLast v) { SET_VAR(rareInheritedData, m_textAl ignLast, v); } 1062 void setTextAlignLast(TextAlignLast v) { SET_VAR(rareInheritedData, m_textAl ignLast, v); }
1066 void setTextUnderlinePosition(TextUnderlinePosition v) { SET_VAR(rareInherit edData, m_textUnderlinePosition, v); } 1063 void setTextUnderlinePosition(TextUnderlinePosition v) { SET_VAR(rareInherit edData, m_textUnderlinePosition, v); }
1067 #endif // CSS3_TEXT 1064 #endif // CSS3_TEXT
1065 void setTextDecorationStyle(TextDecorationStyle v) { SET_VAR(rareNonInherite dData, m_textDecorationStyle, v); }
1068 void setDirection(TextDirection v) { inherited_flags._direction = v; } 1066 void setDirection(TextDirection v) { inherited_flags._direction = v; }
1069 void setLineHeight(Length specifiedLineHeight); 1067 void setLineHeight(Length specifiedLineHeight);
1070 bool setZoom(float); 1068 bool setZoom(float);
1071 void setZoomWithoutReturnValue(float f) { setZoom(f); } 1069 void setZoomWithoutReturnValue(float f) { setZoom(f); }
1072 bool setEffectiveZoom(float); 1070 bool setEffectiveZoom(float);
1073 1071
1074 void setImageRendering(EImageRendering v) { SET_VAR(rareInheritedData, m_ima geRendering, v); } 1072 void setImageRendering(EImageRendering v) { SET_VAR(rareInheritedData, m_ima geRendering, v); }
1075 1073
1076 void setWhiteSpace(EWhiteSpace v) { inherited_flags._white_space = v; } 1074 void setWhiteSpace(EWhiteSpace v) { inherited_flags._white_space = v; }
1077 1075
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
1252 void setRegionBreakBefore(EPageBreak p) { SET_VAR(rareNonInheritedData, m_re gionBreakBefore, p); } 1250 void setRegionBreakBefore(EPageBreak p) { SET_VAR(rareNonInheritedData, m_re gionBreakBefore, p); }
1253 void setRegionBreakInside(EPageBreak p) { ASSERT(p == PBAUTO || p == PBAVOID ); SET_VAR(rareNonInheritedData, m_regionBreakInside, p); } 1251 void setRegionBreakInside(EPageBreak p) { ASSERT(p == PBAUTO || p == PBAVOID ); SET_VAR(rareNonInheritedData, m_regionBreakInside, p); }
1254 void setRegionBreakAfter(EPageBreak p) { SET_VAR(rareNonInheritedData, m_reg ionBreakAfter, p); } 1252 void setRegionBreakAfter(EPageBreak p) { SET_VAR(rareNonInheritedData, m_reg ionBreakAfter, p); }
1255 void inheritColumnPropertiesFrom(RenderStyle* parent) { rareNonInheritedData .access()->m_multiCol = parent->rareNonInheritedData->m_multiCol; } 1253 void inheritColumnPropertiesFrom(RenderStyle* parent) { rareNonInheritedData .access()->m_multiCol = parent->rareNonInheritedData->m_multiCol; }
1256 void setTransform(const TransformOperations& ops) { SET_VAR(rareNonInherited Data.access()->m_transform, m_operations, ops); } 1254 void setTransform(const TransformOperations& ops) { SET_VAR(rareNonInherited Data.access()->m_transform, m_operations, ops); }
1257 void setTransformOriginX(Length l) { SET_VAR(rareNonInheritedData.access()-> m_transform, m_x, l); } 1255 void setTransformOriginX(Length l) { SET_VAR(rareNonInheritedData.access()-> m_transform, m_x, l); }
1258 void setTransformOriginY(Length l) { SET_VAR(rareNonInheritedData.access()-> m_transform, m_y, l); } 1256 void setTransformOriginY(Length l) { SET_VAR(rareNonInheritedData.access()-> m_transform, m_y, l); }
1259 void setTransformOriginZ(float f) { SET_VAR(rareNonInheritedData.access()->m _transform, m_z, f); } 1257 void setTransformOriginZ(float f) { SET_VAR(rareNonInheritedData.access()->m _transform, m_z, f); }
1260 void setSpeak(ESpeak s) { SET_VAR(rareInheritedData, speak, s); } 1258 void setSpeak(ESpeak s) { SET_VAR(rareInheritedData, speak, s); }
1261 void setTextCombine(TextCombine v) { SET_VAR(rareNonInheritedData, m_textCom bine, v); } 1259 void setTextCombine(TextCombine v) { SET_VAR(rareNonInheritedData, m_textCom bine, v); }
1262 #if ENABLE(CSS3_TEXT)
1263 void setTextDecorationColor(const Color& c) { SET_VAR(rareNonInheritedData, m_textDecorationColor, c); } 1260 void setTextDecorationColor(const Color& c) { SET_VAR(rareNonInheritedData, m_textDecorationColor, c); }
1264 #endif // CSS3_TEXT
1265 void setTextEmphasisColor(const Color& c) { SET_VAR(rareInheritedData, textE mphasisColor, c); } 1261 void setTextEmphasisColor(const Color& c) { SET_VAR(rareInheritedData, textE mphasisColor, c); }
1266 void setTextEmphasisFill(TextEmphasisFill fill) { SET_VAR(rareInheritedData, textEmphasisFill, fill); } 1262 void setTextEmphasisFill(TextEmphasisFill fill) { SET_VAR(rareInheritedData, textEmphasisFill, fill); }
1267 void setTextEmphasisMark(TextEmphasisMark mark) { SET_VAR(rareInheritedData, textEmphasisMark, mark); } 1263 void setTextEmphasisMark(TextEmphasisMark mark) { SET_VAR(rareInheritedData, textEmphasisMark, mark); }
1268 void setTextEmphasisCustomMark(const AtomicString& mark) { SET_VAR(rareInher itedData, textEmphasisCustomMark, mark); } 1264 void setTextEmphasisCustomMark(const AtomicString& mark) { SET_VAR(rareInher itedData, textEmphasisCustomMark, mark); }
1269 void setTextEmphasisPosition(TextEmphasisPosition position) { SET_VAR(rareIn heritedData, textEmphasisPosition, position); } 1265 void setTextEmphasisPosition(TextEmphasisPosition position) { SET_VAR(rareIn heritedData, textEmphasisPosition, position); }
1270 bool setTextOrientation(TextOrientation); 1266 bool setTextOrientation(TextOrientation);
1271 1267
1272 void setRubyPosition(RubyPosition position) { SET_VAR(rareInheritedData, m_r ubyPosition, position); } 1268 void setRubyPosition(RubyPosition position) { SET_VAR(rareInheritedData, m_r ubyPosition, position); }
1273 1269
1274 void setFilter(const FilterOperations& ops) { SET_VAR(rareNonInheritedData.a ccess()->m_filter, m_operations, ops); } 1270 void setFilter(const FilterOperations& ops) { SET_VAR(rareNonInheritedData.a ccess()->m_filter, m_operations, ops); }
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
1513 #if ENABLE(CSS3_TEXT) 1509 #if ENABLE(CSS3_TEXT)
1514 static TextIndentLine initialTextIndentLine() { return TextIndentFirstLine; } 1510 static TextIndentLine initialTextIndentLine() { return TextIndentFirstLine; }
1515 #endif 1511 #endif
1516 static EVerticalAlign initialVerticalAlign() { return BASELINE; } 1512 static EVerticalAlign initialVerticalAlign() { return BASELINE; }
1517 static short initialWidows() { return 2; } 1513 static short initialWidows() { return 2; }
1518 static short initialOrphans() { return 2; } 1514 static short initialOrphans() { return 2; }
1519 static Length initialLineHeight() { return Length(-100.0, Percent); } 1515 static Length initialLineHeight() { return Length(-100.0, Percent); }
1520 static ETextAlign initialTextAlign() { return TASTART; } 1516 static ETextAlign initialTextAlign() { return TASTART; }
1521 static TextDecoration initialTextDecoration() { return TextDecorationNone; } 1517 static TextDecoration initialTextDecoration() { return TextDecorationNone; }
1522 #if ENABLE(CSS3_TEXT) 1518 #if ENABLE(CSS3_TEXT)
1523 static TextDecorationStyle initialTextDecorationStyle() { return TextDecorat ionStyleSolid; }
1524 static TextAlignLast initialTextAlignLast() { return TextAlignLastAuto; } 1519 static TextAlignLast initialTextAlignLast() { return TextAlignLastAuto; }
1525 static TextUnderlinePosition initialTextUnderlinePosition() { return TextUnd erlinePositionAuto; } 1520 static TextUnderlinePosition initialTextUnderlinePosition() { return TextUnd erlinePositionAuto; }
1526 #endif // CSS3_TEXT 1521 #endif // CSS3_TEXT
1522 static TextDecorationStyle initialTextDecorationStyle() { return TextDecorat ionStyleSolid; }
1527 static float initialZoom() { return 1.0f; } 1523 static float initialZoom() { return 1.0f; }
1528 static int initialOutlineOffset() { return 0; } 1524 static int initialOutlineOffset() { return 0; }
1529 static float initialOpacity() { return 1.0f; } 1525 static float initialOpacity() { return 1.0f; }
1530 static EBoxAlignment initialBoxAlign() { return BSTRETCH; } 1526 static EBoxAlignment initialBoxAlign() { return BSTRETCH; }
1531 static EBoxDecorationBreak initialBoxDecorationBreak() { return DSLICE; } 1527 static EBoxDecorationBreak initialBoxDecorationBreak() { return DSLICE; }
1532 static EBoxDirection initialBoxDirection() { return BNORMAL; } 1528 static EBoxDirection initialBoxDirection() { return BNORMAL; }
1533 static EBoxLines initialBoxLines() { return SINGLE; } 1529 static EBoxLines initialBoxLines() { return SINGLE; }
1534 static EBoxOrient initialBoxOrient() { return HORIZONTAL; } 1530 static EBoxOrient initialBoxOrient() { return HORIZONTAL; }
1535 static EBoxPack initialBoxPack() { return Start; } 1531 static EBoxPack initialBoxPack() { return Start; }
1536 static float initialBoxFlex() { return 0.0f; } 1532 static float initialBoxFlex() { return 0.0f; }
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
1650 static BlendMode initialBlendMode() { return BlendModeNormal; } 1646 static BlendMode initialBlendMode() { return BlendModeNormal; }
1651 private: 1647 private:
1652 void setVisitedLinkColor(const Color&); 1648 void setVisitedLinkColor(const Color&);
1653 void setVisitedLinkBackgroundColor(const Color& v) { SET_VAR(rareNonInherite dData, m_visitedLinkBackgroundColor, v); } 1649 void setVisitedLinkBackgroundColor(const Color& v) { SET_VAR(rareNonInherite dData, m_visitedLinkBackgroundColor, v); }
1654 void setVisitedLinkBorderLeftColor(const Color& v) { SET_VAR(rareNonInherite dData, m_visitedLinkBorderLeftColor, v); } 1650 void setVisitedLinkBorderLeftColor(const Color& v) { SET_VAR(rareNonInherite dData, m_visitedLinkBorderLeftColor, v); }
1655 void setVisitedLinkBorderRightColor(const Color& v) { SET_VAR(rareNonInherit edData, m_visitedLinkBorderRightColor, v); } 1651 void setVisitedLinkBorderRightColor(const Color& v) { SET_VAR(rareNonInherit edData, m_visitedLinkBorderRightColor, v); }
1656 void setVisitedLinkBorderBottomColor(const Color& v) { SET_VAR(rareNonInheri tedData, m_visitedLinkBorderBottomColor, v); } 1652 void setVisitedLinkBorderBottomColor(const Color& v) { SET_VAR(rareNonInheri tedData, m_visitedLinkBorderBottomColor, v); }
1657 void setVisitedLinkBorderTopColor(const Color& v) { SET_VAR(rareNonInherited Data, m_visitedLinkBorderTopColor, v); } 1653 void setVisitedLinkBorderTopColor(const Color& v) { SET_VAR(rareNonInherited Data, m_visitedLinkBorderTopColor, v); }
1658 void setVisitedLinkOutlineColor(const Color& v) { SET_VAR(rareNonInheritedDa ta, m_visitedLinkOutlineColor, v); } 1654 void setVisitedLinkOutlineColor(const Color& v) { SET_VAR(rareNonInheritedDa ta, m_visitedLinkOutlineColor, v); }
1659 void setVisitedLinkColumnRuleColor(const Color& v) { SET_VAR(rareNonInherite dData.access()->m_multiCol, m_visitedLinkColumnRuleColor, v); } 1655 void setVisitedLinkColumnRuleColor(const Color& v) { SET_VAR(rareNonInherite dData.access()->m_multiCol, m_visitedLinkColumnRuleColor, v); }
1660 #if ENABLE(CSS3_TEXT)
1661 void setVisitedLinkTextDecorationColor(const Color& v) { SET_VAR(rareNonInhe ritedData, m_visitedLinkTextDecorationColor, v); } 1656 void setVisitedLinkTextDecorationColor(const Color& v) { SET_VAR(rareNonInhe ritedData, m_visitedLinkTextDecorationColor, v); }
1662 #endif // CSS3_TEXT
1663 void setVisitedLinkTextEmphasisColor(const Color& v) { SET_VAR(rareInherited Data, visitedLinkTextEmphasisColor, v); } 1657 void setVisitedLinkTextEmphasisColor(const Color& v) { SET_VAR(rareInherited Data, visitedLinkTextEmphasisColor, v); }
1664 void setVisitedLinkTextFillColor(const Color& v) { SET_VAR(rareInheritedData , visitedLinkTextFillColor, v); } 1658 void setVisitedLinkTextFillColor(const Color& v) { SET_VAR(rareInheritedData , visitedLinkTextFillColor, v); }
1665 void setVisitedLinkTextStrokeColor(const Color& v) { SET_VAR(rareInheritedDa ta, visitedLinkTextStrokeColor, v); } 1659 void setVisitedLinkTextStrokeColor(const Color& v) { SET_VAR(rareInheritedDa ta, visitedLinkTextStrokeColor, v); }
1666 1660
1667 void inheritUnicodeBidiFrom(const RenderStyle* parent) { noninherited_flags. _unicodeBidi = parent->noninherited_flags._unicodeBidi; } 1661 void inheritUnicodeBidiFrom(const RenderStyle* parent) { noninherited_flags. _unicodeBidi = parent->noninherited_flags._unicodeBidi; }
1668 void getShadowExtent(const ShadowData*, LayoutUnit& top, LayoutUnit& right, LayoutUnit& bottom, LayoutUnit& left) const; 1662 void getShadowExtent(const ShadowData*, LayoutUnit& top, LayoutUnit& right, LayoutUnit& bottom, LayoutUnit& left) const;
1669 LayoutBoxExtent getShadowInsetExtent(const ShadowData*) const; 1663 LayoutBoxExtent getShadowInsetExtent(const ShadowData*) const;
1670 void getShadowHorizontalExtent(const ShadowData*, LayoutUnit& left, LayoutUn it& right) const; 1664 void getShadowHorizontalExtent(const ShadowData*, LayoutUnit& left, LayoutUn it& right) const;
1671 void getShadowVerticalExtent(const ShadowData*, LayoutUnit& top, LayoutUnit& bottom) const; 1665 void getShadowVerticalExtent(const ShadowData*, LayoutUnit& top, LayoutUnit& bottom) const;
1672 void getShadowInlineDirectionExtent(const ShadowData* shadow, LayoutUnit& lo gicalLeft, LayoutUnit& logicalRight) const 1666 void getShadowInlineDirectionExtent(const ShadowData* shadow, LayoutUnit& lo gicalLeft, LayoutUnit& logicalRight) const
(...skipping 30 matching lines...) Expand all
1703 Color textFillColor() const { return rareInheritedData->textFillColor; } 1697 Color textFillColor() const { return rareInheritedData->textFillColor; }
1704 Color textStrokeColor() const { return rareInheritedData->textStrokeColor; } 1698 Color textStrokeColor() const { return rareInheritedData->textStrokeColor; }
1705 Color visitedLinkColor() const; 1699 Color visitedLinkColor() const;
1706 Color visitedLinkBackgroundColor() const { return rareNonInheritedData->m_vi sitedLinkBackgroundColor; } 1700 Color visitedLinkBackgroundColor() const { return rareNonInheritedData->m_vi sitedLinkBackgroundColor; }
1707 Color visitedLinkBorderLeftColor() const { return rareNonInheritedData->m_vi sitedLinkBorderLeftColor; } 1701 Color visitedLinkBorderLeftColor() const { return rareNonInheritedData->m_vi sitedLinkBorderLeftColor; }
1708 Color visitedLinkBorderRightColor() const { return rareNonInheritedData->m_v isitedLinkBorderRightColor; } 1702 Color visitedLinkBorderRightColor() const { return rareNonInheritedData->m_v isitedLinkBorderRightColor; }
1709 Color visitedLinkBorderBottomColor() const { return rareNonInheritedData->m_ visitedLinkBorderBottomColor; } 1703 Color visitedLinkBorderBottomColor() const { return rareNonInheritedData->m_ visitedLinkBorderBottomColor; }
1710 Color visitedLinkBorderTopColor() const { return rareNonInheritedData->m_vis itedLinkBorderTopColor; } 1704 Color visitedLinkBorderTopColor() const { return rareNonInheritedData->m_vis itedLinkBorderTopColor; }
1711 Color visitedLinkOutlineColor() const { return rareNonInheritedData->m_visit edLinkOutlineColor; } 1705 Color visitedLinkOutlineColor() const { return rareNonInheritedData->m_visit edLinkOutlineColor; }
1712 Color visitedLinkColumnRuleColor() const { return rareNonInheritedData->m_mu ltiCol->m_visitedLinkColumnRuleColor; } 1706 Color visitedLinkColumnRuleColor() const { return rareNonInheritedData->m_mu ltiCol->m_visitedLinkColumnRuleColor; }
1713 #if ENABLE(CSS3_TEXT)
1714 Color textDecorationColor() const { return rareNonInheritedData->m_textDecor ationColor; } 1707 Color textDecorationColor() const { return rareNonInheritedData->m_textDecor ationColor; }
1715 Color visitedLinkTextDecorationColor() const { return rareNonInheritedData-> m_visitedLinkTextDecorationColor; } 1708 Color visitedLinkTextDecorationColor() const { return rareNonInheritedData-> m_visitedLinkTextDecorationColor; }
1716 #endif // CSS3_TEXT
1717 Color visitedLinkTextEmphasisColor() const { return rareInheritedData->visit edLinkTextEmphasisColor; } 1709 Color visitedLinkTextEmphasisColor() const { return rareInheritedData->visit edLinkTextEmphasisColor; }
1718 Color visitedLinkTextFillColor() const { return rareInheritedData->visitedLi nkTextFillColor; } 1710 Color visitedLinkTextFillColor() const { return rareInheritedData->visitedLi nkTextFillColor; }
1719 Color visitedLinkTextStrokeColor() const { return rareInheritedData->visited LinkTextStrokeColor; } 1711 Color visitedLinkTextStrokeColor() const { return rareInheritedData->visited LinkTextStrokeColor; }
1720 1712
1721 Color colorIncludingFallback(int colorProperty, bool visitedLink) const; 1713 Color colorIncludingFallback(int colorProperty, bool visitedLink) const;
1722 1714
1723 Color stopColor() const { return svgStyle()->stopColor(); } 1715 Color stopColor() const { return svgStyle()->stopColor(); }
1724 Color floodColor() const { return svgStyle()->floodColor(); } 1716 Color floodColor() const { return svgStyle()->floodColor(); }
1725 Color lightingColor() const { return svgStyle()->lightingColor(); } 1717 Color lightingColor() const { return svgStyle()->lightingColor(); }
1726 1718
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
1775 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation)) 1767 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation))
1776 return false; 1768 return false;
1777 1769
1778 rareInheritedData.access()->m_textOrientation = textOrientation; 1770 rareInheritedData.access()->m_textOrientation = textOrientation;
1779 return true; 1771 return true;
1780 } 1772 }
1781 1773
1782 } // namespace WebCore 1774 } // namespace WebCore
1783 1775
1784 #endif // RenderStyle_h 1776 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderObject.cpp ('k') | Source/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698