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

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

Issue 746173002: Respect fallback colors when interpolating text-decoration-color. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 1 month 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 1485 matching lines...) Expand 10 before | Expand all | Expand 10 after
1496 1496
1497 bool isSharable() const; 1497 bool isSharable() const;
1498 1498
1499 bool emptyState() const { return noninherited_flags.emptyState; } 1499 bool emptyState() const { return noninherited_flags.emptyState; }
1500 void setEmptyState(bool b) { setUnique(); noninherited_flags.emptyState = b; } 1500 void setEmptyState(bool b) { setUnique(); noninherited_flags.emptyState = b; }
1501 bool firstChildState() const { return noninherited_flags.firstChildState; } 1501 bool firstChildState() const { return noninherited_flags.firstChildState; }
1502 void setFirstChildState() { setUnique(); noninherited_flags.firstChildState = true; } 1502 void setFirstChildState() { setUnique(); noninherited_flags.firstChildState = true; }
1503 bool lastChildState() const { return noninherited_flags.lastChildState; } 1503 bool lastChildState() const { return noninherited_flags.lastChildState; }
1504 void setLastChildState() { setUnique(); noninherited_flags.lastChildState = true; } 1504 void setLastChildState() { setUnique(); noninherited_flags.lastChildState = true; }
1505 1505
1506 StyleColor visitedDependentDecorationStyleColor() const;
1507 Color visitedDependentDecorationColor() const;
1508 Color visitedDependentColor(int colorProperty) const; 1506 Color visitedDependentColor(int colorProperty) const;
1509 1507
1510 void setHasExplicitlyInheritedProperties() { noninherited_flags.explicitInhe ritance = true; } 1508 void setHasExplicitlyInheritedProperties() { noninherited_flags.explicitInhe ritance = true; }
1511 bool hasExplicitlyInheritedProperties() const { return noninherited_flags.ex plicitInheritance; } 1509 bool hasExplicitlyInheritedProperties() const { return noninherited_flags.ex plicitInheritance; }
1512 1510
1513 bool hasBoxDecorations() const { return hasBorder() || hasBorderRadius() || hasOutline() || hasAppearance() || boxShadow() || hasFilter(); } 1511 bool hasBoxDecorations() const { return hasBorder() || hasBorderRadius() || hasOutline() || hasAppearance() || boxShadow() || hasFilter(); }
1514 1512
1515 bool borderObscuresBackground() const; 1513 bool borderObscuresBackground() const;
1516 void getBorderEdgeInfo(BorderEdge edges[], bool includeLogicalLeftEdge = tru e, bool includeLogicalRightEdge = true) const; 1514 void getBorderEdgeInfo(BorderEdge edges[], bool includeLogicalLeftEdge = tru e, bool includeLogicalRightEdge = true) const;
1517 1515
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
1769 StyleColor visitedLinkBorderBottomColor() const { return rareNonInheritedDat a->m_visitedLinkBorderBottomColor; } 1767 StyleColor visitedLinkBorderBottomColor() const { return rareNonInheritedDat a->m_visitedLinkBorderBottomColor; }
1770 StyleColor visitedLinkBorderTopColor() const { return rareNonInheritedData-> m_visitedLinkBorderTopColor; } 1768 StyleColor visitedLinkBorderTopColor() const { return rareNonInheritedData-> m_visitedLinkBorderTopColor; }
1771 StyleColor visitedLinkOutlineColor() const { return rareNonInheritedData->m_ visitedLinkOutlineColor; } 1769 StyleColor visitedLinkOutlineColor() const { return rareNonInheritedData->m_ visitedLinkOutlineColor; }
1772 StyleColor visitedLinkColumnRuleColor() const { return rareNonInheritedData- >m_multiCol->m_visitedLinkColumnRuleColor; } 1770 StyleColor visitedLinkColumnRuleColor() const { return rareNonInheritedData- >m_multiCol->m_visitedLinkColumnRuleColor; }
1773 StyleColor textDecorationColor() const { return rareNonInheritedData->m_text DecorationColor; } 1771 StyleColor textDecorationColor() const { return rareNonInheritedData->m_text DecorationColor; }
1774 StyleColor visitedLinkTextDecorationColor() const { return rareNonInheritedD ata->m_visitedLinkTextDecorationColor; } 1772 StyleColor visitedLinkTextDecorationColor() const { return rareNonInheritedD ata->m_visitedLinkTextDecorationColor; }
1775 StyleColor visitedLinkTextEmphasisColor() const { return rareInheritedData-> visitedLinkTextEmphasisColor(); } 1773 StyleColor visitedLinkTextEmphasisColor() const { return rareInheritedData-> visitedLinkTextEmphasisColor(); }
1776 StyleColor visitedLinkTextFillColor() const { return rareInheritedData->visi tedLinkTextFillColor(); } 1774 StyleColor visitedLinkTextFillColor() const { return rareInheritedData->visi tedLinkTextFillColor(); }
1777 StyleColor visitedLinkTextStrokeColor() const { return rareInheritedData->vi sitedLinkTextStrokeColor(); } 1775 StyleColor visitedLinkTextStrokeColor() const { return rareInheritedData->vi sitedLinkTextStrokeColor(); }
1778 1776
1777 StyleColor decorationColorIncludingFallback(bool visitedLink) const;
1779 Color colorIncludingFallback(int colorProperty, bool visitedLink) const; 1778 Color colorIncludingFallback(int colorProperty, bool visitedLink) const;
1780 1779
1781 Color stopColor() const { return svgStyle().stopColor(); } 1780 Color stopColor() const { return svgStyle().stopColor(); }
1782 Color floodColor() const { return svgStyle().floodColor(); } 1781 Color floodColor() const { return svgStyle().floodColor(); }
1783 Color lightingColor() const { return svgStyle().lightingColor(); } 1782 Color lightingColor() const { return svgStyle().lightingColor(); }
1784 1783
1785 void appendContent(PassOwnPtr<ContentData>); 1784 void appendContent(PassOwnPtr<ContentData>);
1786 void addAppliedTextDecoration(const AppliedTextDecoration&); 1785 void addAppliedTextDecoration(const AppliedTextDecoration&);
1787 1786
1788 bool diffNeedsFullLayoutAndPaintInvalidation(const RenderStyle& other) const ; 1787 bool diffNeedsFullLayoutAndPaintInvalidation(const RenderStyle& other) const ;
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
1897 inline bool RenderStyle::hasPseudoElementStyle() const 1896 inline bool RenderStyle::hasPseudoElementStyle() const
1898 { 1897 {
1899 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; 1898 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;
1900 } 1899 }
1901 1900
1902 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1901 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1903 1902
1904 } // namespace blink 1903 } // namespace blink
1905 1904
1906 #endif // RenderStyle_h 1905 #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