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

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

Issue 910083002: Constify and use LayoutStyle reference in layout/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebaselined again Created 5 years, 10 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/layout/svg/SVGTextLayoutEngine.cpp ('k') | Source/core/layout/svg/SVGTextMetricsBuilder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/svg/SVGTextMetrics.cpp
diff --git a/Source/core/layout/svg/SVGTextMetrics.cpp b/Source/core/layout/svg/SVGTextMetrics.cpp
index 290815007416a57f3051aaf839a152feffd4037c..019c35bdfdad0de849396cef523664e299af7f82 100644
--- a/Source/core/layout/svg/SVGTextMetrics.cpp
+++ b/Source/core/layout/svg/SVGTextMetrics.cpp
@@ -64,8 +64,7 @@ TextRun SVGTextMetrics::constructTextRun(RenderSVGInlineText* text, unsigned pos
TextRun SVGTextMetrics::constructTextRun(RenderSVGInlineText* text, unsigned position, unsigned length, TextDirection textDirection)
{
- LayoutStyle* style = text->style();
- ASSERT(style);
+ const LayoutStyle& style = text->styleRef();
TextRun run(static_cast<const LChar*>(0) // characters, will be set below if non-zero.
, 0 // length, will be set below if non-zero.
@@ -73,7 +72,7 @@ TextRun SVGTextMetrics::constructTextRun(RenderSVGInlineText* text, unsigned pos
, 0 // padding, only relevant for justified text, not relevant for SVG
, TextRun::AllowTrailingExpansion
, textDirection
- , isOverride(style->unicodeBidi()) /* directionalOverride */);
+ , isOverride(style.unicodeBidi()) /* directionalOverride */);
if (length) {
if (text->is8Bit())
« no previous file with comments | « Source/core/layout/svg/SVGTextLayoutEngine.cpp ('k') | Source/core/layout/svg/SVGTextMetricsBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698