Source/core/rendering/RenderText.cpp - Issue 355843002: Rename style(bool) to styleOrFirstLineStyle(bool)

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/rendering/RenderText.cpp

Issue 355843002: Rename style(bool) to styleOrFirstLineStyle(bool) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 years, 6 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/rendering/RenderText.cpp

diff --git a/Source/core/rendering/RenderText.cpp b/Source/core/rendering/RenderText.cpp

index 156a2944343ff133c32f58ba96fbf263de87c2ab..8c17bf0417c628c303d91fecdba9a9099bb571a5 100644

--- a/Source/core/rendering/RenderText.cpp

+++ b/Source/core/rendering/RenderText.cpp

@@ -1477,7 +1477,7 @@ float RenderText::width(unsigned from, unsigned len, float xPos, TextDirection t

if (from + len > textLength())

len = textLength() - from;

- return width(from, len, style(firstLine)->font(), xPos, textDirection, fallbackFonts, glyphOverflow);

+ return width(from, len, styleOrFirstLineStyle(firstLine)->font(), xPos, textDirection, fallbackFonts, glyphOverflow);

}

float RenderText::width(unsigned from, unsigned len, const Font& f, float xPos, TextDirection textDirection, HashSet<const SimpleFontData*>* fallbackFonts, GlyphOverflow* glyphOverflow) const

« no previous file with comments | « Source/core/rendering/RenderRubyRun.cpp ('k') | Source/core/rendering/RootInlineBox.cpp » ('j') | no next file with comments »