third_party/WebKit/Source/core/layout/svg/LayoutSVGInlineText.cpp - Issue 1937043002: Remove the LayoutSVGInlineText* context in SVGTextLayoutAttributes

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/layout/svg/LayoutSVGInlineText.cpp

Issue 1937043002: Remove the LayoutSVGInlineText* context in SVGTextLayoutAttributes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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 | « third_party/WebKit/Source/core/layout/svg/LayoutSVGInlineText.h ('k') | third_party/WebKit/Source/core/layout/svg/LayoutSVGText.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/svg/LayoutSVGInlineText.cpp

diff --git a/third_party/WebKit/Source/core/layout/svg/LayoutSVGInlineText.cpp b/third_party/WebKit/Source/core/layout/svg/LayoutSVGInlineText.cpp

index be198979b20e1466ace49b058141aca5a733c93c..fb03e762444b41671909d75ed18e42cd4c22826d 100644

--- a/third_party/WebKit/Source/core/layout/svg/LayoutSVGInlineText.cpp

+++ b/third_party/WebKit/Source/core/layout/svg/LayoutSVGInlineText.cpp

@@ -54,7 +54,6 @@ static PassRefPtr<StringImpl> normalizeWhitespace(PassRefPtr<StringImpl> string)

LayoutSVGInlineText::LayoutSVGInlineText(Node* n, PassRefPtr<StringImpl> string)

: LayoutText(n, normalizeWhitespace(string))

, m_scalingFactor(1)

- , m_layoutAttributes(this)

{

}

@@ -137,8 +136,8 @@ bool LayoutSVGInlineText::characterStartsNewTextChunk(int position) const

if (!position && parent()->isSVGTextPath() && !previousSibling())

return true;

- const SVGCharacterDataMap::const_iterator it = m_layoutAttributes.characterDataMap().find(static_cast<unsigned>(position + 1));

- if (it == m_layoutAttributes.characterDataMap().end())

+ const SVGCharacterDataMap::const_iterator it = m_characterDataMap.find(static_cast<unsigned>(position + 1));

+ if (it == m_characterDataMap.end())

return false;

return it->value.hasX() || it->value.hasY();