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

Side by Side Diff: Source/core/css/resolver/StyleBuilderCustom.cpp

Issue 468793003: Make style building for 'font-size' less custom. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix regression related to FontDescriptions with isAbsolute=true. Created 6 years, 3 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 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 void StyleBuilderFunctions::applyInheritCSSPropertyFontFamily(StyleResolverState & state) 240 void StyleBuilderFunctions::applyInheritCSSPropertyFontFamily(StyleResolverState & state)
241 { 241 {
242 state.fontBuilder().setFontFamilyInherit(state.parentFontDescription()); 242 state.fontBuilder().setFontFamilyInherit(state.parentFontDescription());
243 } 243 }
244 244
245 void StyleBuilderFunctions::applyValueCSSPropertyFontFamily(StyleResolverState& state, CSSValue* value) 245 void StyleBuilderFunctions::applyValueCSSPropertyFontFamily(StyleResolverState& state, CSSValue* value)
246 { 246 {
247 state.fontBuilder().setFontFamilyValue(value); 247 state.fontBuilder().setFontFamilyValue(value);
248 } 248 }
249 249
250 void StyleBuilderFunctions::applyInitialCSSPropertyFontSize(StyleResolverState& state)
251 {
252 state.fontBuilder().setFontSizeInitial();
253 }
254
255 void StyleBuilderFunctions::applyInheritCSSPropertyFontSize(StyleResolverState& state)
256 {
257 state.fontBuilder().setFontSizeInherit(state.parentFontDescription());
258 }
259
260 void StyleBuilderFunctions::applyValueCSSPropertyFontSize(StyleResolverState& st ate, CSSValue* value)
261 {
262 state.fontBuilder().setFontSizeValue(value, state.parentStyle(), state.rootE lementStyle());
263 }
264
265 void StyleBuilderFunctions::applyValueCSSPropertyGlyphOrientationVertical(StyleR esolverState& state, CSSValue* value) 250 void StyleBuilderFunctions::applyValueCSSPropertyGlyphOrientationVertical(StyleR esolverState& state, CSSValue* value)
266 { 251 {
267 if (value->isPrimitiveValue() && toCSSPrimitiveValue(value)->getValueID() == CSSValueAuto) 252 if (value->isPrimitiveValue() && toCSSPrimitiveValue(value)->getValueID() == CSSValueAuto)
268 state.style()->accessSVGStyle().setGlyphOrientationVertical(GO_AUTO); 253 state.style()->accessSVGStyle().setGlyphOrientationVertical(GO_AUTO);
269 else 254 else
270 state.style()->accessSVGStyle().setGlyphOrientationVertical(StyleBuilder Converter::convertGlyphOrientation(state, value)); 255 state.style()->accessSVGStyle().setGlyphOrientationVertical(StyleBuilder Converter::convertGlyphOrientation(state, value));
271 } 256 }
272 257
273 void StyleBuilderFunctions::applyInitialCSSPropertyGridTemplateAreas(StyleResolv erState& state) 258 void StyleBuilderFunctions::applyInitialCSSPropertyGridTemplateAreas(StyleResolv erState& state)
274 { 259 {
(...skipping 958 matching lines...) Expand 10 before | Expand all | Expand 10 after
1233 break; 1218 break;
1234 default: 1219 default:
1235 ASSERT_NOT_REACHED(); 1220 ASSERT_NOT_REACHED();
1236 break; 1221 break;
1237 } 1222 }
1238 1223
1239 state.style()->setGridAutoFlow(autoFlow); 1224 state.style()->setGridAutoFlow(autoFlow);
1240 } 1225 }
1241 1226
1242 } // namespace blink 1227 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/resolver/StyleBuilderConverter.cpp ('k') | Source/core/css/resolver/StyleResolver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698