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

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

Issue 2366243002: Remove all ordering requirements in CSSValueKeywords.in (WIP) (Closed)
Patch Set: Some mor efixes Created 4 years, 1 month 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 contentData = contentData->next()) { 1475 contentData = contentData->next()) {
1476 if (contentData->isCounter()) { 1476 if (contentData->isCounter()) {
1477 const CounterContent* counter = 1477 const CounterContent* counter =
1478 toCounterContentData(contentData)->counter(); 1478 toCounterContentData(contentData)->counter();
1479 ASSERT(counter); 1479 ASSERT(counter);
1480 CSSCustomIdentValue* identifier = 1480 CSSCustomIdentValue* identifier =
1481 CSSCustomIdentValue::create(counter->identifier()); 1481 CSSCustomIdentValue::create(counter->identifier());
1482 CSSStringValue* separator = CSSStringValue::create(counter->separator()); 1482 CSSStringValue* separator = CSSStringValue::create(counter->separator());
1483 CSSValueID listStyleIdent = CSSValueNone; 1483 CSSValueID listStyleIdent = CSSValueNone;
1484 if (counter->listStyle() != NoneListStyle) 1484 if (counter->listStyle() != NoneListStyle)
1485 listStyleIdent = 1485 listStyleIdent = platformEnumToCSSValueID(counter->listStyle());
1486 static_cast<CSSValueID>(CSSValueDisc + counter->listStyle());
1487 CSSIdentifierValue* listStyle = 1486 CSSIdentifierValue* listStyle =
1488 CSSIdentifierValue::create(listStyleIdent); 1487 CSSIdentifierValue::create(listStyleIdent);
1489 list->append(*CSSCounterValue::create(identifier, listStyle, separator)); 1488 list->append(*CSSCounterValue::create(identifier, listStyle, separator));
1490 } else if (contentData->isImage()) { 1489 } else if (contentData->isImage()) {
1491 const StyleImage* image = toImageContentData(contentData)->image(); 1490 const StyleImage* image = toImageContentData(contentData)->image();
1492 ASSERT(image); 1491 ASSERT(image);
1493 list->append(*image->computedCSSValue()); 1492 list->append(*image->computedCSSValue());
1494 } else if (contentData->isText()) { 1493 } else if (contentData->isText()) {
1495 list->append( 1494 list->append(
1496 *CSSStringValue::create(toTextContentData(contentData)->text())); 1495 *CSSStringValue::create(toTextContentData(contentData)->text()));
(...skipping 2120 matching lines...) Expand 10 before | Expand all | Expand 10 after
3617 case CSSPropertyAll: 3616 case CSSPropertyAll:
3618 return nullptr; 3617 return nullptr;
3619 default: 3618 default:
3620 break; 3619 break;
3621 } 3620 }
3622 ASSERT_NOT_REACHED(); 3621 ASSERT_NOT_REACHED();
3623 return nullptr; 3622 return nullptr;
3624 } 3623 }
3625 3624
3626 } // namespace blink 3625 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSValueKeywords.in ('k') | third_party/WebKit/Source/core/css/FontSize.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698