third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp - Issue 1740483004: Rename enums/functions that collide in chromium style in core/html/.

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/LayoutBlockFlow.cpp

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

Patch Set: get-names-6: . 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/html/track/vtt/VTTScanner.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutTheme.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 468ccc3017aade902d0d3643e4f84b8f2a66fd45..7ad62e9e70c3c718c76842a029d6ad7fd48ce638 100644

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

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

@@ -2835,19 +2835,19 @@ LayoutBlockFlow::LayoutBlockFlowRareData& LayoutBlockFlow::ensureRareData()

void LayoutBlockFlow::positionDialog()

{

HTMLDialogElement* dialog = toHTMLDialogElement(node());

- if (dialog->centeringMode() == HTMLDialogElement::NotCentered)

+ if (dialog->getCenteringMode() == HTMLDialogElement::NotCentered)

return;

bool canCenterDialog = (style()->position() == AbsolutePosition || style()->position() == FixedPosition)

&& style()->hasAutoTopAndBottom();

- if (dialog->centeringMode() == HTMLDialogElement::Centered) {

+ if (dialog->getCenteringMode() == HTMLDialogElement::Centered) {

if (canCenterDialog)

setY(dialog->centeredPosition());

return;

}

- ASSERT(dialog->centeringMode() == HTMLDialogElement::NeedsCentering);

+ ASSERT(dialog->getCenteringMode() == HTMLDialogElement::NeedsCentering);

if (!canCenterDialog) {

dialog->setNotCentered();

return;