| 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 |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 */ | 23 */ |
| 24 | 24 |
| 25 #include "core/layout/LayoutListMarker.h" | 25 #include "core/layout/LayoutListMarker.h" |
| 26 | 26 |
| 27 #include "core/fetch/ImageResource.h" | 27 #include "core/fetch/ImageResource.h" |
| 28 #include "core/layout/LayoutAnalyzer.h" | 28 #include "core/layout/LayoutAnalyzer.h" |
| 29 #include "core/layout/LayoutListItem.h" | 29 #include "core/layout/LayoutListItem.h" |
| 30 #include "core/layout/ListMarkerText.h" | 30 #include "core/layout/ListMarkerText.h" |
| 31 #include "core/layout/api/LineLayoutBlockFlow.h" | 31 #include "core/layout/api/LineLayoutBlockFlow.h" |
| 32 #include "core/paint/ListMarkerPainter.h" | 32 #include "core/paint/ListMarkerPainter.h" |
| 33 #include "core/paint/PaintLayer.h" | |
| 34 #include "platform/fonts/Font.h" | 33 #include "platform/fonts/Font.h" |
| 35 | 34 |
| 36 namespace blink { | 35 namespace blink { |
| 37 | 36 |
| 38 const int cMarkerPaddingPx = 7; | 37 const int cMarkerPaddingPx = 7; |
| 39 | 38 |
| 40 LayoutListMarker::LayoutListMarker(LayoutListItem* item) | 39 LayoutListMarker::LayoutListMarker(LayoutListItem* item) |
| 41 : LayoutBox(nullptr) | 40 : LayoutBox(nullptr) |
| 42 , m_listItem(item) | 41 , m_listItem(item) |
| 43 { | 42 { |
| (...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 448 if (style()) { | 447 if (style()) { |
| 449 // Reuse the current margins. Otherwise resetting the margins to initial
values | 448 // Reuse the current margins. Otherwise resetting the margins to initial
values |
| 450 // would trigger unnecessary layout. | 449 // would trigger unnecessary layout. |
| 451 newStyle->setMarginStart(style()->marginStart()); | 450 newStyle->setMarginStart(style()->marginStart()); |
| 452 newStyle->setMarginEnd(style()->marginRight()); | 451 newStyle->setMarginEnd(style()->marginRight()); |
| 453 } | 452 } |
| 454 setStyle(newStyle.release()); | 453 setStyle(newStyle.release()); |
| 455 } | 454 } |
| 456 | 455 |
| 457 } // namespace blink | 456 } // namespace blink |
| OLD | NEW |