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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: Source/core/rendering/style/RenderStyle.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: Updated css-properties-as-js-properties.html layout test expectations to match new properties. 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
« Source/core/rendering/RootInlineBox.h ('K') | « Source/core/rendering/RootInlineBox.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 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 545
546 Length textIndent() const { return rareInheritedData->indent; } 546 Length textIndent() const { return rareInheritedData->indent; }
547 #if ENABLE(CSS3_TEXT) 547 #if ENABLE(CSS3_TEXT)
548 TextIndentLine textIndentLine() const { return static_cast<TextIndentLine>(r areInheritedData->m_textIndentLine); } 548 TextIndentLine textIndentLine() const { return static_cast<TextIndentLine>(r areInheritedData->m_textIndentLine); }
549 #endif 549 #endif
550 ETextAlign textAlign() const { return static_cast<ETextAlign>(inherited_flag s._text_align); } 550 ETextAlign textAlign() const { return static_cast<ETextAlign>(inherited_flag s._text_align); }
551 ETextTransform textTransform() const { return static_cast<ETextTransform>(in herited_flags._text_transform); } 551 ETextTransform textTransform() const { return static_cast<ETextTransform>(in herited_flags._text_transform); }
552 ETextDecoration textDecorationsInEffect() const { return static_cast<ETextDe coration>(inherited_flags._text_decorations); } 552 ETextDecoration textDecorationsInEffect() const { return static_cast<ETextDe coration>(inherited_flags._text_decorations); }
553 ETextDecoration textDecoration() const { return static_cast<ETextDecoration> (visual->textDecoration); } 553 ETextDecoration textDecoration() const { return static_cast<ETextDecoration> (visual->textDecoration); }
554 #if ENABLE(CSS3_TEXT) 554 #if ENABLE(CSS3_TEXT)
555 TextAlignLast textAlignLast() const { return static_cast<TextAlignLast>(rare InheritedData->m_textAlignLast); }
556 #endif // CSS3_TEXT
555 TextDecorationStyle textDecorationStyle() const { return static_cast<TextDec orationStyle>(rareNonInheritedData->m_textDecorationStyle); } 557 TextDecorationStyle textDecorationStyle() const { return static_cast<TextDec orationStyle>(rareNonInheritedData->m_textDecorationStyle); }
556 TextAlignLast textAlignLast() const { return static_cast<TextAlignLast>(rare InheritedData->m_textAlignLast); }
557 TextUnderlinePosition textUnderlinePosition() const { return static_cast<Tex tUnderlinePosition>(rareInheritedData->m_textUnderlinePosition); } 558 TextUnderlinePosition textUnderlinePosition() const { return static_cast<Tex tUnderlinePosition>(rareInheritedData->m_textUnderlinePosition); }
558 #else
559 TextDecorationStyle textDecorationStyle() const { return TextDecorationStyle Solid; }
560 #endif // CSS3_TEXT
561 int wordSpacing() const; 559 int wordSpacing() const;
562 int letterSpacing() const; 560 int letterSpacing() const;
563 561
564 float zoom() const { return visual->m_zoom; } 562 float zoom() const { return visual->m_zoom; }
565 float effectiveZoom() const { return rareInheritedData->m_effectiveZoom; } 563 float effectiveZoom() const { return rareInheritedData->m_effectiveZoom; }
566 564
567 TextDirection direction() const { return static_cast<TextDirection>(inherite d_flags._direction); } 565 TextDirection direction() const { return static_cast<TextDirection>(inherite d_flags._direction); }
568 bool isLeftToRightDirection() const { return direction() == LTR; } 566 bool isLeftToRightDirection() const { return direction() == LTR; }
569 567
570 Length specifiedLineHeight() const; 568 Length specifiedLineHeight() const;
(...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after
1058 void setTextIndent(Length v) { SET_VAR(rareInheritedData, indent, v); } 1056 void setTextIndent(Length v) { SET_VAR(rareInheritedData, indent, v); }
1059 #if ENABLE(CSS3_TEXT) 1057 #if ENABLE(CSS3_TEXT)
1060 void setTextIndentLine(TextIndentLine v) { SET_VAR(rareInheritedData, m_text IndentLine, v); } 1058 void setTextIndentLine(TextIndentLine v) { SET_VAR(rareInheritedData, m_text IndentLine, v); }
1061 #endif 1059 #endif
1062 void setTextAlign(ETextAlign v) { inherited_flags._text_align = v; } 1060 void setTextAlign(ETextAlign v) { inherited_flags._text_align = v; }
1063 void setTextTransform(ETextTransform v) { inherited_flags._text_transform = v; } 1061 void setTextTransform(ETextTransform v) { inherited_flags._text_transform = v; }
1064 void addToTextDecorationsInEffect(ETextDecoration v) { inherited_flags._text _decorations |= v; } 1062 void addToTextDecorationsInEffect(ETextDecoration v) { inherited_flags._text _decorations |= v; }
1065 void setTextDecorationsInEffect(ETextDecoration v) { inherited_flags._text_d ecorations = v; } 1063 void setTextDecorationsInEffect(ETextDecoration v) { inherited_flags._text_d ecorations = v; }
1066 void setTextDecoration(ETextDecoration v) { SET_VAR(visual, textDecoration, v); } 1064 void setTextDecoration(ETextDecoration v) { SET_VAR(visual, textDecoration, v); }
1067 #if ENABLE(CSS3_TEXT) 1065 #if ENABLE(CSS3_TEXT)
1066 void setTextAlignLast(TextAlignLast v) { SET_VAR(rareInheritedData, m_textAl ignLast, v); }
1067 #endif // CSS3_TEXT
1068 void setTextDecorationStyle(TextDecorationStyle v) { SET_VAR(rareNonInherite dData, m_textDecorationStyle, v); } 1068 void setTextDecorationStyle(TextDecorationStyle v) { SET_VAR(rareNonInherite dData, m_textDecorationStyle, v); }
1069 void setTextAlignLast(TextAlignLast v) { SET_VAR(rareInheritedData, m_textAl ignLast, v); }
1070 void setTextUnderlinePosition(TextUnderlinePosition v) { SET_VAR(rareInherit edData, m_textUnderlinePosition, v); } 1069 void setTextUnderlinePosition(TextUnderlinePosition v) { SET_VAR(rareInherit edData, m_textUnderlinePosition, v); }
1071 #endif // CSS3_TEXT
1072 void setDirection(TextDirection v) { inherited_flags._direction = v; } 1070 void setDirection(TextDirection v) { inherited_flags._direction = v; }
1073 void setLineHeight(Length specifiedLineHeight); 1071 void setLineHeight(Length specifiedLineHeight);
1074 bool setZoom(float); 1072 bool setZoom(float);
1075 void setZoomWithoutReturnValue(float f) { setZoom(f); } 1073 void setZoomWithoutReturnValue(float f) { setZoom(f); }
1076 bool setEffectiveZoom(float); 1074 bool setEffectiveZoom(float);
1077 1075
1078 void setImageRendering(EImageRendering v) { SET_VAR(rareInheritedData, m_ima geRendering, v); } 1076 void setImageRendering(EImageRendering v) { SET_VAR(rareInheritedData, m_ima geRendering, v); }
1079 1077
1080 void setWhiteSpace(EWhiteSpace v) { inherited_flags._white_space = v; } 1078 void setWhiteSpace(EWhiteSpace v) { inherited_flags._white_space = v; }
1081 1079
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
1256 void setRegionBreakBefore(EPageBreak p) { SET_VAR(rareNonInheritedData, m_re gionBreakBefore, p); } 1254 void setRegionBreakBefore(EPageBreak p) { SET_VAR(rareNonInheritedData, m_re gionBreakBefore, p); }
1257 void setRegionBreakInside(EPageBreak p) { ASSERT(p == PBAUTO || p == PBAVOID ); SET_VAR(rareNonInheritedData, m_regionBreakInside, p); } 1255 void setRegionBreakInside(EPageBreak p) { ASSERT(p == PBAUTO || p == PBAVOID ); SET_VAR(rareNonInheritedData, m_regionBreakInside, p); }
1258 void setRegionBreakAfter(EPageBreak p) { SET_VAR(rareNonInheritedData, m_reg ionBreakAfter, p); } 1256 void setRegionBreakAfter(EPageBreak p) { SET_VAR(rareNonInheritedData, m_reg ionBreakAfter, p); }
1259 void inheritColumnPropertiesFrom(RenderStyle* parent) { rareNonInheritedData .access()->m_multiCol = parent->rareNonInheritedData->m_multiCol; } 1257 void inheritColumnPropertiesFrom(RenderStyle* parent) { rareNonInheritedData .access()->m_multiCol = parent->rareNonInheritedData->m_multiCol; }
1260 void setTransform(const TransformOperations& ops) { SET_VAR(rareNonInherited Data.access()->m_transform, m_operations, ops); } 1258 void setTransform(const TransformOperations& ops) { SET_VAR(rareNonInherited Data.access()->m_transform, m_operations, ops); }
1261 void setTransformOriginX(Length l) { SET_VAR(rareNonInheritedData.access()-> m_transform, m_x, l); } 1259 void setTransformOriginX(Length l) { SET_VAR(rareNonInheritedData.access()-> m_transform, m_x, l); }
1262 void setTransformOriginY(Length l) { SET_VAR(rareNonInheritedData.access()-> m_transform, m_y, l); } 1260 void setTransformOriginY(Length l) { SET_VAR(rareNonInheritedData.access()-> m_transform, m_y, l); }
1263 void setTransformOriginZ(float f) { SET_VAR(rareNonInheritedData.access()->m _transform, m_z, f); } 1261 void setTransformOriginZ(float f) { SET_VAR(rareNonInheritedData.access()->m _transform, m_z, f); }
1264 void setSpeak(ESpeak s) { SET_VAR(rareInheritedData, speak, s); } 1262 void setSpeak(ESpeak s) { SET_VAR(rareInheritedData, speak, s); }
1265 void setTextCombine(TextCombine v) { SET_VAR(rareNonInheritedData, m_textCom bine, v); } 1263 void setTextCombine(TextCombine v) { SET_VAR(rareNonInheritedData, m_textCom bine, v); }
1266 #if ENABLE(CSS3_TEXT)
1267 void setTextDecorationColor(const Color& c) { SET_VAR(rareNonInheritedData, m_textDecorationColor, c); } 1264 void setTextDecorationColor(const Color& c) { SET_VAR(rareNonInheritedData, m_textDecorationColor, c); }
1268 #endif // CSS3_TEXT
1269 void setTextEmphasisColor(const Color& c) { SET_VAR(rareInheritedData, textE mphasisColor, c); } 1265 void setTextEmphasisColor(const Color& c) { SET_VAR(rareInheritedData, textE mphasisColor, c); }
1270 void setTextEmphasisFill(TextEmphasisFill fill) { SET_VAR(rareInheritedData, textEmphasisFill, fill); } 1266 void setTextEmphasisFill(TextEmphasisFill fill) { SET_VAR(rareInheritedData, textEmphasisFill, fill); }
1271 void setTextEmphasisMark(TextEmphasisMark mark) { SET_VAR(rareInheritedData, textEmphasisMark, mark); } 1267 void setTextEmphasisMark(TextEmphasisMark mark) { SET_VAR(rareInheritedData, textEmphasisMark, mark); }
1272 void setTextEmphasisCustomMark(const AtomicString& mark) { SET_VAR(rareInher itedData, textEmphasisCustomMark, mark); } 1268 void setTextEmphasisCustomMark(const AtomicString& mark) { SET_VAR(rareInher itedData, textEmphasisCustomMark, mark); }
1273 void setTextEmphasisPosition(TextEmphasisPosition position) { SET_VAR(rareIn heritedData, textEmphasisPosition, position); } 1269 void setTextEmphasisPosition(TextEmphasisPosition position) { SET_VAR(rareIn heritedData, textEmphasisPosition, position); }
1274 bool setTextOrientation(TextOrientation); 1270 bool setTextOrientation(TextOrientation);
1275 1271
1276 void setRubyPosition(RubyPosition position) { SET_VAR(rareInheritedData, m_r ubyPosition, position); } 1272 void setRubyPosition(RubyPosition position) { SET_VAR(rareInheritedData, m_r ubyPosition, position); }
1277 1273
1278 void setFilter(const FilterOperations& ops) { SET_VAR(rareNonInheritedData.a ccess()->m_filter, m_operations, ops); } 1274 void setFilter(const FilterOperations& ops) { SET_VAR(rareNonInheritedData.a ccess()->m_filter, m_operations, ops); }
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
1518 #if ENABLE(CSS3_TEXT) 1514 #if ENABLE(CSS3_TEXT)
1519 static TextIndentLine initialTextIndentLine() { return TextIndentFirstLine; } 1515 static TextIndentLine initialTextIndentLine() { return TextIndentFirstLine; }
1520 #endif 1516 #endif
1521 static EVerticalAlign initialVerticalAlign() { return BASELINE; } 1517 static EVerticalAlign initialVerticalAlign() { return BASELINE; }
1522 static short initialWidows() { return 2; } 1518 static short initialWidows() { return 2; }
1523 static short initialOrphans() { return 2; } 1519 static short initialOrphans() { return 2; }
1524 static Length initialLineHeight() { return Length(-100.0, Percent); } 1520 static Length initialLineHeight() { return Length(-100.0, Percent); }
1525 static ETextAlign initialTextAlign() { return TASTART; } 1521 static ETextAlign initialTextAlign() { return TASTART; }
1526 static ETextDecoration initialTextDecoration() { return TDNONE; } 1522 static ETextDecoration initialTextDecoration() { return TDNONE; }
1527 #if ENABLE(CSS3_TEXT) 1523 #if ENABLE(CSS3_TEXT)
1524 static TextAlignLast initialTextAlignLast() { return TextAlignLastAuto; }
1525 #endif // CSS3_TEXT
1528 static TextDecorationStyle initialTextDecorationStyle() { return TextDecorat ionStyleSolid; } 1526 static TextDecorationStyle initialTextDecorationStyle() { return TextDecorat ionStyleSolid; }
1529 static TextAlignLast initialTextAlignLast() { return TextAlignLastAuto; }
1530 static TextUnderlinePosition initialTextUnderlinePosition() { return TextUnd erlinePositionAuto; } 1527 static TextUnderlinePosition initialTextUnderlinePosition() { return TextUnd erlinePositionAuto; }
1531 #endif // CSS3_TEXT
1532 static float initialZoom() { return 1.0f; } 1528 static float initialZoom() { return 1.0f; }
1533 static int initialOutlineOffset() { return 0; } 1529 static int initialOutlineOffset() { return 0; }
1534 static float initialOpacity() { return 1.0f; } 1530 static float initialOpacity() { return 1.0f; }
1535 static EBoxAlignment initialBoxAlign() { return BSTRETCH; } 1531 static EBoxAlignment initialBoxAlign() { return BSTRETCH; }
1536 static EBoxDecorationBreak initialBoxDecorationBreak() { return DSLICE; } 1532 static EBoxDecorationBreak initialBoxDecorationBreak() { return DSLICE; }
1537 static EBoxDirection initialBoxDirection() { return BNORMAL; } 1533 static EBoxDirection initialBoxDirection() { return BNORMAL; }
1538 static EBoxLines initialBoxLines() { return SINGLE; } 1534 static EBoxLines initialBoxLines() { return SINGLE; }
1539 static EBoxOrient initialBoxOrient() { return HORIZONTAL; } 1535 static EBoxOrient initialBoxOrient() { return HORIZONTAL; }
1540 static EBoxPack initialBoxPack() { return Start; } 1536 static EBoxPack initialBoxPack() { return Start; }
1541 static float initialBoxFlex() { return 0.0f; } 1537 static float initialBoxFlex() { return 0.0f; }
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
1651 static BlendMode initialBlendMode() { return BlendModeNormal; } 1647 static BlendMode initialBlendMode() { return BlendModeNormal; }
1652 private: 1648 private:
1653 void setVisitedLinkColor(const Color&); 1649 void setVisitedLinkColor(const Color&);
1654 void setVisitedLinkBackgroundColor(const Color& v) { SET_VAR(rareNonInherite dData, m_visitedLinkBackgroundColor, v); } 1650 void setVisitedLinkBackgroundColor(const Color& v) { SET_VAR(rareNonInherite dData, m_visitedLinkBackgroundColor, v); }
1655 void setVisitedLinkBorderLeftColor(const Color& v) { SET_VAR(rareNonInherite dData, m_visitedLinkBorderLeftColor, v); } 1651 void setVisitedLinkBorderLeftColor(const Color& v) { SET_VAR(rareNonInherite dData, m_visitedLinkBorderLeftColor, v); }
1656 void setVisitedLinkBorderRightColor(const Color& v) { SET_VAR(rareNonInherit edData, m_visitedLinkBorderRightColor, v); } 1652 void setVisitedLinkBorderRightColor(const Color& v) { SET_VAR(rareNonInherit edData, m_visitedLinkBorderRightColor, v); }
1657 void setVisitedLinkBorderBottomColor(const Color& v) { SET_VAR(rareNonInheri tedData, m_visitedLinkBorderBottomColor, v); } 1653 void setVisitedLinkBorderBottomColor(const Color& v) { SET_VAR(rareNonInheri tedData, m_visitedLinkBorderBottomColor, v); }
1658 void setVisitedLinkBorderTopColor(const Color& v) { SET_VAR(rareNonInherited Data, m_visitedLinkBorderTopColor, v); } 1654 void setVisitedLinkBorderTopColor(const Color& v) { SET_VAR(rareNonInherited Data, m_visitedLinkBorderTopColor, v); }
1659 void setVisitedLinkOutlineColor(const Color& v) { SET_VAR(rareNonInheritedDa ta, m_visitedLinkOutlineColor, v); } 1655 void setVisitedLinkOutlineColor(const Color& v) { SET_VAR(rareNonInheritedDa ta, m_visitedLinkOutlineColor, v); }
1660 void setVisitedLinkColumnRuleColor(const Color& v) { SET_VAR(rareNonInherite dData.access()->m_multiCol, m_visitedLinkColumnRuleColor, v); } 1656 void setVisitedLinkColumnRuleColor(const Color& v) { SET_VAR(rareNonInherite dData.access()->m_multiCol, m_visitedLinkColumnRuleColor, v); }
1661 #if ENABLE(CSS3_TEXT)
1662 void setVisitedLinkTextDecorationColor(const Color& v) { SET_VAR(rareNonInhe ritedData, m_visitedLinkTextDecorationColor, v); } 1657 void setVisitedLinkTextDecorationColor(const Color& v) { SET_VAR(rareNonInhe ritedData, m_visitedLinkTextDecorationColor, v); }
1663 #endif // CSS3_TEXT
1664 void setVisitedLinkTextEmphasisColor(const Color& v) { SET_VAR(rareInherited Data, visitedLinkTextEmphasisColor, v); } 1658 void setVisitedLinkTextEmphasisColor(const Color& v) { SET_VAR(rareInherited Data, visitedLinkTextEmphasisColor, v); }
1665 void setVisitedLinkTextFillColor(const Color& v) { SET_VAR(rareInheritedData , visitedLinkTextFillColor, v); } 1659 void setVisitedLinkTextFillColor(const Color& v) { SET_VAR(rareInheritedData , visitedLinkTextFillColor, v); }
1666 void setVisitedLinkTextStrokeColor(const Color& v) { SET_VAR(rareInheritedDa ta, visitedLinkTextStrokeColor, v); } 1660 void setVisitedLinkTextStrokeColor(const Color& v) { SET_VAR(rareInheritedDa ta, visitedLinkTextStrokeColor, v); }
1667 1661
1668 void inheritUnicodeBidiFrom(const RenderStyle* parent) { noninherited_flags. _unicodeBidi = parent->noninherited_flags._unicodeBidi; } 1662 void inheritUnicodeBidiFrom(const RenderStyle* parent) { noninherited_flags. _unicodeBidi = parent->noninherited_flags._unicodeBidi; }
1669 void getShadowExtent(const ShadowData*, LayoutUnit& top, LayoutUnit& right, LayoutUnit& bottom, LayoutUnit& left) const; 1663 void getShadowExtent(const ShadowData*, LayoutUnit& top, LayoutUnit& right, LayoutUnit& bottom, LayoutUnit& left) const;
1670 LayoutBoxExtent getShadowInsetExtent(const ShadowData*) const; 1664 LayoutBoxExtent getShadowInsetExtent(const ShadowData*) const;
1671 void getShadowHorizontalExtent(const ShadowData*, LayoutUnit& left, LayoutUn it& right) const; 1665 void getShadowHorizontalExtent(const ShadowData*, LayoutUnit& left, LayoutUn it& right) const;
1672 void getShadowVerticalExtent(const ShadowData*, LayoutUnit& top, LayoutUnit& bottom) const; 1666 void getShadowVerticalExtent(const ShadowData*, LayoutUnit& top, LayoutUnit& bottom) const;
1673 void getShadowInlineDirectionExtent(const ShadowData* shadow, LayoutUnit& lo gicalLeft, LayoutUnit& logicalRight) const 1667 void getShadowInlineDirectionExtent(const ShadowData* shadow, LayoutUnit& lo gicalLeft, LayoutUnit& logicalRight) const
(...skipping 30 matching lines...) Expand all
1704 Color textFillColor() const { return rareInheritedData->textFillColor; } 1698 Color textFillColor() const { return rareInheritedData->textFillColor; }
1705 Color textStrokeColor() const { return rareInheritedData->textStrokeColor; } 1699 Color textStrokeColor() const { return rareInheritedData->textStrokeColor; }
1706 Color visitedLinkColor() const; 1700 Color visitedLinkColor() const;
1707 Color visitedLinkBackgroundColor() const { return rareNonInheritedData->m_vi sitedLinkBackgroundColor; } 1701 Color visitedLinkBackgroundColor() const { return rareNonInheritedData->m_vi sitedLinkBackgroundColor; }
1708 Color visitedLinkBorderLeftColor() const { return rareNonInheritedData->m_vi sitedLinkBorderLeftColor; } 1702 Color visitedLinkBorderLeftColor() const { return rareNonInheritedData->m_vi sitedLinkBorderLeftColor; }
1709 Color visitedLinkBorderRightColor() const { return rareNonInheritedData->m_v isitedLinkBorderRightColor; } 1703 Color visitedLinkBorderRightColor() const { return rareNonInheritedData->m_v isitedLinkBorderRightColor; }
1710 Color visitedLinkBorderBottomColor() const { return rareNonInheritedData->m_ visitedLinkBorderBottomColor; } 1704 Color visitedLinkBorderBottomColor() const { return rareNonInheritedData->m_ visitedLinkBorderBottomColor; }
1711 Color visitedLinkBorderTopColor() const { return rareNonInheritedData->m_vis itedLinkBorderTopColor; } 1705 Color visitedLinkBorderTopColor() const { return rareNonInheritedData->m_vis itedLinkBorderTopColor; }
1712 Color visitedLinkOutlineColor() const { return rareNonInheritedData->m_visit edLinkOutlineColor; } 1706 Color visitedLinkOutlineColor() const { return rareNonInheritedData->m_visit edLinkOutlineColor; }
1713 Color visitedLinkColumnRuleColor() const { return rareNonInheritedData->m_mu ltiCol->m_visitedLinkColumnRuleColor; } 1707 Color visitedLinkColumnRuleColor() const { return rareNonInheritedData->m_mu ltiCol->m_visitedLinkColumnRuleColor; }
1714 #if ENABLE(CSS3_TEXT)
1715 Color textDecorationColor() const { return rareNonInheritedData->m_textDecor ationColor; } 1708 Color textDecorationColor() const { return rareNonInheritedData->m_textDecor ationColor; }
1716 Color visitedLinkTextDecorationColor() const { return rareNonInheritedData-> m_visitedLinkTextDecorationColor; } 1709 Color visitedLinkTextDecorationColor() const { return rareNonInheritedData-> m_visitedLinkTextDecorationColor; }
1717 #endif // CSS3_TEXT
1718 Color visitedLinkTextEmphasisColor() const { return rareInheritedData->visit edLinkTextEmphasisColor; } 1710 Color visitedLinkTextEmphasisColor() const { return rareInheritedData->visit edLinkTextEmphasisColor; }
1719 Color visitedLinkTextFillColor() const { return rareInheritedData->visitedLi nkTextFillColor; } 1711 Color visitedLinkTextFillColor() const { return rareInheritedData->visitedLi nkTextFillColor; }
1720 Color visitedLinkTextStrokeColor() const { return rareInheritedData->visited LinkTextStrokeColor; } 1712 Color visitedLinkTextStrokeColor() const { return rareInheritedData->visited LinkTextStrokeColor; }
1721 1713
1722 Color colorIncludingFallback(int colorProperty, bool visitedLink) const; 1714 Color colorIncludingFallback(int colorProperty, bool visitedLink) const;
1723 1715
1724 #if ENABLE(SVG) 1716 #if ENABLE(SVG)
1725 Color stopColor() const { return svgStyle()->stopColor(); } 1717 Color stopColor() const { return svgStyle()->stopColor(); }
1726 Color floodColor() const { return svgStyle()->floodColor(); } 1718 Color floodColor() const { return svgStyle()->floodColor(); }
1727 Color lightingColor() const { return svgStyle()->lightingColor(); } 1719 Color lightingColor() const { return svgStyle()->lightingColor(); }
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
1778 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation)) 1770 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation))
1779 return false; 1771 return false;
1780 1772
1781 rareInheritedData.access()->m_textOrientation = textOrientation; 1773 rareInheritedData.access()->m_textOrientation = textOrientation;
1782 return true; 1774 return true;
1783 } 1775 }
1784 1776
1785 } // namespace WebCore 1777 } // namespace WebCore
1786 1778
1787 #endif // RenderStyle_h 1779 #endif // RenderStyle_h
OLDNEW
« Source/core/rendering/RootInlineBox.h ('K') | « Source/core/rendering/RootInlineBox.cpp ('k') | Source/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698