| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) | 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
reserved. |
| 4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. | 4 * Copyright (C) 2011 Adobe Systems Incorporated. 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 1396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1407 case CSSPropertyBorderBottomColor: | 1407 case CSSPropertyBorderBottomColor: |
| 1408 result = visitedLink ? visitedLinkBorderBottomColor() : borderBottomColo
r(); | 1408 result = visitedLink ? visitedLinkBorderBottomColor() : borderBottomColo
r(); |
| 1409 borderStyle = borderBottomStyle(); | 1409 borderStyle = borderBottomStyle(); |
| 1410 break; | 1410 break; |
| 1411 case CSSPropertyColor: | 1411 case CSSPropertyColor: |
| 1412 result = visitedLink ? visitedLinkColor() : color(); | 1412 result = visitedLink ? visitedLinkColor() : color(); |
| 1413 break; | 1413 break; |
| 1414 case CSSPropertyOutlineColor: | 1414 case CSSPropertyOutlineColor: |
| 1415 result = visitedLink ? visitedLinkOutlineColor() : outlineColor(); | 1415 result = visitedLink ? visitedLinkOutlineColor() : outlineColor(); |
| 1416 break; | 1416 break; |
| 1417 case CSSPropertyWebkitColumnRuleColor: | 1417 case CSSPropertyColumnRuleColor: |
| 1418 result = visitedLink ? visitedLinkColumnRuleColor() : columnRuleColor(); | 1418 result = visitedLink ? visitedLinkColumnRuleColor() : columnRuleColor(); |
| 1419 break; | 1419 break; |
| 1420 case CSSPropertyWebkitTextEmphasisColor: | 1420 case CSSPropertyWebkitTextEmphasisColor: |
| 1421 result = visitedLink ? visitedLinkTextEmphasisColor() : textEmphasisColo
r(); | 1421 result = visitedLink ? visitedLinkTextEmphasisColor() : textEmphasisColo
r(); |
| 1422 break; | 1422 break; |
| 1423 case CSSPropertyWebkitTextFillColor: | 1423 case CSSPropertyWebkitTextFillColor: |
| 1424 result = visitedLink ? visitedLinkTextFillColor() : textFillColor(); | 1424 result = visitedLink ? visitedLinkTextFillColor() : textFillColor(); |
| 1425 break; | 1425 break; |
| 1426 case CSSPropertyWebkitTextStrokeColor: | 1426 case CSSPropertyWebkitTextStrokeColor: |
| 1427 result = visitedLink ? visitedLinkTextStrokeColor() : textStrokeColor(); | 1427 result = visitedLink ? visitedLinkTextStrokeColor() : textStrokeColor(); |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1606 | 1606 |
| 1607 void ComputedStyle::resetMotionPath() | 1607 void ComputedStyle::resetMotionPath() |
| 1608 { | 1608 { |
| 1609 rareNonInheritedData.access()->m_transform.access()->m_motion.m_path = nullp
tr; | 1609 rareNonInheritedData.access()->m_transform.access()->m_motion.m_path = nullp
tr; |
| 1610 } | 1610 } |
| 1611 | 1611 |
| 1612 bool ComputedStyle::columnRuleEquivalent(const ComputedStyle* otherStyle) const | 1612 bool ComputedStyle::columnRuleEquivalent(const ComputedStyle* otherStyle) const |
| 1613 { | 1613 { |
| 1614 return columnRuleStyle() == otherStyle->columnRuleStyle() | 1614 return columnRuleStyle() == otherStyle->columnRuleStyle() |
| 1615 && columnRuleWidth() == otherStyle->columnRuleWidth() | 1615 && columnRuleWidth() == otherStyle->columnRuleWidth() |
| 1616 && visitedDependentColor(CSSPropertyWebkitColumnRuleColor) == otherStyle
->visitedDependentColor(CSSPropertyWebkitColumnRuleColor); | 1616 && visitedDependentColor(CSSPropertyColumnRuleColor) == otherStyle->visi
tedDependentColor(CSSPropertyColumnRuleColor); |
| 1617 } | 1617 } |
| 1618 | 1618 |
| 1619 TextEmphasisMark ComputedStyle::textEmphasisMark() const | 1619 TextEmphasisMark ComputedStyle::textEmphasisMark() const |
| 1620 { | 1620 { |
| 1621 TextEmphasisMark mark = static_cast<TextEmphasisMark>(rareInheritedData->tex
tEmphasisMark); | 1621 TextEmphasisMark mark = static_cast<TextEmphasisMark>(rareInheritedData->tex
tEmphasisMark); |
| 1622 if (mark != TextEmphasisMarkAuto) | 1622 if (mark != TextEmphasisMarkAuto) |
| 1623 return mark; | 1623 return mark; |
| 1624 | 1624 |
| 1625 if (isHorizontalWritingMode()) | 1625 if (isHorizontalWritingMode()) |
| 1626 return TextEmphasisMarkDot; | 1626 return TextEmphasisMarkDot; |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1736 } | 1736 } |
| 1737 | 1737 |
| 1738 void ComputedStyle::copyChildDependentFlagsFrom(const ComputedStyle& other) | 1738 void ComputedStyle::copyChildDependentFlagsFrom(const ComputedStyle& other) |
| 1739 { | 1739 { |
| 1740 setEmptyState(other.emptyState()); | 1740 setEmptyState(other.emptyState()); |
| 1741 if (other.hasExplicitlyInheritedProperties()) | 1741 if (other.hasExplicitlyInheritedProperties()) |
| 1742 setHasExplicitlyInheritedProperties(); | 1742 setHasExplicitlyInheritedProperties(); |
| 1743 } | 1743 } |
| 1744 | 1744 |
| 1745 } // namespace blink | 1745 } // namespace blink |
| OLD | NEW |