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

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

Issue 2614883007: Change computed style enums to be prefixed with 'k'. (Closed)
Patch Set: Rebase on ToT. Created 3 years, 11 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
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. 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
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::None: 373 case EListStyleType::kNone:
374 return ListStyleCategory::None; 374 return ListStyleCategory::None;
375 case EListStyleType::Disc: 375 case EListStyleType::kDisc:
376 case EListStyleType::Circle: 376 case EListStyleType::kCircle:
377 case EListStyleType::Square: 377 case EListStyleType::kSquare:
378 return ListStyleCategory::Symbol; 378 return ListStyleCategory::Symbol;
379 case EListStyleType::ArabicIndic: 379 case EListStyleType::kArabicIndic:
380 case EListStyleType::Armenian: 380 case EListStyleType::kArmenian:
381 case EListStyleType::Bengali: 381 case EListStyleType::kBengali:
382 case EListStyleType::Cambodian: 382 case EListStyleType::kCambodian:
383 case EListStyleType::CjkIdeographic: 383 case EListStyleType::kCjkIdeographic:
384 case EListStyleType::CjkEarthlyBranch: 384 case EListStyleType::kCjkEarthlyBranch:
385 case EListStyleType::CjkHeavenlyStem: 385 case EListStyleType::kCjkHeavenlyStem:
386 case EListStyleType::DecimalLeadingZero: 386 case EListStyleType::kDecimalLeadingZero:
387 case EListStyleType::Decimal: 387 case EListStyleType::kDecimal:
388 case EListStyleType::Devanagari: 388 case EListStyleType::kDevanagari:
389 case EListStyleType::EthiopicHalehame: 389 case EListStyleType::kEthiopicHalehame:
390 case EListStyleType::EthiopicHalehameAm: 390 case EListStyleType::kEthiopicHalehameAm:
391 case EListStyleType::EthiopicHalehameTiEr: 391 case EListStyleType::kEthiopicHalehameTiEr:
392 case EListStyleType::EthiopicHalehameTiEt: 392 case EListStyleType::kEthiopicHalehameTiEt:
393 case EListStyleType::Georgian: 393 case EListStyleType::kGeorgian:
394 case EListStyleType::Gujarati: 394 case EListStyleType::kGujarati:
395 case EListStyleType::Gurmukhi: 395 case EListStyleType::kGurmukhi:
396 case EListStyleType::Hangul: 396 case EListStyleType::kHangul:
397 case EListStyleType::HangulConsonant: 397 case EListStyleType::kHangulConsonant:
398 case EListStyleType::Hebrew: 398 case EListStyleType::kHebrew:
399 case EListStyleType::Hiragana: 399 case EListStyleType::kHiragana:
400 case EListStyleType::HiraganaIroha: 400 case EListStyleType::kHiraganaIroha:
401 case EListStyleType::Kannada: 401 case EListStyleType::kKannada:
402 case EListStyleType::Katakana: 402 case EListStyleType::kKatakana:
403 case EListStyleType::KatakanaIroha: 403 case EListStyleType::kKatakanaIroha:
404 case EListStyleType::Khmer: 404 case EListStyleType::kKhmer:
405 case EListStyleType::KoreanHangulFormal: 405 case EListStyleType::kKoreanHangulFormal:
406 case EListStyleType::KoreanHanjaFormal: 406 case EListStyleType::kKoreanHanjaFormal:
407 case EListStyleType::KoreanHanjaInformal: 407 case EListStyleType::kKoreanHanjaInformal:
408 case EListStyleType::Lao: 408 case EListStyleType::kLao:
409 case EListStyleType::LowerAlpha: 409 case EListStyleType::kLowerAlpha:
410 case EListStyleType::LowerArmenian: 410 case EListStyleType::kLowerArmenian:
411 case EListStyleType::LowerGreek: 411 case EListStyleType::kLowerGreek:
412 case EListStyleType::LowerLatin: 412 case EListStyleType::kLowerLatin:
413 case EListStyleType::LowerRoman: 413 case EListStyleType::kLowerRoman:
414 case EListStyleType::Malayalam: 414 case EListStyleType::kMalayalam:
415 case EListStyleType::Mongolian: 415 case EListStyleType::kMongolian:
416 case EListStyleType::Myanmar: 416 case EListStyleType::kMyanmar:
417 case EListStyleType::Oriya: 417 case EListStyleType::kOriya:
418 case EListStyleType::Persian: 418 case EListStyleType::kPersian:
419 case EListStyleType::SimpChineseFormal: 419 case EListStyleType::kSimpChineseFormal:
420 case EListStyleType::SimpChineseInformal: 420 case EListStyleType::kSimpChineseInformal:
421 case EListStyleType::Telugu: 421 case EListStyleType::kTelugu:
422 case EListStyleType::Thai: 422 case EListStyleType::kThai:
423 case EListStyleType::Tibetan: 423 case EListStyleType::kTibetan:
424 case EListStyleType::TradChineseFormal: 424 case EListStyleType::kTradChineseFormal:
425 case EListStyleType::TradChineseInformal: 425 case EListStyleType::kTradChineseInformal:
426 case EListStyleType::UpperAlpha: 426 case EListStyleType::kUpperAlpha:
427 case EListStyleType::UpperArmenian: 427 case EListStyleType::kUpperArmenian:
428 case EListStyleType::UpperLatin: 428 case EListStyleType::kUpperLatin:
429 case EListStyleType::UpperRoman: 429 case EListStyleType::kUpperRoman:
430 case EListStyleType::Urdu: 430 case EListStyleType::kUrdu:
431 return ListStyleCategory::Language; 431 return ListStyleCategory::Language;
432 default: 432 default:
433 ASSERT_NOT_REACHED(); 433 ASSERT_NOT_REACHED();
434 return ListStyleCategory::Language; 434 return ListStyleCategory::Language;
435 } 435 }
436 } 436 }
437 437
438 bool LayoutListMarker::isInside() const { 438 bool LayoutListMarker::isInside() const {
439 return m_listItem->notInList() || 439 return m_listItem->notInList() ||
440 style()->listStylePosition() == EListStylePosition::Inside; 440 style()->listStylePosition() == EListStylePosition::kInside;
441 } 441 }
442 442
443 IntRect LayoutListMarker::getRelativeMarkerRect() const { 443 IntRect LayoutListMarker::getRelativeMarkerRect() const {
444 if (isImage()) { 444 if (isImage()) {
445 IntSize imageSize = flooredIntSize(imageBulletSize()); 445 IntSize imageSize = flooredIntSize(imageBulletSize());
446 return IntRect(0, 0, imageSize.width(), imageSize.height()); 446 return IntRect(0, 0, imageSize.width(), imageSize.height());
447 } 447 }
448 448
449 IntRect relativeRect; 449 IntRect relativeRect;
450 const SimpleFontData* fontData = style()->font().primaryFont(); 450 const SimpleFontData* fontData = style()->font().primaryFont();
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutListItem.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutMenuList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698