diff options
| author | Martin Robinson <mrobinson@igalia.com> | 2025-03-11 11:56:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-11 10:56:10 +0000 |
| commit | 2464d0937ffbf7697ca2e1193a6d12c28be28b16 (patch) | |
| tree | 338446f68aa38849b51cb515f13029067286e400 /components/script/navigation.rs | |
| parent | 81fe4bbb1ed5f2e48682925cffd9a86f582e639f (diff) | |
| download | servo-2464d0937ffbf7697ca2e1193a6d12c28be28b16.tar.gz servo-2464d0937ffbf7697ca2e1193a6d12c28be28b16.zip | |
base: Finish rename of `TopLevelBrowsingContextId` to `WebViewId` (#35896)
The `WebViewId` name is a lot more descriptive these days to the casual
reader, so I think we can go ahead and finish the rename.
Signed-off-by: Martin Robinson <mrobinson@igalia.com>
Diffstat (limited to 'components/script/navigation.rs')
| -rw-r--r-- | components/script/navigation.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/components/script/navigation.rs b/components/script/navigation.rs index 160ce769ade..ea120e690c2 100644 --- a/components/script/navigation.rs +++ b/components/script/navigation.rs @@ -9,7 +9,7 @@ use std::cell::Cell; use base::cross_process_instant::CrossProcessInstant; -use base::id::{BrowsingContextId, PipelineId, TopLevelBrowsingContextId}; +use base::id::{BrowsingContextId, PipelineId, WebViewId}; use content_security_policy::Destination; use crossbeam_channel::Sender; use http::header; @@ -128,7 +128,7 @@ pub(crate) struct InProgressLoad { pub(crate) browsing_context_id: BrowsingContextId, /// The top level ancestor browsing context. #[no_trace] - pub(crate) top_level_browsing_context_id: TopLevelBrowsingContextId, + pub(crate) webview_id: WebViewId, /// The parent pipeline and frame type associated with this load, if any. #[no_trace] pub(crate) parent_info: Option<PipelineId>, @@ -166,7 +166,7 @@ impl InProgressLoad { pub(crate) fn new( id: PipelineId, browsing_context_id: BrowsingContextId, - top_level_browsing_context_id: TopLevelBrowsingContextId, + webview_id: WebViewId, parent_info: Option<PipelineId>, opener: Option<BrowsingContextId>, window_size: WindowSizeData, @@ -177,7 +177,7 @@ impl InProgressLoad { InProgressLoad { pipeline_id: id, browsing_context_id, - top_level_browsing_context_id, + webview_id, parent_info, opener, window_size, @@ -193,9 +193,9 @@ impl InProgressLoad { pub(crate) fn request_builder(&mut self) -> RequestBuilder { let id = self.pipeline_id; - let top_level_browsing_context_id = self.top_level_browsing_context_id; + let webview_id = self.webview_id; let mut request_builder = RequestBuilder::new( - Some(top_level_browsing_context_id), + Some(webview_id), self.load_data.url.clone(), self.load_data.referrer.clone(), ) |