OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv
ed. | 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv
ed. |
5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) | 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) |
6 * Copyright (C) 2010 Daniel Bates (dbates@intudata.com) | 6 * Copyright (C) 2010 Daniel Bates (dbates@intudata.com) |
7 * | 7 * |
8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
11 * version 2 of the License, or (at your option) any later version. | 11 * version 2 of the License, or (at your option) any later version. |
12 * | 12 * |
13 * This library is distributed in the hope that it will be useful, | 13 * This library is distributed in the hope that it will be useful, |
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
16 * Library General Public License for more details. | 16 * Library General Public License for more details. |
17 * | 17 * |
18 * You should have received a copy of the GNU Library General Public License | 18 * You should have received a copy of the GNU Library General Public License |
19 * along with this library; see the file COPYING.LIB. If not, write to | 19 * along with this library; see the file COPYING.LIB. If not, write to |
20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
21 * Boston, MA 02110-1301, USA. | 21 * Boston, MA 02110-1301, USA. |
22 * | 22 * |
23 */ | 23 */ |
24 | 24 |
25 #include "config.h" | 25 #include "config.h" |
26 #include "core/layout/LayoutListMarker.h" | 26 #include "core/layout/LayoutListMarker.h" |
27 | 27 |
28 #include "core/fetch/ImageResource.h" | |
29 #include "core/layout/LayoutAnalyzer.h" | 28 #include "core/layout/LayoutAnalyzer.h" |
30 #include "core/layout/LayoutListItem.h" | 29 #include "core/layout/LayoutListItem.h" |
31 #include "core/layout/TextRunConstructor.h" | 30 #include "core/layout/TextRunConstructor.h" |
32 #include "core/paint/DeprecatedPaintLayer.h" | 31 #include "core/paint/DeprecatedPaintLayer.h" |
33 #include "core/paint/ListMarkerPainter.h" | 32 #include "core/paint/ListMarkerPainter.h" |
34 #include "platform/fonts/Font.h" | 33 #include "platform/fonts/Font.h" |
35 #include "wtf/text/StringBuilder.h" | 34 #include "wtf/text/StringBuilder.h" |
36 | 35 |
37 namespace blink { | 36 namespace blink { |
38 | 37 |
(...skipping 1337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1376 if (style()) { | 1375 if (style()) { |
1377 // Reuse the current margins. Otherwise resetting the margins to initial
values | 1376 // Reuse the current margins. Otherwise resetting the margins to initial
values |
1378 // would trigger unnecessary layout. | 1377 // would trigger unnecessary layout. |
1379 newStyle->setMarginStart(style()->marginStart()); | 1378 newStyle->setMarginStart(style()->marginStart()); |
1380 newStyle->setMarginEnd(style()->marginRight()); | 1379 newStyle->setMarginEnd(style()->marginRight()); |
1381 } | 1380 } |
1382 setStyle(newStyle.release()); | 1381 setStyle(newStyle.release()); |
1383 } | 1382 } |
1384 | 1383 |
1385 } // namespace blink | 1384 } // namespace blink |
OLD | NEW |