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

Unified Diff: third_party/WebKit/Source/core/frame/FrameView.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/events/EventPathTest.cpp ('k') | third_party/WebKit/Source/core/inspector/InspectorCSSAgent.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/frame/FrameView.cpp

diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp

index 95256f8fd2dcc4cb21f24d1ecd36690a539a9a54..fd7d3025eb620064479e83f01379802ce5d4cbaa 100644

--- a/third_party/WebKit/Source/core/frame/FrameView.cpp

+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp

@@ -469,21 +469,21 @@ bool FrameView::shouldUseCustomScrollbars(Element*& customScrollbarElement, Loca

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

Element* body = doc ? doc->body() : 0;

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

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

customScrollbarElement = body;

return true;

}

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

Element* docElement = doc ? doc->documentElement() : 0;

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

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

customScrollbarElement = docElement;

return true;

}

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

LayoutPart* frameLayoutObject = m_frame->ownerLayoutObject();

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

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

customScrollbarFrame = m_frame.get();

return true;

}

@@ -2314,21 +2314,21 @@ void FrameView::updateScrollCorner()

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

if (Element* body = doc->body()) {

if (LayoutObject* layoutObject = body->layoutObject())

- cornerStyle = layoutObject->getUncachedPseudoStyle(PseudoStyleRequest(SCROLLBAR_CORNER), layoutObject->style());

+ cornerStyle = layoutObject->getUncachedPseudoStyle(PseudoStyleRequest(PseudoIdScrollbarCorner), layoutObject->style());

}

if (!cornerStyle) {

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

if (Element* docElement = doc->documentElement()) {

if (LayoutObject* layoutObject = docElement->layoutObject())

- cornerStyle = layoutObject->getUncachedPseudoStyle(PseudoStyleRequest(SCROLLBAR_CORNER), layoutObject->style());

+ cornerStyle = layoutObject->getUncachedPseudoStyle(PseudoStyleRequest(PseudoIdScrollbarCorner), layoutObject->style());

}

if (!cornerStyle) {

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

if (LayoutPart* layoutObject = m_frame->ownerLayoutObject())

- cornerStyle = layoutObject->getUncachedPseudoStyle(PseudoStyleRequest(SCROLLBAR_CORNER), layoutObject->style());

+ cornerStyle = layoutObject->getUncachedPseudoStyle(PseudoStyleRequest(PseudoIdScrollbarCorner), layoutObject->style());

}