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.

Sign up for GitHub

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

Jump to bottom

Fix compile error in ScrollingTreeFrameScrollingNodeMac.mm when -Wthread-safety-analysis is enabled #5156

Merged
merged 1 commit into from
Oct 10, 2022
Merged

Fix compile error in ScrollingTreeFrameScrollingNodeMac.mm when -Wthread-safety-analysis is enabled #5156

merged 1 commit into from
Oct 10, 2022

Conversation

jernoble
Copy link
Contributor

@jernoble jernoble commented Oct 7, 2022 •
edited by webkit-early-warning-system

b243d88

Fix compile error in ScrollingTreeFrameScrollingNodeMac.mm when -Wthread-safety-analysis is enabled
https://bugs.webkit.org/show_bug.cgi?id=246238
rdar://100915503

Reviewed by Eric Carlson.

Mark `repositionScrollingLayers()` as requiring the same treeLock() as
`isScrollingSynchronizedWithMainThread()` to reassure the compiler that the lock is held when
`isScrollingSynchronizedWithMainThread()` is called by `repositionScrollingLayers()`

* Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h:

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

939e5ec

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 🧪 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-debug ✅ 🛠 gtk ✅ 🛠 wincairo
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🛠 mac-AS-debug ✅ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 api-mac ✅ 🧪 api-gtk
✅ 🛠 tv ✅ 🧪 mac-wk1
✅ 🛠 tv-sim ✅ 🧪 mac-wk2
✅ 🛠 🧪 merge ✅ 🛠 watch ❌ 🧪 mac-AS-debug-wk2
✅ 🛠 watch-sim ✅ 🧪 mac-wk2-stress

@jernoble jernoble requested a review from cdumez as a code owner October 7, 2022 22:45
@jernoble jernoble self-assigned this Oct 7, 2022
@jernoble jernoble added Layout and Rendering For bugs with layout and rendering of Web pages. Other labels Oct 7, 2022
@webkit-early-warning-system
Copy link
Collaborator

EWS run on current version of this PR (hash 939e5ec)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 🧪 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-debug ✅ 🛠 gtk ✅ 🛠 wincairo
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🛠 mac-AS-debug ✅ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 api-mac ✅ 🧪 api-gtk
✅ 🛠 tv ✅ 🧪 mac-wk1
✅ 🛠 tv-sim ✅ 🧪 mac-wk2
✅ 🛠 🧪 merge ✅ 🛠 watch ❌ 🧪 mac-AS-debug-wk2
✅ 🛠 watch-sim ✅ 🧪 mac-wk2-stress

@jernoble
Copy link
Contributor Author

jernoble commented Oct 7, 2022

cq?

eric-carlson
eric-carlson approved these changes Oct 7, 2022
View reviewed changes
Copy link
Contributor

@eric-carlson eric-carlson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me

@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Oct 8, 2022
@jernoble jernoble added merge-queue Applied to send a pull request to merge-queue and removed merging-blocked Applied to prevent a change from being merged labels Oct 10, 2022
@jernoble
Fix compile error in ScrollingTreeFrameScrollingNodeMac.mm when -Wthr…
b243d88 
…ead-safety-analysis is enabled

https://bugs.webkit.org/show_bug.cgi?id=246238
rdar://100915503

Reviewed by Eric Carlson.

Mark `repositionScrollingLayers()` as requiring the same treeLock() as
`isScrollingSynchronizedWithMainThread()` to reassure the compiler that the lock is held when
`isScrollingSynchronizedWithMainThread()` is called by `repositionScrollingLayers()`

* Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h:

Canonical link: https://commits.webkit.org/255350@main
@webkit-early-warning-system webkit-early-warning-system force-pushed the eng/Fix-compile-error-in-ScrollingTreeFrameScrollingNodeMac-mm-when--Wthread-safety-analysis-is-enabled branch from 939e5ec to b243d88 Compare October 10, 2022 17:13
@webkit-early-warning-system webkit-early-warning-system merged commit b243d88 into WebKit:main Oct 10, 2022
@webkit-commit-queue
Copy link
Collaborator

Committed 255350@main (b243d88): https://commits.webkit.org/255350@main

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

@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Oct 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eric-carlson eric-carlson eric-carlson approved these changes

@cdumez cdumez Awaiting requested review from cdumez cdumez is a code owner

Assignees

@jernoble jernoble

Labels
Layout and Rendering For bugs with layout and rendering of Web pages.
Projects
None yet
Milestone
No milestone
5 participants
@jernoble @webkit-early-warning-system @webkit-commit-queue @eric-carlson @webkit-ews-buildbot