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

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

Issue 677103002: Expand system font values during property parsing. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove isExpandedShorthandForAll. Created 6 years, 1 month 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 | « Source/core/css/resolver/FontBuilder.h ('k') | Source/core/css/resolver/StyleBuilderCustom.cpp » ('j') | 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 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
4 * Copyright (C) 2013 Google Inc. All rights reserved. 4 * Copyright (C) 2013 Google Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 FontDescriptionChangeScope scope(this); 86 FontDescriptionChangeScope scope(this);
87 87
88 scope.set(fontDescription); 88 scope.set(fontDescription);
89 } 89 }
90 90
91 void FontBuilder::didChangeFontParameters(bool changed) 91 void FontBuilder::didChangeFontParameters(bool changed)
92 { 92 {
93 m_fontDirty |= changed; 93 m_fontDirty |= changed;
94 } 94 }
95 95
96 void FontBuilder::fromSystemFont(CSSValueID valueId, float effectiveZoom)
97 {
98 FontDescriptionChangeScope scope(this);
99
100 FontDescription fontDescription;
101 RenderTheme::theme().systemFont(valueId, fontDescription);
102
103 // Double-check and see if the theme did anything. If not, don't bother upda ting the font.
104 if (!fontDescription.isAbsoluteSize())
105 return;
106
107 // Make sure the rendering mode and printer font settings are updated.
108 const Settings* settings = m_document.settings();
109 ASSERT(settings); // If we're doing style resolution, this document should a lways be in a frame and thus have settings
110 if (!settings)
111 return;
112
113 // Handle the zoom factor.
114 fontDescription.setComputedSize(getComputedSizeFromSpecifiedSize(fontDescrip tion, effectiveZoom, fontDescription.specifiedSize()));
115 scope.set(fontDescription);
116 }
117
118 FontFamily FontBuilder::standardFontFamily() const 96 FontFamily FontBuilder::standardFontFamily() const
119 { 97 {
120 FontFamily family; 98 FontFamily family;
121 family.setFamily(standardFontFamilyName()); 99 family.setFamily(standardFontFamilyName());
122 return family; 100 return family;
123 } 101 }
124 102
125 AtomicString FontBuilder::standardFontFamilyName() const 103 AtomicString FontBuilder::standardFontFamilyName() const
126 { 104 {
127 Settings* settings = m_document.settings(); 105 Settings* settings = m_document.settings();
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 FontOrientation fontOrientation; 391 FontOrientation fontOrientation;
414 NonCJKGlyphOrientation glyphOrientation; 392 NonCJKGlyphOrientation glyphOrientation;
415 getFontAndGlyphOrientation(documentStyle, fontOrientation, glyphOrientation) ; 393 getFontAndGlyphOrientation(documentStyle, fontOrientation, glyphOrientation) ;
416 fontDescription.setOrientation(fontOrientation); 394 fontDescription.setOrientation(fontOrientation);
417 fontDescription.setNonCJKGlyphOrientation(glyphOrientation); 395 fontDescription.setNonCJKGlyphOrientation(glyphOrientation);
418 documentStyle->setFontDescription(fontDescription); 396 documentStyle->setFontDescription(fontDescription);
419 documentStyle->font().update(fontSelector); 397 documentStyle->font().update(fontSelector);
420 } 398 }
421 399
422 } 400 }
OLDNEW
« no previous file with comments | « Source/core/css/resolver/FontBuilder.h ('k') | Source/core/css/resolver/StyleBuilderCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698