third_party/WebKit/Source/core/layout/LayoutReplaced.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/core/layout/LayoutReplaced.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/core/layout/LayoutObject.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutReplaced.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/LayoutReplaced.h

diff --git a/third_party/WebKit/Source/core/layout/LayoutReplaced.h b/third_party/WebKit/Source/core/layout/LayoutReplaced.h

index cf61ea775f7bfabb95244c322c02694ea15871cd..783e5d2da3f467fbe9450642cdd51f70308413cb 100644

--- a/third_party/WebKit/Source/core/layout/LayoutReplaced.h

+++ b/third_party/WebKit/Source/core/layout/LayoutReplaced.h

@@ -68,7 +68,7 @@ public:

virtual void paintReplaced(const PaintInfo&, const LayoutPoint&) const { }

LayoutRect localSelectionRect() const; // This is in local coordinates, but it's a physical rect (so the top left corner is physical top left).

- bool hasObjectFit() const { return style()->objectFit() != ComputedStyle::initialObjectFit(); }

+ bool hasObjectFit() const { return style()->getObjectFit() != ComputedStyle::initialObjectFit(); }

void paint(const PaintInfo&, const LayoutPoint&) const override;

« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutObject.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutReplaced.cpp » ('j') | no next file with comments »