| 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 1445 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1456 break; | 1456 break; |
| 1457 default: | 1457 default: |
| 1458 marginEnd = m_text.isEmpty() ? 0 : offset / 2; | 1458 marginEnd = m_text.isEmpty() ? 0 : offset / 2; |
| 1459 } | 1459 } |
| 1460 } | 1460 } |
| 1461 marginStart = -marginEnd - minPreferredLogicalWidth(); | 1461 marginStart = -marginEnd - minPreferredLogicalWidth(); |
| 1462 } | 1462 } |
| 1463 | 1463 |
| 1464 } | 1464 } |
| 1465 | 1465 |
| 1466 style()->setMarginStart(Length(marginStart, Fixed)); | 1466 mutableStyleRef().setMarginStart(Length(marginStart, Fixed)); |
| 1467 style()->setMarginEnd(Length(marginEnd, Fixed)); | 1467 mutableStyleRef().setMarginEnd(Length(marginEnd, Fixed)); |
| 1468 } | 1468 } |
| 1469 | 1469 |
| 1470 LayoutUnit RenderListMarker::lineHeight(bool firstLine, LineDirectionMode direct
ion, LinePositionMode linePositionMode) const | 1470 LayoutUnit RenderListMarker::lineHeight(bool firstLine, LineDirectionMode direct
ion, LinePositionMode linePositionMode) const |
| 1471 { | 1471 { |
| 1472 if (!isImage()) | 1472 if (!isImage()) |
| 1473 return m_listItem->lineHeight(firstLine, direction, PositionOfInteriorLi
neBoxes); | 1473 return m_listItem->lineHeight(firstLine, direction, PositionOfInteriorLi
neBoxes); |
| 1474 return RenderBox::lineHeight(firstLine, direction, linePositionMode); | 1474 return RenderBox::lineHeight(firstLine, direction, linePositionMode); |
| 1475 } | 1475 } |
| 1476 | 1476 |
| 1477 int RenderListMarker::baselinePosition(FontBaseline baselineType, bool firstLine
, LineDirectionMode direction, LinePositionMode linePositionMode) const | 1477 int RenderListMarker::baselinePosition(FontBaseline baselineType, bool firstLine
, LineDirectionMode direction, LinePositionMode linePositionMode) const |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1639 if (style()) { | 1639 if (style()) { |
| 1640 // Reuse the current margins. Otherwise resetting the margins to initial
values | 1640 // Reuse the current margins. Otherwise resetting the margins to initial
values |
| 1641 // would trigger unnecessary layout. | 1641 // would trigger unnecessary layout. |
| 1642 newStyle->setMarginStart(style()->marginStart()); | 1642 newStyle->setMarginStart(style()->marginStart()); |
| 1643 newStyle->setMarginEnd(style()->marginRight()); | 1643 newStyle->setMarginEnd(style()->marginRight()); |
| 1644 } | 1644 } |
| 1645 setStyle(newStyle.release()); | 1645 setStyle(newStyle.release()); |
| 1646 } | 1646 } |
| 1647 | 1647 |
| 1648 } // namespace blink | 1648 } // namespace blink |
| OLD | NEW |