| 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 390 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 401 case Urdu: | 401 case Urdu: |
| 402 return ListStyleCategory::Language; | 402 return ListStyleCategory::Language; |
| 403 default: | 403 default: |
| 404 ASSERT_NOT_REACHED(); | 404 ASSERT_NOT_REACHED(); |
| 405 return ListStyleCategory::Language; | 405 return ListStyleCategory::Language; |
| 406 } | 406 } |
| 407 } | 407 } |
| 408 | 408 |
| 409 bool LayoutListMarker::isInside() const { | 409 bool LayoutListMarker::isInside() const { |
| 410 return m_listItem->notInList() || | 410 return m_listItem->notInList() || |
| 411 style()->listStylePosition() == ListStylePositionInside; | 411 style()->listStylePosition() == EListStylePosition::Inside; |
| 412 } | 412 } |
| 413 | 413 |
| 414 IntRect LayoutListMarker::getRelativeMarkerRect() const { | 414 IntRect LayoutListMarker::getRelativeMarkerRect() const { |
| 415 if (isImage()) { | 415 if (isImage()) { |
| 416 IntSize imageSize = flooredIntSize(imageBulletSize()); | 416 IntSize imageSize = flooredIntSize(imageBulletSize()); |
| 417 return IntRect(0, 0, imageSize.width(), imageSize.height()); | 417 return IntRect(0, 0, imageSize.width(), imageSize.height()); |
| 418 } | 418 } |
| 419 | 419 |
| 420 IntRect relativeRect; | 420 IntRect relativeRect; |
| 421 switch (getListStyleCategory()) { | 421 switch (getListStyleCategory()) { |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 461 if (style()) { | 461 if (style()) { |
| 462 // Reuse the current margins. Otherwise resetting the margins to initial val
ues | 462 // Reuse the current margins. Otherwise resetting the margins to initial val
ues |
| 463 // would trigger unnecessary layout. | 463 // would trigger unnecessary layout. |
| 464 newStyle->setMarginStart(style()->marginStart()); | 464 newStyle->setMarginStart(style()->marginStart()); |
| 465 newStyle->setMarginEnd(style()->marginRight()); | 465 newStyle->setMarginEnd(style()->marginRight()); |
| 466 } | 466 } |
| 467 setStyle(newStyle.release()); | 467 setStyle(newStyle.release()); |
| 468 } | 468 } |
| 469 | 469 |
| 470 } // namespace blink | 470 } // namespace blink |
| OLD | NEW |