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

Side by Side Diff: third_party/WebKit/Source/core/style/ComputedStyle.cpp

Issue 1710003002: Unprefix multicol properties. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase master Created 4 years, 10 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
OLDNEW
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 1516 matching lines...) Expand 10 before | Expand all | Expand 10 after
1527 case CSSPropertyBorderBottomColor: 1527 case CSSPropertyBorderBottomColor:
1528 result = visitedLink ? visitedLinkBorderBottomColor() : borderBottomColo r(); 1528 result = visitedLink ? visitedLinkBorderBottomColor() : borderBottomColo r();
1529 borderStyle = borderBottomStyle(); 1529 borderStyle = borderBottomStyle();
1530 break; 1530 break;
1531 case CSSPropertyColor: 1531 case CSSPropertyColor:
1532 result = visitedLink ? visitedLinkColor() : color(); 1532 result = visitedLink ? visitedLinkColor() : color();
1533 break; 1533 break;
1534 case CSSPropertyOutlineColor: 1534 case CSSPropertyOutlineColor:
1535 result = visitedLink ? visitedLinkOutlineColor() : outlineColor(); 1535 result = visitedLink ? visitedLinkOutlineColor() : outlineColor();
1536 break; 1536 break;
1537 case CSSPropertyWebkitColumnRuleColor: 1537 case CSSPropertyColumnRuleColor:
1538 result = visitedLink ? visitedLinkColumnRuleColor() : columnRuleColor(); 1538 result = visitedLink ? visitedLinkColumnRuleColor() : columnRuleColor();
1539 break; 1539 break;
1540 case CSSPropertyWebkitTextEmphasisColor: 1540 case CSSPropertyWebkitTextEmphasisColor:
1541 result = visitedLink ? visitedLinkTextEmphasisColor() : textEmphasisColo r(); 1541 result = visitedLink ? visitedLinkTextEmphasisColor() : textEmphasisColo r();
1542 break; 1542 break;
1543 case CSSPropertyWebkitTextFillColor: 1543 case CSSPropertyWebkitTextFillColor:
1544 result = visitedLink ? visitedLinkTextFillColor() : textFillColor(); 1544 result = visitedLink ? visitedLinkTextFillColor() : textFillColor();
1545 break; 1545 break;
1546 case CSSPropertyWebkitTextStrokeColor: 1546 case CSSPropertyWebkitTextStrokeColor:
1547 result = visitedLink ? visitedLinkTextStrokeColor() : textStrokeColor(); 1547 result = visitedLink ? visitedLinkTextStrokeColor() : textStrokeColor();
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
1731 return 0; 1731 return 0;
1732 if (outlineStyleIsAuto()) 1732 if (outlineStyleIsAuto())
1733 return GraphicsContext::focusRingOutsetExtent(outlineOffset(), outlineWi dth()); 1733 return GraphicsContext::focusRingOutsetExtent(outlineOffset(), outlineWi dth());
1734 return std::max(0, outlineWidth() + outlineOffset()); 1734 return std::max(0, outlineWidth() + outlineOffset());
1735 } 1735 }
1736 1736
1737 bool ComputedStyle::columnRuleEquivalent(const ComputedStyle* otherStyle) const 1737 bool ComputedStyle::columnRuleEquivalent(const ComputedStyle* otherStyle) const
1738 { 1738 {
1739 return columnRuleStyle() == otherStyle->columnRuleStyle() 1739 return columnRuleStyle() == otherStyle->columnRuleStyle()
1740 && columnRuleWidth() == otherStyle->columnRuleWidth() 1740 && columnRuleWidth() == otherStyle->columnRuleWidth()
1741 && visitedDependentColor(CSSPropertyWebkitColumnRuleColor) == otherStyle ->visitedDependentColor(CSSPropertyWebkitColumnRuleColor); 1741 && visitedDependentColor(CSSPropertyColumnRuleColor) == otherStyle->visi tedDependentColor(CSSPropertyColumnRuleColor);
1742 } 1742 }
1743 1743
1744 TextEmphasisMark ComputedStyle::textEmphasisMark() const 1744 TextEmphasisMark ComputedStyle::textEmphasisMark() const
1745 { 1745 {
1746 TextEmphasisMark mark = static_cast<TextEmphasisMark>(rareInheritedData->tex tEmphasisMark); 1746 TextEmphasisMark mark = static_cast<TextEmphasisMark>(rareInheritedData->tex tEmphasisMark);
1747 if (mark != TextEmphasisMarkAuto) 1747 if (mark != TextEmphasisMarkAuto)
1748 return mark; 1748 return mark;
1749 1749
1750 if (isHorizontalWritingMode()) 1750 if (isHorizontalWritingMode())
1751 return TextEmphasisMarkDot; 1751 return TextEmphasisMarkDot;
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
1874 if (!shadowList) 1874 if (!shadowList)
1875 return false; 1875 return false;
1876 for (size_t i = shadowList->shadows().size(); i--; ) { 1876 for (size_t i = shadowList->shadows().size(); i--; ) {
1877 if (shadowList->shadows()[i].color().isCurrentColor()) 1877 if (shadowList->shadows()[i].color().isCurrentColor())
1878 return true; 1878 return true;
1879 } 1879 }
1880 return false; 1880 return false;
1881 } 1881 }
1882 1882
1883 } // namespace blink 1883 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698