Source/WebCore/rendering/RenderCombineText.cpp - Issue 11190053: Merge 131077 - <rdar://problem/12477191> Combined text reverts to full-width font after a style cha…

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/RenderCombineText.cpp

Issue 11190053: Merge 131077 - <rdar://problem/12477191> Combined text reverts to full-width font after a style cha… (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1271/

Patch Set: Created 8 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/WebCore/rendering/RenderCombineText.cpp

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

--- Source/WebCore/rendering/RenderCombineText.cpp (revision 131772)

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

@@ -41,8 +41,10 @@

setStyleInternal(RenderStyle::clone(style()));

RenderText::styleDidChange(diff, oldStyle);

- if (m_isCombined)

+ if (m_isCombined) {

RenderText::setTextInternal(originalText()); // This RenderCombineText has been combined once. Restore the original text for the next combineText().

+ m_isCombined = false;

+ }

m_needsFontUpdate = true;

}

« no previous file with comments | « LayoutTests/fast/text/text-combine-width-after-style-change-expected.html ('k') | no next file » | no next file with comments »