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

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

Issue 1746283002: Rename enums/functions that collide in chromium style in platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: get-names-13-platform: . Created 4 years, 9 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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * * Redistributions of source code must retain the above copyright 4 * * Redistributions of source code must retain the above copyright
5 * notice, this list of conditions and the following disclaimer. 5 * notice, this list of conditions and the following disclaimer.
6 * * Redistributions in binary form must reproduce the above 6 * * Redistributions in binary form must reproduce the above
7 * copyright notice, this list of conditions and the following disclaimer 7 * copyright notice, this list of conditions and the following disclaimer
8 * in the documentation and/or other materials provided with the 8 * in the documentation and/or other materials provided with the
9 * distribution. 9 * distribution.
10 * * Neither the name of Google Inc. nor the names of its 10 * * Neither the name of Google Inc. nor the names of its
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 } 217 }
218 218
219 FontDescription::Size StyleBuilderConverter::convertFontSize(StyleResolverState& state, const CSSValue& value) 219 FontDescription::Size StyleBuilderConverter::convertFontSize(StyleResolverState& state, const CSSValue& value)
220 { 220 {
221 const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value); 221 const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
222 222
223 FontDescription::Size parentSize(0, 0.0f, false); 223 FontDescription::Size parentSize(0, 0.0f, false);
224 224
225 // FIXME: Find out when parentStyle could be 0? 225 // FIXME: Find out when parentStyle could be 0?
226 if (state.parentStyle()) 226 if (state.parentStyle())
227 parentSize = state.parentFontDescription().size(); 227 parentSize = state.parentFontDescription().getSize();
228 228
229 if (CSSValueID valueID = primitiveValue.getValueID()) { 229 if (CSSValueID valueID = primitiveValue.getValueID()) {
230 switch (valueID) { 230 switch (valueID) {
231 case CSSValueXxSmall: 231 case CSSValueXxSmall:
232 case CSSValueXSmall: 232 case CSSValueXSmall:
233 case CSSValueSmall: 233 case CSSValueSmall:
234 case CSSValueMedium: 234 case CSSValueMedium:
235 case CSSValueLarge: 235 case CSSValueLarge:
236 case CSSValueXLarge: 236 case CSSValueXLarge:
237 case CSSValueXxLarge: 237 case CSSValueXxLarge:
(...skipping 725 matching lines...) Expand 10 before | Expand all | Expand 10 after
963 963
964 PassRefPtr<StylePath> StyleBuilderConverter::convertPathOrNone(StyleResolverStat e& state, const CSSValue& value) 964 PassRefPtr<StylePath> StyleBuilderConverter::convertPathOrNone(StyleResolverStat e& state, const CSSValue& value)
965 { 965 {
966 if (value.isPathValue()) 966 if (value.isPathValue())
967 return convertPath(state, value); 967 return convertPath(state, value);
968 ASSERT(value.isPrimitiveValue() && toCSSPrimitiveValue(value).getValueID() = = CSSValueNone); 968 ASSERT(value.isPrimitiveValue() && toCSSPrimitiveValue(value).getValueID() = = CSSValueNone);
969 return nullptr; 969 return nullptr;
970 } 970 }
971 971
972 } // namespace blink 972 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/resolver/FontBuilder.cpp ('k') | third_party/WebKit/Source/core/events/GestureEvent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698