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 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
353 if (!isImage()) | 353 if (!isImage()) |
354 return m_listItem->baselinePosition(baselineType, firstLine, direction, | 354 return m_listItem->baselinePosition(baselineType, firstLine, direction, |
355 PositionOfInteriorLineBoxes); | 355 PositionOfInteriorLineBoxes); |
356 return LayoutBox::baselinePosition(baselineType, firstLine, direction, | 356 return LayoutBox::baselinePosition(baselineType, firstLine, direction, |
357 linePositionMode); | 357 linePositionMode); |
358 } | 358 } |
359 | 359 |
360 LayoutListMarker::ListStyleCategory LayoutListMarker::getListStyleCategory() | 360 LayoutListMarker::ListStyleCategory LayoutListMarker::getListStyleCategory() |
361 const { | 361 const { |
362 switch (style()->listStyleType()) { | 362 switch (style()->listStyleType()) { |
363 case NoneListStyle: | 363 case EListStyleType::NoneListStyle: |
364 return ListStyleCategory::None; | 364 return ListStyleCategory::None; |
365 case Disc: | 365 case EListStyleType::Disc: |
366 case Circle: | 366 case EListStyleType::Circle: |
367 case Square: | 367 case EListStyleType::Square: |
368 return ListStyleCategory::Symbol; | 368 return ListStyleCategory::Symbol; |
369 case ArabicIndic: | 369 case EListStyleType::ArabicIndic: |
370 case Armenian: | 370 case EListStyleType::Armenian: |
371 case Bengali: | 371 case EListStyleType::Bengali: |
372 case Cambodian: | 372 case EListStyleType::Cambodian: |
373 case CJKIdeographic: | 373 case EListStyleType::CJKIdeographic: |
374 case CjkEarthlyBranch: | 374 case EListStyleType::CjkEarthlyBranch: |
375 case CjkHeavenlyStem: | 375 case EListStyleType::CjkHeavenlyStem: |
376 case DecimalLeadingZero: | 376 case EListStyleType::DecimalLeadingZero: |
377 case DecimalListStyle: | 377 case EListStyleType::DecimalListStyle: |
378 case Devanagari: | 378 case EListStyleType::Devanagari: |
379 case EthiopicHalehame: | 379 case EListStyleType::EthiopicHalehame: |
380 case EthiopicHalehameAm: | 380 case EListStyleType::EthiopicHalehameAm: |
381 case EthiopicHalehameTiEr: | 381 case EListStyleType::EthiopicHalehameTiEr: |
382 case EthiopicHalehameTiEt: | 382 case EListStyleType::EthiopicHalehameTiEt: |
383 case Georgian: | 383 case EListStyleType::Georgian: |
384 case Gujarati: | 384 case EListStyleType::Gujarati: |
385 case Gurmukhi: | 385 case EListStyleType::Gurmukhi: |
386 case Hangul: | 386 case EListStyleType::Hangul: |
387 case HangulConsonant: | 387 case EListStyleType::HangulConsonant: |
388 case Hebrew: | 388 case EListStyleType::Hebrew: |
389 case Hiragana: | 389 case EListStyleType::Hiragana: |
390 case HiraganaIroha: | 390 case EListStyleType::HiraganaIroha: |
391 case Kannada: | 391 case EListStyleType::Kannada: |
392 case Katakana: | 392 case EListStyleType::Katakana: |
393 case KatakanaIroha: | 393 case EListStyleType::KatakanaIroha: |
394 case Khmer: | 394 case EListStyleType::Khmer: |
395 case KoreanHangulFormal: | 395 case EListStyleType::KoreanHangulFormal: |
396 case KoreanHanjaFormal: | 396 case EListStyleType::KoreanHanjaFormal: |
397 case KoreanHanjaInformal: | 397 case EListStyleType::KoreanHanjaInformal: |
398 case Lao: | 398 case EListStyleType::Lao: |
399 case LowerAlpha: | 399 case EListStyleType::LowerAlpha: |
400 case LowerArmenian: | 400 case EListStyleType::LowerArmenian: |
401 case LowerGreek: | 401 case EListStyleType::LowerGreek: |
402 case LowerLatin: | 402 case EListStyleType::LowerLatin: |
403 case LowerRoman: | 403 case EListStyleType::LowerRoman: |
404 case Malayalam: | 404 case EListStyleType::Malayalam: |
405 case Mongolian: | 405 case EListStyleType::Mongolian: |
406 case Myanmar: | 406 case EListStyleType::Myanmar: |
407 case Oriya: | 407 case EListStyleType::Oriya: |
408 case Persian: | 408 case EListStyleType::Persian: |
409 case SimpChineseFormal: | 409 case EListStyleType::SimpChineseFormal: |
410 case SimpChineseInformal: | 410 case EListStyleType::SimpChineseInformal: |
411 case Telugu: | 411 case EListStyleType::Telugu: |
412 case Thai: | 412 case EListStyleType::Thai: |
413 case Tibetan: | 413 case EListStyleType::Tibetan: |
414 case TradChineseFormal: | 414 case EListStyleType::TradChineseFormal: |
415 case TradChineseInformal: | 415 case EListStyleType::TradChineseInformal: |
416 case UpperAlpha: | 416 case EListStyleType::UpperAlpha: |
417 case UpperArmenian: | 417 case EListStyleType::UpperArmenian: |
418 case UpperLatin: | 418 case EListStyleType::UpperLatin: |
419 case UpperRoman: | 419 case EListStyleType::UpperRoman: |
420 case Urdu: | 420 case EListStyleType::Urdu: |
421 return ListStyleCategory::Language; | 421 return ListStyleCategory::Language; |
422 default: | 422 default: |
423 ASSERT_NOT_REACHED(); | 423 ASSERT_NOT_REACHED(); |
424 return ListStyleCategory::Language; | 424 return ListStyleCategory::Language; |
425 } | 425 } |
426 } | 426 } |
427 | 427 |
428 bool LayoutListMarker::isInside() const { | 428 bool LayoutListMarker::isInside() const { |
429 return m_listItem->notInList() || | 429 return m_listItem->notInList() || |
430 style()->listStylePosition() == EListStylePosition::Inside; | 430 style()->listStylePosition() == EListStylePosition::Inside; |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
486 if (style()) { | 486 if (style()) { |
487 // Reuse the current margins. Otherwise resetting the margins to initial | 487 // Reuse the current margins. Otherwise resetting the margins to initial |
488 // values would trigger unnecessary layout. | 488 // values would trigger unnecessary layout. |
489 newStyle->setMarginStart(style()->marginStart()); | 489 newStyle->setMarginStart(style()->marginStart()); |
490 newStyle->setMarginEnd(style()->marginRight()); | 490 newStyle->setMarginEnd(style()->marginRight()); |
491 } | 491 } |
492 setStyle(newStyle.release()); | 492 setStyle(newStyle.release()); |
493 } | 493 } |
494 | 494 |
495 } // namespace blink | 495 } // namespace blink |
OLD | NEW |