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 Apple Inc. All rights reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
4 * | 4 * |
5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
9 * | 9 * |
10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
(...skipping 14 matching lines...) Expand all Loading... |
25 #include "core/rendering/style/RenderStyle.h" | 25 #include "core/rendering/style/RenderStyle.h" |
26 | 26 |
27 namespace WebCore { | 27 namespace WebCore { |
28 | 28 |
29 StyleInheritedData::StyleInheritedData() | 29 StyleInheritedData::StyleInheritedData() |
30 : horizontal_border_spacing(RenderStyle::initialHorizontalBorderSpacing()) | 30 : horizontal_border_spacing(RenderStyle::initialHorizontalBorderSpacing()) |
31 , vertical_border_spacing(RenderStyle::initialVerticalBorderSpacing()) | 31 , vertical_border_spacing(RenderStyle::initialVerticalBorderSpacing()) |
32 , line_height(RenderStyle::initialLineHeight()) | 32 , line_height(RenderStyle::initialLineHeight()) |
33 , color(RenderStyle::initialColor()) | 33 , color(RenderStyle::initialColor()) |
34 , visitedLinkColor(RenderStyle::initialColor()) | 34 , visitedLinkColor(RenderStyle::initialColor()) |
| 35 , textAutosizingMultiplier(1) |
35 { | 36 { |
36 } | 37 } |
37 | 38 |
38 StyleInheritedData::~StyleInheritedData() | 39 StyleInheritedData::~StyleInheritedData() |
39 { | 40 { |
40 } | 41 } |
41 | 42 |
42 StyleInheritedData::StyleInheritedData(const StyleInheritedData& o) | 43 StyleInheritedData::StyleInheritedData(const StyleInheritedData& o) |
43 : RefCounted<StyleInheritedData>() | 44 : RefCounted<StyleInheritedData>() |
44 , horizontal_border_spacing(o.horizontal_border_spacing) | 45 , horizontal_border_spacing(o.horizontal_border_spacing) |
45 , vertical_border_spacing(o.vertical_border_spacing) | 46 , vertical_border_spacing(o.vertical_border_spacing) |
46 , line_height(o.line_height) | 47 , line_height(o.line_height) |
47 , font(o.font) | 48 , font(o.font) |
48 , color(o.color) | 49 , color(o.color) |
49 , visitedLinkColor(o.visitedLinkColor) | 50 , visitedLinkColor(o.visitedLinkColor) |
| 51 , textAutosizingMultiplier(o.textAutosizingMultiplier) |
50 { | 52 { |
51 } | 53 } |
52 | 54 |
53 bool StyleInheritedData::operator==(const StyleInheritedData& o) const | 55 bool StyleInheritedData::operator==(const StyleInheritedData& o) const |
54 { | 56 { |
55 return line_height == o.line_height | 57 return line_height == o.line_height |
56 && font == o.font | 58 && font == o.font |
57 && color == o.color | 59 && color == o.color |
58 && visitedLinkColor == o.visitedLinkColor | 60 && visitedLinkColor == o.visitedLinkColor |
59 && horizontal_border_spacing == o.horizontal_border_spacing | 61 && horizontal_border_spacing == o.horizontal_border_spacing |
| 62 && textAutosizingMultiplier == o.textAutosizingMultiplier |
60 && vertical_border_spacing == o.vertical_border_spacing; | 63 && vertical_border_spacing == o.vertical_border_spacing; |
61 } | 64 } |
62 | 65 |
63 } // namespace WebCore | 66 } // namespace WebCore |
OLD | NEW |