third_party/WebKit/Source/core/style/ComputedStyle.h - Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide.

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/style/ComputedStyle.h

Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clash-platform: rebase-yayyyyyyyy Created 4 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

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

Index: third_party/WebKit/Source/core/style/ComputedStyle.h

diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.h b/third_party/WebKit/Source/core/style/ComputedStyle.h

index a9ebb4ae05069cb05ccd325dc34ffd4667bc15fc..75406228619594c82b794fadf12232bf3e6e0e0c 100644

--- a/third_party/WebKit/Source/core/style/ComputedStyle.h

+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h

@@ -594,8 +594,8 @@ public:

bool isFixedTableLayout() const { return tableLayout() == TableLayoutFixed && !logicalWidth().isAuto(); }

const Font& font() const;

- const FontMetrics& fontMetrics() const;

- const FontDescription& fontDescription() const;

+ const FontMetrics& getFontMetrics() const;

+ const FontDescription& getFontDescription() const;

float specifiedFontSize() const;

float computedFontSize() const;

int fontSize() const;

@@ -865,7 +865,7 @@ public:

LineBreak getLineBreak() const { return static_cast<LineBreak>(rareInheritedData->lineBreak); }

const AtomicString& highlight() const { return rareInheritedData->highlight; }

const AtomicString& hyphenationString() const { return rareInheritedData->hyphenationString; }

- const AtomicString& locale() const { return fontDescription().locale(false); }

+ const AtomicString& locale() const { return getFontDescription().locale(false); }

EResize resize() const { return static_cast<EResize>(rareNonInheritedData->m_resize); }

bool hasInlinePaginationAxis() const

{