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

Unified Diff: third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.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: none 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/layout/LayoutTreeAsText.cpp ('k') | third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp

diff --git a/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp b/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp

index cc2687ab746a4baeb869f2e2968cecf633fc83fa..c6c9a0cb9f3cd94c8c7cc6782d0fd6addef38c2e 100644

--- a/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp

+++ b/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp

@@ -952,21 +952,21 @@ static inline const LayoutObject& layoutObjectForScrollbar(const LayoutObject& l

// Try the <body> element first as a scrollbar source.

Element* body = doc.body();

- if (body && body->layoutObject() && body->layoutObject()->style()->hasPseudoStyle(SCROLLBAR))

+ if (body && body->layoutObject() && body->layoutObject()->style()->hasPseudoStyle(PseudoIdScrollbar))

return *body->layoutObject();

// If the <body> didn't have a custom style, then the root element might.

Element* docElement = doc.documentElement();

- if (docElement && docElement->layoutObject() && docElement->layoutObject()->style()->hasPseudoStyle(SCROLLBAR))

+ if (docElement && docElement->layoutObject() && docElement->layoutObject()->style()->hasPseudoStyle(PseudoIdScrollbar))

return *docElement->layoutObject();

// If we have an owning ipage/LocalFrame element, then it can set the custom scrollbar also.

LayoutPart* frameLayoutObject = node->document().frame()->ownerLayoutObject();

- if (frameLayoutObject && frameLayoutObject->style()->hasPseudoStyle(SCROLLBAR))

+ if (frameLayoutObject && frameLayoutObject->style()->hasPseudoStyle(PseudoIdScrollbar))

return *frameLayoutObject;

}

- if (layoutObject.styleRef().hasPseudoStyle(SCROLLBAR))

+ if (layoutObject.styleRef().hasPseudoStyle(PseudoIdScrollbar))

return layoutObject;

if (ShadowRoot* shadowRoot = node->containingShadowRoot()) {

@@ -981,7 +981,7 @@ static inline const LayoutObject& layoutObjectForScrollbar(const LayoutObject& l

bool PaintLayerScrollableArea::needsScrollbarReconstruction() const

{

const LayoutObject& actualLayoutObject = layoutObjectForScrollbar(box());

- bool shouldUseCustom = actualLayoutObject.isBox() && actualLayoutObject.styleRef().hasPseudoStyle(SCROLLBAR);

+ bool shouldUseCustom = actualLayoutObject.isBox() && actualLayoutObject.styleRef().hasPseudoStyle(PseudoIdScrollbar);

bool hasAnyScrollbar = hasScrollbar();

bool hasCustom = (hasHorizontalScrollbar() && horizontalScrollbar()->isCustomScrollbar()) || (hasVerticalScrollbar() && verticalScrollbar()->isCustomScrollbar());

bool didCustomScrollbarOwnerChanged = false;

@@ -1091,7 +1091,7 @@ void PaintLayerScrollableArea::updateScrollCornerStyle()

return;

const LayoutObject& actualLayoutObject = layoutObjectForScrollbar(box());

- RefPtr<ComputedStyle> corner = box().hasOverflowClip() ? actualLayoutObject.getUncachedPseudoStyle(PseudoStyleRequest(SCROLLBAR_CORNER), actualLayoutObject.style()) : PassRefPtr<ComputedStyle>(nullptr);

+ RefPtr<ComputedStyle> corner = box().hasOverflowClip() ? actualLayoutObject.getUncachedPseudoStyle(PseudoStyleRequest(PseudoIdScrollbarCorner), actualLayoutObject.style()) : PassRefPtr<ComputedStyle>(nullptr);

if (corner) {

if (!m_scrollCorner) {

m_scrollCorner = LayoutScrollbarPart::createAnonymous(&box().document());

@@ -1219,7 +1219,7 @@ void PaintLayerScrollableArea::updateResizerStyle()

return;

const LayoutObject& actualLayoutObject = layoutObjectForScrollbar(box());

- RefPtr<ComputedStyle> resizer = box().hasOverflowClip() ? actualLayoutObject.getUncachedPseudoStyle(PseudoStyleRequest(RESIZER), actualLayoutObject.style()) : PassRefPtr<ComputedStyle>(nullptr);

+ RefPtr<ComputedStyle> resizer = box().hasOverflowClip() ? actualLayoutObject.getUncachedPseudoStyle(PseudoStyleRequest(PseudoIdResizer), actualLayoutObject.style()) : PassRefPtr<ComputedStyle>(nullptr);

if (resizer) {

if (!m_resizer) {

m_resizer = LayoutScrollbarPart::createAnonymous(&box().document());

@@ -1539,7 +1539,7 @@ PassRefPtrWillBeRawPtr<Scrollbar> PaintLayerScrollableArea::ScrollbarManager::cr

ASSERT(orientation == HorizontalScrollbar ? !m_hBarIsAttached : !m_vBarIsAttached);

RefPtrWillBeRawPtr<Scrollbar> scrollbar = nullptr;

const LayoutObject& actualLayoutObject = layoutObjectForScrollbar(m_scrollableArea->box());

- bool hasCustomScrollbarStyle = actualLayoutObject.isBox() && actualLayoutObject.styleRef().hasPseudoStyle(SCROLLBAR);

+ bool hasCustomScrollbarStyle = actualLayoutObject.isBox() && actualLayoutObject.styleRef().hasPseudoStyle(PseudoIdScrollbar);

if (hasCustomScrollbarStyle) {

scrollbar = LayoutScrollbar::createCustomScrollbar(m_scrollableArea.get(), orientation, actualLayoutObject.node());

} else {