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

Side by Side Diff: third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

Issue 2597083002: Moved list-style-type to be generated in ComputedStyleBase (Closed)
Patch Set: Created 3 years, 12 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) 2004 Zack Rusin <zack@kde.org> 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
4 * All rights reserved. 4 * All rights reserved.
5 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 5 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
7 * Copyright (C) 2011 Sencha, Inc. All rights reserved. 7 * Copyright (C) 2011 Sencha, Inc. All rights reserved.
8 * Copyright (C) 2015 Google Inc. All rights reserved. 8 * Copyright (C) 2015 Google Inc. All rights reserved.
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 1464 matching lines...) Expand 10 before | Expand all | Expand 10 after
1475 for (const ContentData* contentData = style.contentData(); contentData; 1475 for (const ContentData* contentData = style.contentData(); contentData;
1476 contentData = contentData->next()) { 1476 contentData = contentData->next()) {
1477 if (contentData->isCounter()) { 1477 if (contentData->isCounter()) {
1478 const CounterContent* counter = 1478 const CounterContent* counter =
1479 toCounterContentData(contentData)->counter(); 1479 toCounterContentData(contentData)->counter();
1480 ASSERT(counter); 1480 ASSERT(counter);
1481 CSSCustomIdentValue* identifier = 1481 CSSCustomIdentValue* identifier =
1482 CSSCustomIdentValue::create(counter->identifier()); 1482 CSSCustomIdentValue::create(counter->identifier());
1483 CSSStringValue* separator = CSSStringValue::create(counter->separator()); 1483 CSSStringValue* separator = CSSStringValue::create(counter->separator());
1484 CSSValueID listStyleIdent = CSSValueNone; 1484 CSSValueID listStyleIdent = CSSValueNone;
1485 if (counter->listStyle() != EListStyleType::NoneListStyle) { 1485 if (counter->listStyle() != EListStyleType::None) {
1486 // TODO(sashab): Change this to use a converter instead of 1486 // TODO(sashab): Change this to use a converter instead of
1487 // CSSPrimitiveValueMappings. 1487 // CSSPrimitiveValueMappings.
1488 listStyleIdent = 1488 listStyleIdent =
1489 CSSIdentifierValue::create(counter->listStyle())->getValueID(); 1489 CSSIdentifierValue::create(counter->listStyle())->getValueID();
1490 } 1490 }
1491 CSSIdentifierValue* listStyle = 1491 CSSIdentifierValue* listStyle =
1492 CSSIdentifierValue::create(listStyleIdent); 1492 CSSIdentifierValue::create(listStyleIdent);
1493 list->append(*CSSCounterValue::create(identifier, listStyle, separator)); 1493 list->append(*CSSCounterValue::create(identifier, listStyle, separator));
1494 } else if (contentData->isImage()) { 1494 } else if (contentData->isImage()) {
1495 const StyleImage* image = toImageContentData(contentData)->image(); 1495 const StyleImage* image = toImageContentData(contentData)->image();
(...skipping 2149 matching lines...) Expand 10 before | Expand all | Expand 10 after
3645 case CSSPropertyAll: 3645 case CSSPropertyAll:
3646 return nullptr; 3646 return nullptr;
3647 default: 3647 default:
3648 break; 3648 break;
3649 } 3649 }
3650 ASSERT_NOT_REACHED(); 3650 ASSERT_NOT_REACHED();
3651 return nullptr; 3651 return nullptr;
3652 } 3652 }
3653 3653
3654 } // namespace blink 3654 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698