Index: Source/core/css/resolver/FontBuilder.cpp |
diff --git a/Source/core/css/resolver/FontBuilder.cpp b/Source/core/css/resolver/FontBuilder.cpp |
index 744a91499824f1b5394cedde8dda2a5c5ba5174b..5c8431858e02c3a617d31f7ae41915377e646d07 100644 |
--- a/Source/core/css/resolver/FontBuilder.cpp |
+++ b/Source/core/css/resolver/FontBuilder.cpp |
@@ -62,18 +62,16 @@ private: |
FontBuilder::FontBuilder() |
: m_document(0) |
- , m_useSVGZoomRules(false) |
, m_fontSizehasViewportUnits(false) |
, m_style(0) |
, m_fontDirty(false) |
{ |
} |
-void FontBuilder::initForStyleResolve(const Document& document, RenderStyle* style, bool useSVGZoomRules) |
+void FontBuilder::initForStyleResolve(const Document& document, RenderStyle* style) |
{ |
ASSERT(document.frame()); |
m_document = &document; |
- m_useSVGZoomRules = useSVGZoomRules; |
m_style = style; |
m_fontDirty = false; |
} |
@@ -530,13 +528,10 @@ void FontBuilder::setSize(FontDescription& fontDescription, float effectiveZoom, |
float FontBuilder::getComputedSizeFromSpecifiedSize(FontDescription& fontDescription, float effectiveZoom, float specifiedSize) |
{ |
- float zoomFactor = 1.0f; |
- if (!m_useSVGZoomRules) { |
- zoomFactor = effectiveZoom; |
- // FIXME: Why is this here!!!!?! |
- if (LocalFrame* frame = m_document->frame()) |
- zoomFactor *= frame->textZoomFactor(); |
- } |
+ float zoomFactor = effectiveZoom; |
+ // FIXME: Why is this here!!!!?! |
+ if (LocalFrame* frame = m_document->frame()) |
+ zoomFactor *= frame->textZoomFactor(); |
return FontSize::getComputedSizeFromSpecifiedSize(m_document, zoomFactor, fontDescription.isAbsoluteSize(), specifiedSize); |
} |