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

[Curl] Rename some functions in ResourceErrorCurl. #7379

Merged
merged 1 commit into from Dec 9, 2022

Conversation

kshukuwa
Copy link
Contributor

@kshukuwa kshukuwa commented Dec 9, 2022

f18b004

[Curl] Rename some functions in ResourceErrorCurl.
https://bugs.webkit.org/show_bug.cgi?id=249009

Reviewed by Fujii Hironori.

Rename the ResourceError::httpError and
ResourceError::isSSLCertVerificationError functions.

* Source/WebCore/platform/network/curl/CurlRequest.cpp:
(WebCore::CurlRequest::didCompleteTransfer):
* Source/WebCore/platform/network/curl/ResourceError.h:
* Source/WebCore/platform/network/curl/ResourceErrorCurl.cpp:
(WebCore::ResourceError::ResourceError):
(WebCore::ResourceError::isCertificationVerificationError const):
(WebCore::ResourceError::httpError): Deleted.
(WebCore::ResourceError::isSSLCertVerificationError const): Deleted.
* Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp:
(WebCore::ResourceHandle::willSendRequest):
* Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp:
(WebKit::NetworkDataTaskCurl::curlDidReceiveData):
(WebKit::NetworkDataTaskCurl::curlDidFailWithError):
(WebKit::NetworkDataTaskCurl::invokeDidReceiveResponse):
(WebKit::NetworkDataTaskCurl::willPerformHTTPRedirection):
* Source/WebKit/UIProcess/Inspector/win/InspectorResourceURLSchemeHandler.cpp:
(WebKit::InspectorResourceURLSchemeHandler::platformStartTask):

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

1577eca

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

@kshukuwa kshukuwa requested a review from cdumez as a code owner December 9, 2022 05:51
@fujii fujii added the merge-queue Applied to send a pull request to merge-queue label Dec 9, 2022
https://bugs.webkit.org/show_bug.cgi?id=249009

Reviewed by Fujii Hironori.

Rename the ResourceError::httpError and
ResourceError::isSSLCertVerificationError functions.

* Source/WebCore/platform/network/curl/CurlRequest.cpp:
(WebCore::CurlRequest::didCompleteTransfer):
* Source/WebCore/platform/network/curl/ResourceError.h:
* Source/WebCore/platform/network/curl/ResourceErrorCurl.cpp:
(WebCore::ResourceError::ResourceError):
(WebCore::ResourceError::isCertificationVerificationError const):
(WebCore::ResourceError::httpError): Deleted.
(WebCore::ResourceError::isSSLCertVerificationError const): Deleted.
* Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp:
(WebCore::ResourceHandle::willSendRequest):
* Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp:
(WebKit::NetworkDataTaskCurl::curlDidReceiveData):
(WebKit::NetworkDataTaskCurl::curlDidFailWithError):
(WebKit::NetworkDataTaskCurl::invokeDidReceiveResponse):
(WebKit::NetworkDataTaskCurl::willPerformHTTPRedirection):
* Source/WebKit/UIProcess/Inspector/win/InspectorResourceURLSchemeHandler.cpp:
(WebKit::InspectorResourceURLSchemeHandler::platformStartTask):

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

Committed 257611@main (f18b004): https://commits.webkit.org/257611@main

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

@webkit-early-warning-system webkit-early-warning-system merged commit f18b004 into WebKit:main Dec 9, 2022
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Dec 9, 2022
@kshukuwa kshukuwa deleted the eng/bug249009 branch December 9, 2022 07:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants