third_party/WebKit/Source/core/layout/LayoutText.cpp - Issue 1743803002: Rename enums/functions that collide in chromium style in core/style/

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: third_party/WebKit/Source/core/layout/LayoutText.cpp

Issue 1743803002: Rename enums/functions that collide in chromium style in core/style/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-8

Patch Set: get-names-9: rebase Created 4 years, 10 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

« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutTableCell.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutTextControlSingleLine.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/LayoutText.cpp

diff --git a/third_party/WebKit/Source/core/layout/LayoutText.cpp b/third_party/WebKit/Source/core/layout/LayoutText.cpp

index 3af1361a9399b5cd5c46907d1371ee89efdcea0a..bdb9aded6edeefb68ecffd91debd5c14bbb4c19e 100644

--- a/third_party/WebKit/Source/core/layout/LayoutText.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutText.cpp

@@ -727,7 +727,7 @@ ALWAYS_INLINE float LayoutText::widthFromFont(const Font& f, int start, int len,

TextRun run = constructTextRun(f, this, start, len, styleRef(), textDirection);

run.setCharactersLength(textLength() - start);

ASSERT(run.charactersLength() >= run.length());

- run.setTabSize(!style()->collapseWhiteSpace(), style()->tabSize());

+ run.setTabSize(!style()->collapseWhiteSpace(), style()->getTabSize());

run.setXPos(leadWidth + textWidthSoFar);

FloatRect newGlyphBounds;

@@ -1081,7 +1081,7 @@ void LayoutText::computePreferredLogicalWidths(float leadWidth, HashSet<const Si

TextRun run = constructTextRun(f, this, i, 1, styleToUse, textDirection);

run.setCharactersLength(len - i);

ASSERT(run.charactersLength() >= run.length());

- run.setTabSize(!style()->collapseWhiteSpace(), style()->tabSize());

+ run.setTabSize(!style()->collapseWhiteSpace(), style()->getTabSize());

run.setXPos(leadWidth + currMaxWidth);

currMaxWidth += f.width(run);

@@ -1513,7 +1513,7 @@ float LayoutText::width(unsigned from, unsigned len, const Font& f, LayoutUnit x

run.setCharactersLength(textLength() - from);

ASSERT(run.charactersLength() >= run.length());

- run.setTabSize(!style()->collapseWhiteSpace(), style()->tabSize());

+ run.setTabSize(!style()->collapseWhiteSpace(), style()->getTabSize());

run.setXPos(xPos.toFloat());

w = f.width(run, fallbackFonts, glyphBounds);

}