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

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

Issue 656913006: Remove SVG fonts (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Update tests for landing Created 6 years, 2 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
Index: Source/core/rendering/svg/SVGTextMetrics.cpp
diff --git a/Source/core/rendering/svg/SVGTextMetrics.cpp b/Source/core/rendering/svg/SVGTextMetrics.cpp
index 26dbc4c75075827367b4c475970eae2c5c7d077a..21638f34d878b0b09de9028e91ed6aafda992e95 100644
--- a/Source/core/rendering/svg/SVGTextMetrics.cpp
+++ b/Source/core/rendering/svg/SVGTextMetrics.cpp
@@ -22,7 +22,6 @@
#include "core/rendering/svg/SVGTextMetrics.h"
#include "core/rendering/svg/RenderSVGInlineText.h"
-#include "core/rendering/svg/SVGTextRunRenderingContext.h"
namespace blink {
@@ -86,9 +85,6 @@ TextRun SVGTextMetrics::constructTextRun(RenderSVGInlineText* text, unsigned pos
run.setText(text->characters16() + position, length);
}
- if (textRunNeedsRenderingContext(style->font()))
- run.setRenderingContext(SVGTextRunRenderingContext::create(text));
-
// We handle letter & word spacing ourselves.
run.disableSpacing();
@@ -114,13 +110,12 @@ SVGTextMetrics::SVGTextMetrics(RenderSVGInlineText* text, unsigned position, uns
{
ASSERT(text);
- bool needsContext = textRunNeedsRenderingContext(text->style()->font());
float scalingFactor = text->scalingFactor();
ASSERT(scalingFactor);
m_width = width / scalingFactor;
m_height = text->scaledFont().fontMetrics().floatHeight() / scalingFactor;
- m_glyph = needsContext ? glyphNameGlyphId : 0;
+ m_glyph = 0;
m_length = length;
}

Powered by Google App Engine
This is Rietveld 408576698