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

Unified Diff: Source/core/rendering/svg/RenderSVGInlineText.cpp

Issue 87503003: Moving fontSelector from StyleResolver to StyleEngine. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Reverted hasAnyFontFaceRule Created 7 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/svg/RenderSVGInlineText.cpp
diff --git a/Source/core/rendering/svg/RenderSVGInlineText.cpp b/Source/core/rendering/svg/RenderSVGInlineText.cpp
index cc612ca9c534c32d211905c4749c96b1c01700a9..7ebe8a68323964a9a69df7f09cc22a4e5071b837 100644
--- a/Source/core/rendering/svg/RenderSVGInlineText.cpp
+++ b/Source/core/rendering/svg/RenderSVGInlineText.cpp
@@ -27,7 +27,6 @@
#include "core/css/CSSFontSelector.h"
#include "core/css/FontSize.h"
-#include "core/css/resolver/StyleResolver.h"
#include "core/editing/VisiblePosition.h"
#include "core/rendering/svg/RenderSVGText.h"
#include "core/rendering/svg/SVGInlineTextBox.h"
@@ -221,9 +220,6 @@ void RenderSVGInlineText::computeNewScaledFontForStyle(RenderObject* renderer, c
Document& document = renderer->document();
- StyleResolver* styleResolver = document.styleResolver();
- ASSERT(styleResolver);
-
// Alter font-size to the right on-screen value to avoid scaling the glyphs themselves, except when GeometricPrecision is specified.
scalingFactor = SVGRenderingContext::calculateScreenFontSizeScalingFactor(renderer);
if (scalingFactor == 1 || !scalingFactor) {
@@ -241,7 +237,7 @@ void RenderSVGInlineText::computeNewScaledFontForStyle(RenderObject* renderer, c
fontDescription.setComputedSize(FontSize::getComputedSizeFromSpecifiedSize(&document, scalingFactor, fontDescription.isAbsoluteSize(), fontDescription.specifiedSize(), DoNotUseSmartMinimumForFontSize));
scaledFont = Font(fontDescription, 0, 0);
- scaledFont.update(styleResolver->fontSelector());
+ scaledFont.update(document.fontSelector());
}
}

Powered by Google App Engine
This is Rietveld 408576698