Source/core/layout/LayoutTextCombine.h - Issue 1033943002: Rename LayoutStyle to papayawhip

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/core/layout/LayoutTextCombine.h

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: ensureComputedStyle Created 5 years, 9 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/core/layout/LayoutTextCombine.h

diff --git a/Source/core/layout/LayoutTextCombine.h b/Source/core/layout/LayoutTextCombine.h

index 17300096e48573b23944047379df36e42c2a9e4a..51546a394f5f4491e41ca6931145bd620becf8f6 100644

--- a/Source/core/layout/LayoutTextCombine.h

+++ b/Source/core/layout/LayoutTextCombine.h

@@ -46,7 +46,7 @@ public:

private:

virtual bool isCombineText() const override { return true; }

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

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

+ virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;

virtual void setTextInternal(PassRefPtr<StringImpl>) override;

void updateIsCombined();

« no previous file with comments | « Source/core/layout/LayoutText.cpp ('k') | Source/core/layout/LayoutTextCombine.cpp » ('j') | no next file with comments »