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 1491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1502 { | 1502 { |
1503 ASSERT(path); | 1503 ASSERT(path); |
1504 rareNonInheritedData.access()->m_transform.access()->m_motion.m_path = path; | 1504 rareNonInheritedData.access()->m_transform.access()->m_motion.m_path = path; |
1505 } | 1505 } |
1506 | 1506 |
1507 void RenderStyle::resetMotionPath() | 1507 void RenderStyle::resetMotionPath() |
1508 { | 1508 { |
1509 rareNonInheritedData.access()->m_transform.access()->m_motion.m_path = nullp
tr; | 1509 rareNonInheritedData.access()->m_transform.access()->m_motion.m_path = nullp
tr; |
1510 } | 1510 } |
1511 | 1511 |
| 1512 bool RenderStyle::columnRuleEquivalent(const RenderStyle* otherStyle) const |
| 1513 { |
| 1514 return columnRuleStyle() == otherStyle->columnRuleStyle() |
| 1515 && columnRuleWidth() == otherStyle->columnRuleWidth() |
| 1516 && visitedDependentColor(CSSPropertyWebkitColumnRuleColor) == otherStyle
->visitedDependentColor(CSSPropertyWebkitColumnRuleColor); |
| 1517 } |
| 1518 |
1512 TextEmphasisMark RenderStyle::textEmphasisMark() const | 1519 TextEmphasisMark RenderStyle::textEmphasisMark() const |
1513 { | 1520 { |
1514 TextEmphasisMark mark = static_cast<TextEmphasisMark>(rareInheritedData->tex
tEmphasisMark); | 1521 TextEmphasisMark mark = static_cast<TextEmphasisMark>(rareInheritedData->tex
tEmphasisMark); |
1515 if (mark != TextEmphasisMarkAuto) | 1522 if (mark != TextEmphasisMarkAuto) |
1516 return mark; | 1523 return mark; |
1517 | 1524 |
1518 if (isHorizontalWritingMode()) | 1525 if (isHorizontalWritingMode()) |
1519 return TextEmphasisMarkDot; | 1526 return TextEmphasisMarkDot; |
1520 | 1527 |
1521 return TextEmphasisMarkSesame; | 1528 return TextEmphasisMarkSesame; |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1647 horizontal || includeLogicalRightEdge); | 1654 horizontal || includeLogicalRightEdge); |
1648 | 1655 |
1649 edges[BSLeft] = BorderEdge(borderLeftWidth(), | 1656 edges[BSLeft] = BorderEdge(borderLeftWidth(), |
1650 visitedDependentColor(CSSPropertyBorderLeftColor), | 1657 visitedDependentColor(CSSPropertyBorderLeftColor), |
1651 borderLeftStyle(), | 1658 borderLeftStyle(), |
1652 borderLeftIsTransparent(), | 1659 borderLeftIsTransparent(), |
1653 !horizontal || includeLogicalLeftEdge); | 1660 !horizontal || includeLogicalLeftEdge); |
1654 } | 1661 } |
1655 | 1662 |
1656 } // namespace blink | 1663 } // namespace blink |
OLD | NEW |