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 1624 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1635 return TextEmphasisMarkDot; | 1635 return TextEmphasisMarkDot; |
1636 | 1636 |
1637 return TextEmphasisMarkSesame; | 1637 return TextEmphasisMarkSesame; |
1638 } | 1638 } |
1639 | 1639 |
1640 Color RenderStyle::initialTapHighlightColor() | 1640 Color RenderStyle::initialTapHighlightColor() |
1641 { | 1641 { |
1642 return RenderTheme::tapHighlightColor(); | 1642 return RenderTheme::tapHighlightColor(); |
1643 } | 1643 } |
1644 | 1644 |
1645 #if ENABLE(OILPAN) | |
haraken
2014/11/11 05:22:46
Can we avoid introducing the #if flag?
DEFINE_STA
sof
2014/11/12 13:45:07
I don't think CPP is entirely avoidable, as we nee
| |
1646 const FilterOperations& RenderStyle::initialFilter() | |
1647 { | |
1648 DEFINE_STATIC_LOCAL(Persistent<FilterOperationsWrapper>, ops, (FilterOperati onsWrapper::create())); | |
1649 return ops->operations(); | |
1650 } | |
1651 #endif | |
1652 | |
1645 LayoutBoxExtent RenderStyle::imageOutsets(const NinePieceImage& image) const | 1653 LayoutBoxExtent RenderStyle::imageOutsets(const NinePieceImage& image) const |
1646 { | 1654 { |
1647 return LayoutBoxExtent(NinePieceImage::computeOutset(image.outset().top(), b orderTopWidth()), | 1655 return LayoutBoxExtent(NinePieceImage::computeOutset(image.outset().top(), b orderTopWidth()), |
1648 NinePieceImage::computeOutset(image.outset().right(), borderRightWidth()), | 1656 NinePieceImage::computeOutset(image.outset().right(), borderRightWidth()), |
1649 NinePieceImage::computeOutset(image.outset().bottom() , borderBottomWidth()), | 1657 NinePieceImage::computeOutset(image.outset().bottom() , borderBottomWidth()), |
1650 NinePieceImage::computeOutset(image.outset().left(), borderLeftWidth())); | 1658 NinePieceImage::computeOutset(image.outset().left(), borderLeftWidth())); |
1651 } | 1659 } |
1652 | 1660 |
1653 void RenderStyle::setBorderImageSource(PassRefPtr<StyleImage> image) | 1661 void RenderStyle::setBorderImageSource(PassRefPtr<StyleImage> image) |
1654 { | 1662 { |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1754 horizontal || includeLogicalRightEdge); | 1762 horizontal || includeLogicalRightEdge); |
1755 | 1763 |
1756 edges[BSLeft] = BorderEdge(borderLeftWidth(), | 1764 edges[BSLeft] = BorderEdge(borderLeftWidth(), |
1757 visitedDependentColor(CSSPropertyBorderLeftColor), | 1765 visitedDependentColor(CSSPropertyBorderLeftColor), |
1758 borderLeftStyle(), | 1766 borderLeftStyle(), |
1759 borderLeftIsTransparent(), | 1767 borderLeftIsTransparent(), |
1760 !horizontal || includeLogicalLeftEdge); | 1768 !horizontal || includeLogicalLeftEdge); |
1761 } | 1769 } |
1762 | 1770 |
1763 } // namespace blink | 1771 } // namespace blink |
OLD | NEW |