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

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: Created 6 years, 4 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 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 void StyleBuilderFunctions::applyInheritCSSPropertyFontFamily(StyleResolverState & state) 285 void StyleBuilderFunctions::applyInheritCSSPropertyFontFamily(StyleResolverState & state)
286 { 286 {
287 state.fontBuilder().setFontFamilyInherit(state.parentFontDescription()); 287 state.fontBuilder().setFontFamilyInherit(state.parentFontDescription());
288 } 288 }
289 289
290 void StyleBuilderFunctions::applyValueCSSPropertyFontFamily(StyleResolverState& state, CSSValue* value) 290 void StyleBuilderFunctions::applyValueCSSPropertyFontFamily(StyleResolverState& state, CSSValue* value)
291 { 291 {
292 state.fontBuilder().setFontFamilyValue(value); 292 state.fontBuilder().setFontFamilyValue(value);
293 } 293 }
294 294
295 void StyleBuilderFunctions::applyInitialCSSPropertyFontSize(StyleResolverState& state)
296 {
297 state.fontBuilder().setFontSizeInitial();
298 }
299
300 void StyleBuilderFunctions::applyInheritCSSPropertyFontSize(StyleResolverState& state)
301 {
302 state.fontBuilder().setFontSizeInherit(state.parentFontDescription());
303 }
304
305 void StyleBuilderFunctions::applyValueCSSPropertyFontSize(StyleResolverState& st ate, CSSValue* value)
306 {
307 state.fontBuilder().setFontSizeValue(value, state.parentStyle(), state.rootE lementStyle());
308 }
309
310 void StyleBuilderFunctions::applyValueCSSPropertyGlyphOrientationVertical(StyleR esolverState& state, CSSValue* value) 295 void StyleBuilderFunctions::applyValueCSSPropertyGlyphOrientationVertical(StyleR esolverState& state, CSSValue* value)
311 { 296 {
312 if (value->isPrimitiveValue() && toCSSPrimitiveValue(value)->getValueID() == CSSValueAuto) 297 if (value->isPrimitiveValue() && toCSSPrimitiveValue(value)->getValueID() == CSSValueAuto)
313 state.style()->accessSVGStyle().setGlyphOrientationVertical(GO_AUTO); 298 state.style()->accessSVGStyle().setGlyphOrientationVertical(GO_AUTO);
314 else 299 else
315 state.style()->accessSVGStyle().setGlyphOrientationVertical(StyleBuilder Converter::convertGlyphOrientation(state, value)); 300 state.style()->accessSVGStyle().setGlyphOrientationVertical(StyleBuilder Converter::convertGlyphOrientation(state, value));
316 } 301 }
317 302
318 void StyleBuilderFunctions::applyInitialCSSPropertyGridTemplateAreas(StyleResolv erState& state) 303 void StyleBuilderFunctions::applyInitialCSSPropertyGridTemplateAreas(StyleResolv erState& state)
319 { 304 {
(...skipping 975 matching lines...) Expand 10 before | Expand all | Expand 10 after
1295 break; 1280 break;
1296 default: 1281 default:
1297 ASSERT_NOT_REACHED(); 1282 ASSERT_NOT_REACHED();
1298 break; 1283 break;
1299 } 1284 }
1300 1285
1301 state.style()->setGridAutoFlow(autoFlow); 1286 state.style()->setGridAutoFlow(autoFlow);
1302 } 1287 }
1303 1288
1304 } // namespace blink 1289 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698