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

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

Issue 1933713002: Store separator info of counters as CSSStringValue (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Patch for landing Created 4 years, 7 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. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2011 Sencha, Inc. All rights reserved. 6 * Copyright (C) 2011 Sencha, Inc. All rights reserved.
7 * Copyright (C) 2015 Google Inc. All rights reserved. 7 * Copyright (C) 2015 Google Inc. All rights reserved.
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 Lesser General Public 10 * modify it under the terms of the GNU Lesser General Public
(...skipping 1119 matching lines...) Expand 10 before | Expand all | Expand 10 after
1130 } 1130 }
1131 1131
1132 static CSSValue* valueForContentData(const ComputedStyle& style) 1132 static CSSValue* valueForContentData(const ComputedStyle& style)
1133 { 1133 {
1134 CSSValueList* list = CSSValueList::createSpaceSeparated(); 1134 CSSValueList* list = CSSValueList::createSpaceSeparated();
1135 for (const ContentData* contentData = style.contentData(); contentData; cont entData = contentData->next()) { 1135 for (const ContentData* contentData = style.contentData(); contentData; cont entData = contentData->next()) {
1136 if (contentData->isCounter()) { 1136 if (contentData->isCounter()) {
1137 const CounterContent* counter = toCounterContentData(contentData)->c ounter(); 1137 const CounterContent* counter = toCounterContentData(contentData)->c ounter();
1138 ASSERT(counter); 1138 ASSERT(counter);
1139 CSSCustomIdentValue* identifier = CSSCustomIdentValue::create(counte r->identifier()); 1139 CSSCustomIdentValue* identifier = CSSCustomIdentValue::create(counte r->identifier());
1140 CSSCustomIdentValue* separator = CSSCustomIdentValue::create(counter ->separator()); 1140 CSSStringValue* separator = CSSStringValue::create(counter->separato r());
1141 CSSValueID listStyleIdent = CSSValueNone; 1141 CSSValueID listStyleIdent = CSSValueNone;
1142 if (counter->listStyle() != NoneListStyle) 1142 if (counter->listStyle() != NoneListStyle)
1143 listStyleIdent = static_cast<CSSValueID>(CSSValueDisc + counter- >listStyle()); 1143 listStyleIdent = static_cast<CSSValueID>(CSSValueDisc + counter- >listStyle());
1144 CSSPrimitiveValue* listStyle = cssValuePool().createIdentifierValue( listStyleIdent); 1144 CSSPrimitiveValue* listStyle = cssValuePool().createIdentifierValue( listStyleIdent);
1145 list->append(CSSCounterValue::create(identifier, listStyle, separato r)); 1145 list->append(CSSCounterValue::create(identifier, listStyle, separato r));
1146 } else if (contentData->isImage()) { 1146 } else if (contentData->isImage()) {
1147 const StyleImage* image = toImageContentData(contentData)->image(); 1147 const StyleImage* image = toImageContentData(contentData)->image();
1148 ASSERT(image); 1148 ASSERT(image);
1149 list->append(image->computedCSSValue()); 1149 list->append(image->computedCSSValue());
1150 } else if (contentData->isText()) { 1150 } else if (contentData->isText()) {
(...skipping 1760 matching lines...) Expand 10 before | Expand all | Expand 10 after
2911 case CSSPropertyAll: 2911 case CSSPropertyAll:
2912 return nullptr; 2912 return nullptr;
2913 default: 2913 default:
2914 break; 2914 break;
2915 } 2915 }
2916 ASSERT_NOT_REACHED(); 2916 ASSERT_NOT_REACHED();
2917 return nullptr; 2917 return nullptr;
2918 } 2918 }
2919 2919
2920 } // namespace blink 2920 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698