Source/WebCore/rendering/RenderCombineText.cpp - Issue 13679002: Add StyleChangeState to get rid of a bunch of static state in the render tree.

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 13679002: Add StyleChangeState to get rid of a bunch of static state in the render tree. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 7 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

« Source/WebCore/rendering/RenderBox.cpp ('K') | « Source/WebCore/rendering/RenderCombineText.h ('k') | Source/WebCore/rendering/RenderDeprecatedFlexibleBox.h » ('j') | Source/WebCore/rendering/RenderFlexibleBox.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebCore/rendering/RenderCombineText.cpp

diff --git a/Source/WebCore/rendering/RenderCombineText.cpp b/Source/WebCore/rendering/RenderCombineText.cpp

index ce316b6b92526f9c53a28625ac7e4c35ef8ea32c..de974ac76403396f6b76e5a5c6606ddec7cd9197 100644

--- a/Source/WebCore/rendering/RenderCombineText.cpp

+++ b/Source/WebCore/rendering/RenderCombineText.cpp

@@ -36,10 +36,10 @@ RenderCombineText::RenderCombineText(Node* node, PassRefPtr<StringImpl> string)

{

}

-void RenderCombineText::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)

+void RenderCombineText::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle, const StyleChangeState& state)

{

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

- RenderText::styleDidChange(diff, oldStyle);

+ RenderText::styleDidChange(diff, oldStyle, state);

if (m_isCombined) {

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