Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement scrollbar-gutter both-edges support on non-viewports #14666

Merged

Conversation

lukewarlow
Copy link
Member

@lukewarlow lukewarlow commented Jun 5, 2023

9a055c1

Implement scrollbar-gutter both-edges support on non-viewports
https://bugs.webkit.org/show_bug.cgi?id=257708

Reviewed by Simon Fraser.

Scrollbar gutter now correctly works (on non-viewports) for both the
"stable" and "stable both-edges" values.

* LayoutTests/TestExpectations:
* LayoutTests/imported/w3c/web-platform-tests/css/css-overflow/scrollbar-gutter-001-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/css-overflow/scrollbar-gutter-rtl-001-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/css-overflow/scrollbar-gutter-vertical-lr-001-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/css-overflow/scrollbar-gutter-vertical-rl-001-expected.txt:
* Source/WebCore/rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::determineLogicalLeftPositionForChild):
* Source/WebCore/rendering/RenderBox.cpp:
(WebCore::RenderBox::contentBoxLocation const):
* Source/WebCore/rendering/RenderBoxInlines.h:
(WebCore::RenderBox::computedCSSContentBoxRect const):
(WebCore::RenderBox::contentHeight const):
(WebCore::RenderBox::contentWidth const):
(WebCore::RenderBox::overridingContentLogicalHeight const):
(WebCore::RenderBox::overridingContentLogicalWidth const):
* Source/WebCore/rendering/style/RenderStyle.h:

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

7efe6a9

Misc iOS, tvOS & watchOS macOS Linux Windows
βœ… πŸ§ͺ style βœ… πŸ›  ios βœ… πŸ›  mac βœ… πŸ›  wpe βœ… πŸ›  wincairo
βœ… πŸ§ͺ bindings βœ… πŸ›  ios-sim βœ… πŸ›  mac-AS-debug βœ… πŸ§ͺ wpe-wk2
βœ… πŸ§ͺ webkitperl βœ… πŸ§ͺ ios-wk2 βœ… πŸ§ͺ api-mac βœ… πŸ›  gtk
βœ… πŸ§ͺ ios-wk2-wpt βœ… πŸ§ͺ mac-wk1 βœ… πŸ§ͺ gtk-wk2
βœ… πŸ›  πŸ§ͺ jsc βœ… πŸ§ͺ api-ios ❌ πŸ§ͺ mac-wk2 βœ… πŸ§ͺ api-gtk
βœ… πŸ›  πŸ§ͺ jsc-arm64 βœ… πŸ›  tv   πŸ§ͺ mac-AS-debug-wk2 βœ… πŸ›  jsc-armv7
βœ… πŸ›  tv-sim ❌ πŸ§ͺ mac-wk2-stress βœ… πŸ§ͺ jsc-armv7-tests
βœ… πŸ›  πŸ§ͺ merge βœ… πŸ›  watch βœ… πŸ›  jsc-mips
βœ… πŸ›  watch-sim βœ… πŸ§ͺ jsc-mips-tests

@lukewarlow lukewarlow self-assigned this Jun 5, 2023
@lukewarlow lukewarlow added the CSS Cascading Style Sheets implementation label Jun 5, 2023
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jun 5, 2023
@lukewarlow lukewarlow removed the merging-blocked Applied to prevent a change from being merged label Jun 6, 2023
@lukewarlow lukewarlow force-pushed the scrollbar-gutter-both-edges branch from d8ee448 to e778618 Compare June 6, 2023 00:32
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jun 6, 2023
@lukewarlow lukewarlow removed the merging-blocked Applied to prevent a change from being merged label Jun 7, 2023
@lukewarlow lukewarlow force-pushed the scrollbar-gutter-both-edges branch from e778618 to c3aa87b Compare June 7, 2023 14:18
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jun 7, 2023
@lukewarlow lukewarlow marked this pull request as ready for review June 8, 2023 13:25
@lukewarlow lukewarlow removed the merging-blocked Applied to prevent a change from being merged label Jun 8, 2023
@lukewarlow lukewarlow requested a review from smfr June 13, 2023 15:55
@lukewarlow lukewarlow added the request-merge-queue Request a pull request to be added to merge-queue once ready label Jun 15, 2023
@Ahmad-S792 Ahmad-S792 added merge-queue Applied to send a pull request to merge-queue and removed request-merge-queue Request a pull request to be added to merge-queue once ready labels Jun 15, 2023
@webkit-commit-queue
Copy link
Collaborator

This change contains multiple commits which are not squashed together, blocking PR #14666. Please squash the commits to land.

@webkit-commit-queue webkit-commit-queue added merging-blocked Applied to prevent a change from being merged and removed merge-queue Applied to send a pull request to merge-queue labels Jun 15, 2023
@lukewarlow lukewarlow removed the merging-blocked Applied to prevent a change from being merged label Jun 15, 2023
@lukewarlow lukewarlow added the request-merge-queue Request a pull request to be added to merge-queue once ready label Jun 15, 2023
@webkit-ews-buildbot webkit-ews-buildbot added merging-blocked Applied to prevent a change from being merged and removed request-merge-queue Request a pull request to be added to merge-queue once ready labels Jun 15, 2023
@lukewarlow lukewarlow added request-merge-queue Request a pull request to be added to merge-queue once ready and removed merging-blocked Applied to prevent a change from being merged labels Jun 15, 2023
@Ahmad-S792 Ahmad-S792 added merge-queue Applied to send a pull request to merge-queue and removed request-merge-queue Request a pull request to be added to merge-queue once ready labels Jun 15, 2023
https://bugs.webkit.org/show_bug.cgi?id=257708

Reviewed by Simon Fraser.

Scrollbar gutter now correctly works (on non-viewports) for both the
"stable" and "stable both-edges" values.

* LayoutTests/TestExpectations:
* LayoutTests/imported/w3c/web-platform-tests/css/css-overflow/scrollbar-gutter-001-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/css-overflow/scrollbar-gutter-rtl-001-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/css-overflow/scrollbar-gutter-vertical-lr-001-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/css-overflow/scrollbar-gutter-vertical-rl-001-expected.txt:
* Source/WebCore/rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::determineLogicalLeftPositionForChild):
* Source/WebCore/rendering/RenderBox.cpp:
(WebCore::RenderBox::contentBoxLocation const):
* Source/WebCore/rendering/RenderBoxInlines.h:
(WebCore::RenderBox::computedCSSContentBoxRect const):
(WebCore::RenderBox::contentHeight const):
(WebCore::RenderBox::contentWidth const):
(WebCore::RenderBox::overridingContentLogicalHeight const):
(WebCore::RenderBox::overridingContentLogicalWidth const):
* Source/WebCore/rendering/style/RenderStyle.h:

Canonical link: https://commits.webkit.org/265199@main
@webkit-commit-queue
Copy link
Collaborator

Committed 265199@main (9a055c1): https://commits.webkit.org/265199@main

Reviewed commits have been landed. Closing PR #14666 and removing active labels.

@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Jun 15, 2023
@webkit-commit-queue webkit-commit-queue merged commit 9a055c1 into WebKit:main Jun 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CSS Cascading Style Sheets implementation
Projects
None yet
6 participants