mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
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>
This commit is contained in:
parent
81fe4bbb1e
commit
2464d0937f
22 changed files with 416 additions and 570 deletions
|
@ -943,14 +943,13 @@ mod test {
|
|||
use std::num::NonZeroU32;
|
||||
|
||||
use base::id::{
|
||||
BrowsingContextId, BrowsingContextIndex, PipelineNamespace, PipelineNamespaceId,
|
||||
TopLevelBrowsingContextId,
|
||||
BrowsingContextId, BrowsingContextIndex, PipelineNamespace, PipelineNamespaceId, WebViewId,
|
||||
};
|
||||
|
||||
use crate::webview::{UnknownWebView, WebViewAlreadyExists, WebViewManager};
|
||||
|
||||
fn top_level_id(namespace_id: u32, index: u32) -> TopLevelBrowsingContextId {
|
||||
TopLevelBrowsingContextId(BrowsingContextId {
|
||||
fn top_level_id(namespace_id: u32, index: u32) -> WebViewId {
|
||||
WebViewId(BrowsingContextId {
|
||||
namespace_id: PipelineNamespaceId(namespace_id),
|
||||
index: BrowsingContextIndex(NonZeroU32::new(index).unwrap()),
|
||||
})
|
||||
|
@ -958,7 +957,7 @@ mod test {
|
|||
|
||||
fn webviews_sorted<WebView: Clone>(
|
||||
webviews: &WebViewManager<WebView>,
|
||||
) -> Vec<(TopLevelBrowsingContextId, WebView)> {
|
||||
) -> Vec<(WebViewId, WebView)> {
|
||||
let mut keys = webviews.webviews.keys().collect::<Vec<_>>();
|
||||
keys.sort();
|
||||
keys.iter()
|
||||
|
@ -972,9 +971,9 @@ mod test {
|
|||
let mut webviews = WebViewManager::default();
|
||||
|
||||
// add() adds the webview to the map, but not the painting order.
|
||||
assert!(webviews.add(TopLevelBrowsingContextId::new(), 'a').is_ok());
|
||||
assert!(webviews.add(TopLevelBrowsingContextId::new(), 'b').is_ok());
|
||||
assert!(webviews.add(TopLevelBrowsingContextId::new(), 'c').is_ok());
|
||||
assert!(webviews.add(WebViewId::new(), 'a').is_ok());
|
||||
assert!(webviews.add(WebViewId::new(), 'b').is_ok());
|
||||
assert!(webviews.add(WebViewId::new(), 'c').is_ok());
|
||||
assert_eq!(
|
||||
webviews_sorted(&webviews),
|
||||
vec![
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue