third_party/WebKit/Source/platform/text/TextRun.h - 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/platform/text/TextRun.h

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/platform/fonts/shaping/SimpleShaper.cpp ('k') | third_party/WebKit/Source/web/WebLocalFrameImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/text/TextRun.h

diff --git a/third_party/WebKit/Source/platform/text/TextRun.h b/third_party/WebKit/Source/platform/text/TextRun.h

index 6a82cd4262fb85a2b1c8f4e2dc79130ff02e38e6..798df98acd09ce4f57c868d7a95a171e72f2dc47 100644

--- a/third_party/WebKit/Source/platform/text/TextRun.h

+++ b/third_party/WebKit/Source/platform/text/TextRun.h

@@ -194,7 +194,7 @@ public:

void setHorizontalGlyphStretch(float scale) { m_horizontalGlyphStretch = scale; }

bool allowTabs() const { return m_allowTabs; }

- TabSize tabSize() const { return m_tabSize; }

+ TabSize getTabSize() const { return m_tabSize; }

void setTabSize(bool, TabSize);

float xPos() const { return m_xpos; }

@@ -213,7 +213,7 @@ public:

void setDirectionalOverride(bool override) { m_directionalOverride = override; }

void setTextJustify(TextJustify textJustify) { m_textJustify = static_cast<unsigned>(textJustify); }

- TextJustify textJustify() const { return static_cast<TextJustify>(m_textJustify); }

+ TextJustify getTextJustify() const { return static_cast<TextJustify>(m_textJustify); }

private:

union {