Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Side by Side Diff: Source/core/layout/LayoutListMarker.cpp

Issue 1194053002: Use the same range for upper/lower-armenian as armenian (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « LayoutTests/fast/lists/w3-css3-list-styles-fallback-style-expected.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 case Persian: 456 case Persian:
457 case Square: 457 case Square:
458 case Telugu: 458 case Telugu:
459 case Thai: 459 case Thai:
460 case Tibetan: 460 case Tibetan:
461 case Urdu: 461 case Urdu:
462 case KoreanHangulFormal: 462 case KoreanHangulFormal:
463 case CJKIdeographic: 463 case CJKIdeographic:
464 return type; // Can represent all ordinals. 464 return type; // Can represent all ordinals.
465 case Armenian: 465 case Armenian:
466 case LowerArmenian:
467 case UpperArmenian:
466 return (value < 1 || value > 99999999) ? DecimalListStyle : type; 468 return (value < 1 || value > 99999999) ? DecimalListStyle : type;
467 case Georgian: 469 case Georgian:
468 return (value < 1 || value > 19999) ? DecimalListStyle : type; 470 return (value < 1 || value > 19999) ? DecimalListStyle : type;
469 case Hebrew: 471 case Hebrew:
470 return (value < 0 || value > 999999) ? DecimalListStyle : type; 472 return (value < 0 || value > 999999) ? DecimalListStyle : type;
471 case LowerRoman: 473 case LowerRoman:
472 case UpperRoman: 474 case UpperRoman:
473 return (value < 1 || value > 3999) ? DecimalListStyle : type; 475 return (value < 1 || value > 3999) ? DecimalListStyle : type;
474 case CjkEarthlyBranch: 476 case CjkEarthlyBranch:
475 case CjkHeavenlyStem: 477 case CjkHeavenlyStem:
476 case EthiopicHalehameAm: 478 case EthiopicHalehameAm:
477 case EthiopicHalehame: 479 case EthiopicHalehame:
478 case EthiopicHalehameTiEr: 480 case EthiopicHalehameTiEr:
479 case EthiopicHalehameTiEt: 481 case EthiopicHalehameTiEt:
480 case Hangul: 482 case Hangul:
481 case HangulConsonant: 483 case HangulConsonant:
482 case Hiragana: 484 case Hiragana:
483 case HiraganaIroha: 485 case HiraganaIroha:
484 case Katakana: 486 case Katakana:
485 case KatakanaIroha: 487 case KatakanaIroha:
486 case LowerAlpha: 488 case LowerAlpha:
487 case LowerArmenian:
488 case LowerGreek: 489 case LowerGreek:
489 case LowerLatin: 490 case LowerLatin:
490 case UpperAlpha: 491 case UpperAlpha:
491 case UpperArmenian:
492 case UpperLatin: 492 case UpperLatin:
493 return (value < 1) ? DecimalListStyle : type; 493 return (value < 1) ? DecimalListStyle : type;
494 } 494 }
495 495
496 ASSERT_NOT_REACHED(); 496 ASSERT_NOT_REACHED();
497 return type; 497 return type;
498 } 498 }
499 499
500 UChar LayoutListMarker::listMarkerSuffix(EListStyleType type, int value) 500 UChar LayoutListMarker::listMarkerSuffix(EListStyleType type, int value)
501 { 501 {
(...skipping 874 matching lines...) Expand 10 before | Expand all | Expand 10 after
1376 if (style()) { 1376 if (style()) {
1377 // Reuse the current margins. Otherwise resetting the margins to initial values 1377 // Reuse the current margins. Otherwise resetting the margins to initial values
1378 // would trigger unnecessary layout. 1378 // would trigger unnecessary layout.
1379 newStyle->setMarginStart(style()->marginStart()); 1379 newStyle->setMarginStart(style()->marginStart());
1380 newStyle->setMarginEnd(style()->marginRight()); 1380 newStyle->setMarginEnd(style()->marginRight());
1381 } 1381 }
1382 setStyle(newStyle.release()); 1382 setStyle(newStyle.release());
1383 } 1383 }
1384 1384
1385 } // namespace blink 1385 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/fast/lists/w3-css3-list-styles-fallback-style-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698