[webkit-changes] [WebKit/WebKit] 964948: Ignore ::-webkit-scrollbar styles when scrollbar-w...

[Luke Warlow]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 964948660ae097f883e12408b84dea3efd98a7ae
      https://github.com/WebKit/WebKit/commit/964948660ae097f883e12408b84dea3efd98a7ae
  Author: Luke Warlow <luke at warlow.dev>
  Date:   2023-06-13 (Tue, 13 Jun 2023)

  Changed paths:
    A LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-color-001-expected.txt
    A LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-color-001.html
    A LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-color-002-expected.txt
    A LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-color-002.html
    A LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-color-003-expected.txt
    A LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-color-003.html
    A LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-color-004-expected.txt
    A LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-color-004.html
    A LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-color-005-expected.txt
    A LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-color-005.html
    A LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-width-010-expected.txt
    A LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-width-010.html
    A LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-width-011-expected.txt
    A LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-width-011.html
    A LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-width-012-expected.txt
    A LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-width-012.html
    A LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-width-013-expected.txt
    A LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-width-013.html
    A LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-width-014-expected.txt
    A LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-width-014.html
    A LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-width-015-expected.txt
    A LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-width-015.html
    A LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-width-016-expected.txt
    A LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-width-016.html
    M LayoutTests/platform/ios-wk2/TestExpectations
    M LayoutTests/platform/mac-wk1/TestExpectations
    M Source/WebCore/page/LocalFrameView.cpp
    M Source/WebCore/page/LocalFrameView.h
    M Source/WebCore/rendering/RenderBox.cpp
    M Source/WebCore/rendering/RenderLayerScrollableArea.cpp
    M Source/WebCore/rendering/RenderListBox.cpp
    M Source/WebCore/rendering/RenderMenuList.cpp
    M Source/WebCore/rendering/RenderSearchField.cpp
    M Source/WebCore/rendering/style/RenderStyle.h
    M Source/WebCore/rendering/style/RenderStyleInlines.h

  Log Message:
  -----------
  Ignore ::-webkit-scrollbar styles when scrollbar-width is not auto
https://bugs.webkit.org/show_bug.cgi?id=257052

Reviewed by Tim Nguyen and Simon Fraser.

RenderStyle::hasCustomScrollbarStyle() returns true if a custom style
for the scrollbar has been set via ::-webkit-scrollbar and the value of
scrollbar-width is auto (default). This replaces usages of
hasPseudoStyle(PseudoId::Scrollbar)
so the standard properties for styling scrollbars take precedence over
the non-standard.

WPT tests are included.

* LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-color-001-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-color-001.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-color-002-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-color-002.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-color-003-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-color-003.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-color-004-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-color-004.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-color-005-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-color-005.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-width-010-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-width-010.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-width-011-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-width-011.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-width-012-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-width-012.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-width-013-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-width-013.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-width-014-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-width-014.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-width-015-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-width-015.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-width-016-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-scrollbars/scrollbar-width-016.html: Added.
* LayoutTests/platform/ios-wk2/TestExpectations:
* LayoutTests/platform/mac-wk1/TestExpectations:
* Source/WebCore/page/LocalFrameView.cpp:
(WebCore::LocalFrameView::rootElementForCustomScrollbarPartStyle const):
(WebCore::LocalFrameView::createScrollbar):
(WebCore::LocalFrameView::canShowNonOverlayScrollbars const):
(WebCore::LocalFrameView::styleHidesScrollbarWithOrientation const):
* Source/WebCore/page/LocalFrameView.h:
* Source/WebCore/rendering/RenderBox.cpp:
(WebCore::RenderBox::canUseOverlayScrollbars const):
* Source/WebCore/rendering/RenderLayerScrollableArea.cpp:
(WebCore::RenderLayerScrollableArea::createScrollbar):
* Source/WebCore/rendering/RenderListBox.cpp:
(WebCore::RenderListBox::createScrollbar):
* Source/WebCore/rendering/RenderMenuList.cpp:
(RenderMenuList::createScrollbar):
* Source/WebCore/rendering/RenderSearchField.cpp:
(WebCore::RenderSearchField::createScrollbar):
* Source/WebCore/rendering/style/RenderStyle.h:
* Source/WebCore/rendering/style/RenderStyleInlines.h:
(WebCore::RenderStyle::hasCustomScrollbarStyle const):

Canonical link: https://commits.webkit.org/265129@main