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

Remove the __has_include(<Network/proxy_config_private.h>) check in WKWebsiteDataStore.h #13124

Merged
merged 1 commit into from
Apr 25, 2023
Merged

Remove the __has_include(<Network/proxy_config_private.h>) check in WKWebsiteDataStore.h #13124

merged 1 commit into from
Apr 25, 2023

Conversation

whsieh
Copy link
Member

@whsieh whsieh commented Apr 24, 2023 •
edited by webkit-early-warning-system

3d3a942

Remove the __has_include(<Network/proxy_config_private.h>) check in WKWebsiteDataStore.h
https://bugs.webkit.org/show_bug.cgi?id=255894
rdar://108476084

Reviewed by Aditya Keerthi.

This was added in a desperate attempt to fix the build in 261208@main. Clean this up by moving the
declaration to WebKitAdditions altogether, where we can replace the `<Network/proxy_config_private.h>`
include check with something more appropriate.

* Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.h:

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

354c06f

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

@whsieh whsieh requested a review from cdumez as a code owner April 24, 2023 23:20
@whsieh whsieh self-assigned this Apr 24, 2023
@whsieh whsieh added the WebKit API For issues and bugs in the Web Kit public embedding APIs label Apr 24, 2023
@webkit-early-warning-system
Copy link
Collaborator

EWS run on previous version of this PR (hash 1f8eeff)

Misc iOS, tvOS & watchOS macOS Linux Windows
❌ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ⏳ 🛠 wincairo
✅ 🛠 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
⏳ 🛠 tv-sim   🧪 mac-wk2-stress
⏳ 🛠 watch
⏳ 🛠 watch-sim

@webkit-early-warning-system
Copy link
Collaborator

EWS run on current version of this PR (hash 354c06f)

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

@whsieh whsieh added the merge-queue Applied to send a pull request to merge-queue label Apr 25, 2023
@whsieh
Remove the __has_include(<Network/proxy_config_private.h>) check in W…
3d3a942 
…KWebsiteDataStore.h

https://bugs.webkit.org/show_bug.cgi?id=255894
rdar://108476084

Reviewed by Aditya Keerthi.

This was added in a desperate attempt to fix the build in 261208@main. Clean this up by moving the
declaration to WebKitAdditions altogether, where we can replace the `<Network/proxy_config_private.h>`
include check with something more appropriate.

* Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.h:

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

Committed 263348@main (3d3a942): https://commits.webkit.org/263348@main

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

@webkit-commit-queue webkit-commit-queue merged commit 3d3a942 into WebKit:main Apr 25, 2023
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Apr 25, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pxlcoder pxlcoder pxlcoder approved these changes

@aprotyas aprotyas aprotyas approved these changes

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

@hortont424 hortont424 Awaiting requested review from hortont424

@geoffreygaren geoffreygaren Awaiting requested review from geoffreygaren

@beidson beidson Awaiting requested review from beidson

Assignees

@whsieh whsieh

Labels
WebKit API For issues and bugs in the Web Kit public embedding APIs
Projects
None yet
Milestone
No milestone
5 participants
@whsieh @webkit-early-warning-system @webkit-commit-queue @pxlcoder @aprotyas