third_party/WebKit/Source/core/layout/LayoutBlock.cpp - Issue 1765933003: style: Rename the PseudoId enum values to CamelCase and prefix them.

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

Issue 1765933003: style: Rename the PseudoId enum values to CamelCase and prefix them. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: enum-clash-PseudoId: rebase 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

« third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp ('K') | « third_party/WebKit/Source/core/layout/HitTestResult.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutCounter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index c32c6c3e22c69b550a061675f965e6477cd167b8..1134b7d3df337a062966fd827a6401a4784dbd90 100644

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

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

@@ -767,8 +767,8 @@ void LayoutBlock::removeChild(LayoutObject* oldChild)

// are floating, then we need to pull the content up also.

LayoutBlock* anonymousBlock = toLayoutBlock((prev && prev->isAnonymousBlock()) ? prev : next);

if ((anonymousBlock->previousSibling() || anonymousBlock->nextSibling())

- && (!anonymousBlock->previousSibling() || (anonymousBlock->previousSibling()->style()->styleType() != NOPSEUDO && anonymousBlock->previousSibling()->isFloating() && !anonymousBlock->previousSibling()->previousSibling()))

- && (!anonymousBlock->nextSibling() || (anonymousBlock->nextSibling()->style()->styleType() != NOPSEUDO && anonymousBlock->nextSibling()->isFloating() && !anonymousBlock->nextSibling()->nextSibling()))) {

+ && (!anonymousBlock->previousSibling() || (anonymousBlock->previousSibling()->style()->styleType() != PseudoIdNoPseudo && anonymousBlock->previousSibling()->isFloating() && !anonymousBlock->previousSibling()->previousSibling()))

+ && (!anonymousBlock->nextSibling() || (anonymousBlock->nextSibling()->style()->styleType() != PseudoIdNoPseudo && anonymousBlock->nextSibling()->isFloating() && !anonymousBlock->nextSibling()->nextSibling()))) {

collapseAnonymousBlockChild(this, anonymousBlock);

}

@@ -2287,7 +2287,7 @@ LayoutBlock* LayoutBlock::enclosingFirstLineStyleBlock() const

LayoutBlock* firstLineBlock = const_cast<LayoutBlock*>(this);

bool hasPseudo = false;

while (true) {

- hasPseudo = firstLineBlock->style()->hasPseudoStyle(FIRST_LINE);

+ hasPseudo = firstLineBlock->style()->hasPseudoStyle(PseudoIdFirstLine);

if (hasPseudo)

break;

LayoutObject* parentBlock = firstLineBlock->parent();