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

Unified Diff: Source/core/css/resolver/FontBuilder.cpp

Issue 205743004: Expand system font values during font property parsing (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase and fix up unittest use of systemFont() Created 6 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/FontBuilder.cpp
diff --git a/Source/core/css/resolver/FontBuilder.cpp b/Source/core/css/resolver/FontBuilder.cpp
index 1c03e1495370171e5b2d913df294e0fbcff1ab70..57575db7de9c5e808c0050136c09c2f9d59dd25b 100644
--- a/Source/core/css/resolver/FontBuilder.cpp
+++ b/Source/core/css/resolver/FontBuilder.cpp
@@ -122,29 +122,6 @@ void FontBuilder::didChangeFontParameters(bool changed)
m_fontDirty |= changed;
}
-void FontBuilder::fromSystemFont(CSSValueID valueId, float effectiveZoom)
-{
- FontDescriptionChangeScope scope(this);
-
- FontDescription fontDescription;
- RenderTheme::theme().systemFont(valueId, fontDescription);
-
- // Double-check and see if the theme did anything. If not, don't bother updating the font.
- if (!fontDescription.isAbsoluteSize())
- return;
-
- // Make sure the rendering mode and printer font settings are updated.
- const Settings* settings = m_document->settings();
- ASSERT(settings); // If we're doing style resolution, this document should always be in a frame and thus have settings
- if (!settings)
- return;
- fontDescription.setUsePrinterFont(m_document->printing());
-
- // Handle the zoom factor.
- fontDescription.setComputedSize(getComputedSizeFromSpecifiedSize(fontDescription, effectiveZoom, fontDescription.specifiedSize()));
- scope.set(fontDescription);
-}
-
void FontBuilder::setFontFamilyInitial()
{
FontDescriptionChangeScope scope(this);
« 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