| 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) | |
| 40 #include "RenderTheme.h" | 39 #include "RenderTheme.h" |
| 41 #endif | |
| 42 #include "TextAutosizer.h" | 40 #include "TextAutosizer.h" |
| 43 #include "WebCoreMemoryInstrumentation.h" | 41 #include "WebCoreMemoryInstrumentation.h" |
| 44 #include <wtf/MathExtras.h> | 42 #include <wtf/MathExtras.h> |
| 45 #include <wtf/MemoryInstrumentationVector.h> | 43 #include <wtf/MemoryInstrumentationVector.h> |
| 46 #include <wtf/MemoryObjectInfo.h> | 44 #include <wtf/MemoryObjectInfo.h> |
| 47 #include <wtf/StdLibExtras.h> | 45 #include <wtf/StdLibExtras.h> |
| 48 #include <algorithm> | 46 #include <algorithm> |
| 49 | 47 |
| 50 using namespace std; | 48 using namespace std; |
| 51 | 49 |
| (...skipping 1475 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1527 TextEmphasisMark mark = static_cast<TextEmphasisMark>(rareInheritedData->tex
tEmphasisMark); | 1525 TextEmphasisMark mark = static_cast<TextEmphasisMark>(rareInheritedData->tex
tEmphasisMark); |
| 1528 if (mark != TextEmphasisMarkAuto) | 1526 if (mark != TextEmphasisMarkAuto) |
| 1529 return mark; | 1527 return mark; |
| 1530 | 1528 |
| 1531 if (isHorizontalWritingMode()) | 1529 if (isHorizontalWritingMode()) |
| 1532 return TextEmphasisMarkDot; | 1530 return TextEmphasisMarkDot; |
| 1533 | 1531 |
| 1534 return TextEmphasisMarkSesame; | 1532 return TextEmphasisMarkSesame; |
| 1535 } | 1533 } |
| 1536 | 1534 |
| 1537 #if ENABLE(TOUCH_EVENTS) | |
| 1538 Color RenderStyle::initialTapHighlightColor() | 1535 Color RenderStyle::initialTapHighlightColor() |
| 1539 { | 1536 { |
| 1540 return RenderTheme::tapHighlightColor(); | 1537 return RenderTheme::tapHighlightColor(); |
| 1541 } | 1538 } |
| 1542 #endif | |
| 1543 | 1539 |
| 1544 LayoutBoxExtent RenderStyle::imageOutsets(const NinePieceImage& image) const | 1540 LayoutBoxExtent RenderStyle::imageOutsets(const NinePieceImage& image) const |
| 1545 { | 1541 { |
| 1546 return LayoutBoxExtent(NinePieceImage::computeOutset(image.outset().top(), b
orderTopWidth()), | 1542 return LayoutBoxExtent(NinePieceImage::computeOutset(image.outset().top(), b
orderTopWidth()), |
| 1547 NinePieceImage::computeOutset(image.outset().right(),
borderRightWidth()), | 1543 NinePieceImage::computeOutset(image.outset().right(),
borderRightWidth()), |
| 1548 NinePieceImage::computeOutset(image.outset().bottom()
, borderBottomWidth()), | 1544 NinePieceImage::computeOutset(image.outset().bottom()
, borderBottomWidth()), |
| 1549 NinePieceImage::computeOutset(image.outset().left(),
borderLeftWidth())); | 1545 NinePieceImage::computeOutset(image.outset().left(),
borderLeftWidth())); |
| 1550 } | 1546 } |
| 1551 | 1547 |
| 1552 void RenderStyle::setBorderImageSource(PassRefPtr<StyleImage> image) | 1548 void RenderStyle::setBorderImageSource(PassRefPtr<StyleImage> image) |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1598 info.addMember(inherited, "inherited"); | 1594 info.addMember(inherited, "inherited"); |
| 1599 info.addMember(m_cachedPseudoStyles, "cachedPseudoStyles"); | 1595 info.addMember(m_cachedPseudoStyles, "cachedPseudoStyles"); |
| 1600 #if ENABLE(SVG) | 1596 #if ENABLE(SVG) |
| 1601 info.addMember(m_svgStyle, "svgStyle"); | 1597 info.addMember(m_svgStyle, "svgStyle"); |
| 1602 #endif | 1598 #endif |
| 1603 info.addMember(inherited_flags, "inherited_flags"); | 1599 info.addMember(inherited_flags, "inherited_flags"); |
| 1604 info.addMember(noninherited_flags, "noninherited_flags"); | 1600 info.addMember(noninherited_flags, "noninherited_flags"); |
| 1605 } | 1601 } |
| 1606 | 1602 |
| 1607 } // namespace WebCore | 1603 } // namespace WebCore |
| OLD | NEW |