Source/WebCore/rendering/RenderCombineText.h - 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.h

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/RenderButton.cpp ('k') | Source/WebCore/rendering/RenderCombineText.cpp » ('j') | Source/WebCore/rendering/RenderFlexibleBox.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebCore/rendering/RenderCombineText.h

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

index 6ee9ff27fc3027bbb6e6cb16b8803e380409bf90..911699c7a6cf91957e6c8c624ebcd6bf88cbae3b 100644

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

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

@@ -41,7 +41,7 @@ private:

virtual bool isCombineText() const { return true; }

virtual float width(unsigned from, unsigned length, const Font&, float xPosition, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOverflow* = 0) const;

virtual const char* renderName() const { return "RenderCombineText"; }

- virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);

+ virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle, const StyleChangeState&) OVERRIDE;

virtual void setTextInternal(PassRefPtr<StringImpl>);

float m_combinedTextWidth;