Source/WebCore/rendering/RenderBlockLineLayout.cpp - Issue 10883035: Merge 125503

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: Source/WebCore/rendering/RenderBlockLineLayout.cpp

Issue 10883035: Merge 125503 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/

Patch Set: Created 8 years, 4 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:

Index: Source/WebCore/rendering/RenderBlockLineLayout.cpp

===================================================================

--- Source/WebCore/rendering/RenderBlockLineLayout.cpp (revision 126632)

+++ Source/WebCore/rendering/RenderBlockLineLayout.cpp (working copy)

@@ -2326,10 +2326,10 @@

bool isSVGText = t->isSVGInlineText();

#endif

- RenderStyle* style = t->style(lineInfo.isFirstLine());

- if (style->hasTextCombine() && current.m_obj->isCombineText() && !toRenderCombineText(current.m_obj)->isCombined())

+ if (t->style()->hasTextCombine() && current.m_obj->isCombineText() && !toRenderCombineText(current.m_obj)->isCombined())

toRenderCombineText(current.m_obj)->combineText();

+ RenderStyle* style = t->style(lineInfo.isFirstLine());

const Font& f = style->font();

bool isFixedPitch = f.isFixedPitch();

bool canHyphenate = style->hyphens() == HyphensAuto && WebCore::canHyphenate(style->locale());

« no previous file with comments | « LayoutTests/fast/text/text-combine-first-line-crash-expected.txt ('k') | no next file » | no next file with comments »