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

Side by Side Diff: Source/core/css/CSSPrimitiveValue.cpp

Issue 1102373002: Fix counters() separator serialization (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix test failure Created 5 years, 8 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/css/counters/counter-cssText-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 * (C) 1999-2003 Lars Knoll (knoll@kde.org) 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2012 Apple Inc. All rights reserv ed. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2012 Apple Inc. All rights reserv ed.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 995 matching lines...) Expand 10 before | Expand all | Expand 10 after
1006 StringBuilder result; 1006 StringBuilder result;
1007 String separator = m_value.counter->separator(); 1007 String separator = m_value.counter->separator();
1008 if (separator.isEmpty()) 1008 if (separator.isEmpty())
1009 result.appendLiteral("counter("); 1009 result.appendLiteral("counter(");
1010 else 1010 else
1011 result.appendLiteral("counters("); 1011 result.appendLiteral("counters(");
1012 1012
1013 result.append(m_value.counter->identifier()); 1013 result.append(m_value.counter->identifier());
1014 if (!separator.isEmpty()) { 1014 if (!separator.isEmpty()) {
1015 result.appendLiteral(", "); 1015 result.appendLiteral(", ");
1016 result.append(quoteCSSStringIfNeeded(separator)); 1016 result.append(serializeString(separator));
1017 } 1017 }
1018 String listStyle = m_value.counter->listStyle(); 1018 String listStyle = m_value.counter->listStyle();
1019 if (!listStyle.isEmpty()) { 1019 if (!listStyle.isEmpty()) {
1020 result.appendLiteral(", "); 1020 result.appendLiteral(", ");
1021 result.append(listStyle); 1021 result.append(listStyle);
1022 } 1022 }
1023 result.append(')'); 1023 result.append(')');
1024 1024
1025 text = result.toString(); 1025 text = result.toString();
1026 break; 1026 break;
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
1139 visitor->trace(m_value.shape); 1139 visitor->trace(m_value.shape);
1140 break; 1140 break;
1141 default: 1141 default:
1142 break; 1142 break;
1143 } 1143 }
1144 #endif 1144 #endif
1145 CSSValue::traceAfterDispatch(visitor); 1145 CSSValue::traceAfterDispatch(visitor);
1146 } 1146 }
1147 1147
1148 } // namespace blink 1148 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/fast/css/counters/counter-cssText-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698