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 18 matching lines...) Expand all Loading... |
29 #include "Font.h" | 29 #include "Font.h" |
30 #include "FontSelector.h" | 30 #include "FontSelector.h" |
31 #include "QuotesData.h" | 31 #include "QuotesData.h" |
32 #include "RenderArena.h" | 32 #include "RenderArena.h" |
33 #include "RenderObject.h" | 33 #include "RenderObject.h" |
34 #include "ScaleTransformOperation.h" | 34 #include "ScaleTransformOperation.h" |
35 #include "ShadowData.h" | 35 #include "ShadowData.h" |
36 #include "StyleImage.h" | 36 #include "StyleImage.h" |
37 #include "StyleInheritedData.h" | 37 #include "StyleInheritedData.h" |
38 #include "StyleResolver.h" | 38 #include "StyleResolver.h" |
| 39 #if ENABLE(TOUCH_EVENTS) |
39 #include "RenderTheme.h" | 40 #include "RenderTheme.h" |
| 41 #endif |
40 #include "TextAutosizer.h" | 42 #include "TextAutosizer.h" |
41 #include "WebCoreMemoryInstrumentation.h" | 43 #include "WebCoreMemoryInstrumentation.h" |
42 #include <wtf/MathExtras.h> | 44 #include <wtf/MathExtras.h> |
43 #include <wtf/MemoryInstrumentationVector.h> | 45 #include <wtf/MemoryInstrumentationVector.h> |
44 #include <wtf/MemoryObjectInfo.h> | 46 #include <wtf/MemoryObjectInfo.h> |
45 #include <wtf/StdLibExtras.h> | 47 #include <wtf/StdLibExtras.h> |
46 #include <algorithm> | 48 #include <algorithm> |
47 | 49 |
48 using namespace std; | 50 using namespace std; |
49 | 51 |
(...skipping 1466 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1516 TextEmphasisMark mark = static_cast<TextEmphasisMark>(rareInheritedData->tex
tEmphasisMark); | 1518 TextEmphasisMark mark = static_cast<TextEmphasisMark>(rareInheritedData->tex
tEmphasisMark); |
1517 if (mark != TextEmphasisMarkAuto) | 1519 if (mark != TextEmphasisMarkAuto) |
1518 return mark; | 1520 return mark; |
1519 | 1521 |
1520 if (isHorizontalWritingMode()) | 1522 if (isHorizontalWritingMode()) |
1521 return TextEmphasisMarkDot; | 1523 return TextEmphasisMarkDot; |
1522 | 1524 |
1523 return TextEmphasisMarkSesame; | 1525 return TextEmphasisMarkSesame; |
1524 } | 1526 } |
1525 | 1527 |
| 1528 #if ENABLE(TOUCH_EVENTS) |
1526 Color RenderStyle::initialTapHighlightColor() | 1529 Color RenderStyle::initialTapHighlightColor() |
1527 { | 1530 { |
1528 return RenderTheme::tapHighlightColor(); | 1531 return RenderTheme::tapHighlightColor(); |
1529 } | 1532 } |
| 1533 #endif |
1530 | 1534 |
1531 LayoutBoxExtent RenderStyle::imageOutsets(const NinePieceImage& image) const | 1535 LayoutBoxExtent RenderStyle::imageOutsets(const NinePieceImage& image) const |
1532 { | 1536 { |
1533 return LayoutBoxExtent(NinePieceImage::computeOutset(image.outset().top(), b
orderTopWidth()), | 1537 return LayoutBoxExtent(NinePieceImage::computeOutset(image.outset().top(), b
orderTopWidth()), |
1534 NinePieceImage::computeOutset(image.outset().right(),
borderRightWidth()), | 1538 NinePieceImage::computeOutset(image.outset().right(),
borderRightWidth()), |
1535 NinePieceImage::computeOutset(image.outset().bottom()
, borderBottomWidth()), | 1539 NinePieceImage::computeOutset(image.outset().bottom()
, borderBottomWidth()), |
1536 NinePieceImage::computeOutset(image.outset().left(),
borderLeftWidth())); | 1540 NinePieceImage::computeOutset(image.outset().left(),
borderLeftWidth())); |
1537 } | 1541 } |
1538 | 1542 |
1539 void RenderStyle::setBorderImageSource(PassRefPtr<StyleImage> image) | 1543 void RenderStyle::setBorderImageSource(PassRefPtr<StyleImage> image) |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1585 info.addMember(inherited, "inherited"); | 1589 info.addMember(inherited, "inherited"); |
1586 info.addMember(m_cachedPseudoStyles, "cachedPseudoStyles"); | 1590 info.addMember(m_cachedPseudoStyles, "cachedPseudoStyles"); |
1587 #if ENABLE(SVG) | 1591 #if ENABLE(SVG) |
1588 info.addMember(m_svgStyle, "svgStyle"); | 1592 info.addMember(m_svgStyle, "svgStyle"); |
1589 #endif | 1593 #endif |
1590 info.addMember(inherited_flags, "inherited_flags"); | 1594 info.addMember(inherited_flags, "inherited_flags"); |
1591 info.addMember(noninherited_flags, "noninherited_flags"); | 1595 info.addMember(noninherited_flags, "noninherited_flags"); |
1592 } | 1596 } |
1593 | 1597 |
1594 } // namespace WebCore | 1598 } // namespace WebCore |
OLD | NEW |