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

Rename resourceRequest to originalRequest in NavigationAction #21489

Conversation

szewai
Copy link
Contributor

@szewai szewai commented Dec 8, 2023

e64e4c4

Rename resourceRequest to originalRequest in NavigationAction
https://bugs.webkit.org/show_bug.cgi?id=266054
rdar://119354060

Reviewed by Alex Christensen.

The resourceRequest in NavigationAction is the original request of the action, which is not necessarily the ongoing or
final request of the action (for example, server redirection will change request of the navigation), so this patch
updates the name for clarity.

* Source/WebCore/loader/NavigationAction.cpp:
(WebCore::NavigationAction::NavigationAction):
* Source/WebCore/loader/NavigationAction.h:
(WebCore::NavigationAction::isEmpty const):
(WebCore::NavigationAction::url const):
(WebCore::NavigationAction::originalRequest const):
(WebCore::NavigationAction::resourceRequest const): Deleted.
* Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::createWindow):
* Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
* Source/WebKit/WebProcess/WebCoreSupport/WebRemoteFrameClient.cpp:
(WebKit::WebRemoteFrameClient::changeLocation):

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

9a88ead

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 βœ… πŸ§ͺ api-wpe
βœ… πŸ§ͺ ios-wk2-wpt βœ… πŸ§ͺ mac-wk1 βœ… πŸ›  gtk
βœ… πŸ§ͺ api-ios βœ… πŸ§ͺ mac-wk2 βœ… πŸ§ͺ gtk-wk2
βœ… πŸ›  tv βœ… πŸ§ͺ mac-AS-debug-wk2 ❌ πŸ§ͺ api-gtk
βœ… πŸ›  tv-sim
βœ… πŸ›  πŸ§ͺ merge βœ… πŸ›  watch
βœ… πŸ›  watch-sim

@szewai szewai self-assigned this Dec 8, 2023
@szewai szewai added the New Bugs Unclassified bugs are placed in this component until the correct component can be determined. label Dec 8, 2023
@szewai szewai marked this pull request as ready for review December 8, 2023 04:34
@szewai szewai requested a review from cdumez as a code owner December 8, 2023 04:34
@szewai szewai force-pushed the eng/Rename-resourceRequest-to-originalRequest-in-NavigationAction branch from e9cac03 to b429214 Compare December 9, 2023 00:12
@szewai szewai added the merge-queue Applied to send a pull request to merge-queue label Dec 11, 2023
@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 Dec 11, 2023
@szewai szewai removed the merging-blocked Applied to prevent a change from being merged label Dec 12, 2023
@szewai szewai force-pushed the eng/Rename-resourceRequest-to-originalRequest-in-NavigationAction branch from b429214 to 9a88ead Compare December 12, 2023 18:06
@webkit-early-warning-system
Copy link
Collaborator

Starting EWS tests for 9a88ead. Live statuses available at the PR page, #21489

@szewai szewai added the merge-queue Applied to send a pull request to merge-queue label Dec 13, 2023
https://bugs.webkit.org/show_bug.cgi?id=266054
rdar://119354060

Reviewed by Alex Christensen.

The resourceRequest in NavigationAction is the original request of the action, which is not necessarily the ongoing or
final request of the action (for example, server redirection will change request of the navigation), so this patch
updates the name for clarity.

* Source/WebCore/loader/NavigationAction.cpp:
(WebCore::NavigationAction::NavigationAction):
* Source/WebCore/loader/NavigationAction.h:
(WebCore::NavigationAction::isEmpty const):
(WebCore::NavigationAction::url const):
(WebCore::NavigationAction::originalRequest const):
(WebCore::NavigationAction::resourceRequest const): Deleted.
* Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::createWindow):
* Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
* Source/WebKit/WebProcess/WebCoreSupport/WebRemoteFrameClient.cpp:
(WebKit::WebRemoteFrameClient::changeLocation):

Canonical link: https://commits.webkit.org/271994@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/Rename-resourceRequest-to-originalRequest-in-NavigationAction branch from 9a88ead to e64e4c4 Compare December 13, 2023 19:22
@webkit-commit-queue
Copy link
Collaborator

Committed 271994@main (e64e4c4): https://commits.webkit.org/271994@main

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

@webkit-commit-queue webkit-commit-queue merged commit e64e4c4 into WebKit:main Dec 13, 2023
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Dec 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
New Bugs Unclassified bugs are placed in this component until the correct component can be determined.
Projects
None yet
4 participants