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. | 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. |
5 * All rights reserved. | 5 * All rights reserved. |
6 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) | 6 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) |
7 * Copyright (C) 2010 Daniel Bates (dbates@intudata.com) | 7 * Copyright (C) 2010 Daniel Bates (dbates@intudata.com) |
8 * | 8 * |
9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
10 * modify it under the terms of the GNU Library General Public | 10 * modify it under the terms of the GNU Library General Public |
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
363 if (!isImage()) | 363 if (!isImage()) |
364 return m_listItem->baselinePosition(baselineType, firstLine, direction, | 364 return m_listItem->baselinePosition(baselineType, firstLine, direction, |
365 PositionOfInteriorLineBoxes); | 365 PositionOfInteriorLineBoxes); |
366 return LayoutBox::baselinePosition(baselineType, firstLine, direction, | 366 return LayoutBox::baselinePosition(baselineType, firstLine, direction, |
367 linePositionMode); | 367 linePositionMode); |
368 } | 368 } |
369 | 369 |
370 LayoutListMarker::ListStyleCategory LayoutListMarker::getListStyleCategory() | 370 LayoutListMarker::ListStyleCategory LayoutListMarker::getListStyleCategory() |
371 const { | 371 const { |
372 switch (style()->listStyleType()) { | 372 switch (style()->listStyleType()) { |
373 case EListStyleType::NoneListStyle: | 373 case EListStyleType::None: |
374 return ListStyleCategory::None; | 374 return ListStyleCategory::None; |
375 case EListStyleType::Disc: | 375 case EListStyleType::Disc: |
376 case EListStyleType::Circle: | 376 case EListStyleType::Circle: |
377 case EListStyleType::Square: | 377 case EListStyleType::Square: |
378 return ListStyleCategory::Symbol; | 378 return ListStyleCategory::Symbol; |
379 case EListStyleType::ArabicIndic: | 379 case EListStyleType::ArabicIndic: |
380 case EListStyleType::Armenian: | 380 case EListStyleType::Armenian: |
381 case EListStyleType::Bengali: | 381 case EListStyleType::Bengali: |
382 case EListStyleType::Cambodian: | 382 case EListStyleType::Cambodian: |
383 case EListStyleType::CJKIdeographic: | 383 case EListStyleType::CjkIdeographic: |
384 case EListStyleType::CjkEarthlyBranch: | 384 case EListStyleType::CjkEarthlyBranch: |
385 case EListStyleType::CjkHeavenlyStem: | 385 case EListStyleType::CjkHeavenlyStem: |
386 case EListStyleType::DecimalLeadingZero: | 386 case EListStyleType::DecimalLeadingZero: |
387 case EListStyleType::DecimalListStyle: | 387 case EListStyleType::Decimal: |
388 case EListStyleType::Devanagari: | 388 case EListStyleType::Devanagari: |
389 case EListStyleType::EthiopicHalehame: | 389 case EListStyleType::EthiopicHalehame: |
390 case EListStyleType::EthiopicHalehameAm: | 390 case EListStyleType::EthiopicHalehameAm: |
391 case EListStyleType::EthiopicHalehameTiEr: | 391 case EListStyleType::EthiopicHalehameTiEr: |
392 case EListStyleType::EthiopicHalehameTiEt: | 392 case EListStyleType::EthiopicHalehameTiEt: |
393 case EListStyleType::Georgian: | 393 case EListStyleType::Georgian: |
394 case EListStyleType::Gujarati: | 394 case EListStyleType::Gujarati: |
395 case EListStyleType::Gurmukhi: | 395 case EListStyleType::Gurmukhi: |
396 case EListStyleType::Hangul: | 396 case EListStyleType::Hangul: |
397 case EListStyleType::HangulConsonant: | 397 case EListStyleType::HangulConsonant: |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
496 if (style()) { | 496 if (style()) { |
497 // Reuse the current margins. Otherwise resetting the margins to initial | 497 // Reuse the current margins. Otherwise resetting the margins to initial |
498 // values would trigger unnecessary layout. | 498 // values would trigger unnecessary layout. |
499 newStyle->setMarginStart(style()->marginStart()); | 499 newStyle->setMarginStart(style()->marginStart()); |
500 newStyle->setMarginEnd(style()->marginRight()); | 500 newStyle->setMarginEnd(style()->marginRight()); |
501 } | 501 } |
502 setStyle(newStyle.release()); | 502 setStyle(newStyle.release()); |
503 } | 503 } |
504 | 504 |
505 } // namespace blink | 505 } // namespace blink |
OLD | NEW |