mirror of
https://github.com/servo/servo.git
synced 2025-08-02 04:00:32 +01:00
* Add multiple concurrent top-level browsing contexts Co-authored-by: Delan Azabani <dazabani@igalia.com> * Rename variables and comments There are some variable and comments still use browser as names. This commit renames them to webview. * Update log message from web view to webview * Revert offscreen_framebuffer_id rename * Rename all web view to webview * Cargo fmt * Fix viewport/event/clear coordinates when multiview is disabled * Only deprecate things when multiview is enabled * Update WebViewManger with shown and invisible sets Replace visible_webviews and native_window_is_visible with shown_webviews and invisible_webviews. Add 4 more methods to set them accordingly. The behavior of is_effectively_visible will return true if the wbview is in shown_webviews set but not in invisible_webviews. * Update variant behaviors * Rename WebViewVisibilityChanged to MarkWebViewInvisible * Fix unit test by marking id 3 visible again * Update MarkWebViewInvisible and add UnmarkWebViewInvisible * Update format and doc comments * Clean up doc comments * Address style and naming changes * Rename UpdateWebView to UpdateFrameTreeForWebView * constellation: send frame tree unconditionally over focus and feature * Clarify shown and invisible sets in constellation WebViewManager * Eliminate forward_to_constellation!() * Actually remove the unused macro * Don’t gate compositor changes on multiview feature flag * Update todo in mouse event dispatch * Pass all visible webview ids in a single ReadyToPresent message * Fix compile and lint errors * servoshell: fix gap between minibrowser toolbar and webview * Fix failure in /_mozilla/mozilla/window_resizeTo.html * Fix compile warnings * Remove stray dbg!() * Remove confusing “effectively visible” logic (see #31815, #31816) * Allow embedder to show/hide/raise webviews without ipc * Update root pipeline only when painting order actually changes * Stop gating old focus and SetFrameTree behaviour behind Cargo feature * Use webview_id and WebViewId in webview-related code * Improve logging of webview-related embedder events * Allow webview Show and Raise events to optionally hide all others * Don’t do anything in response to WebViewPaintingOrder * Remove WebViewPaintingOrder, since its payload is unreliable * On MoveResizeWebView, only update root pipeline if rect changed * Rename IOCompositor methods for clarity * compositor: add event tracing; log webview ops even without ipc * Add temporary debug logging * Add more temporary debug logging * Remove temporary logging in compositor * Remove temporary debug logging * Add temporary debug logging, but defer I/O until panic * Capture a backtrace with each crash log entry * Proper error handling without panicking in WebViewManager * Clean up imports in constellation --------- Co-authored-by: Delan Azabani <dazabani@igalia.com> Co-authored-by: Martin Robinson <mrobinson@igalia.com>
200 lines
6.9 KiB
Rust
200 lines
6.9 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
|
|
use std::collections::HashMap;
|
|
|
|
use msg::constellation_msg::TopLevelBrowsingContextId;
|
|
|
|
#[derive(Debug)]
|
|
pub struct WebViewManager<WebView> {
|
|
/// Our top-level browsing contexts. In the WebRender scene, their pipelines are the children of
|
|
/// a single root pipeline that also applies any pinch zoom transformation.
|
|
webviews: HashMap<TopLevelBrowsingContextId, WebView>,
|
|
|
|
/// The order in which they were focused, latest last.
|
|
focus_order: Vec<TopLevelBrowsingContextId>,
|
|
|
|
/// Whether the latest webview in focus order is currently focused.
|
|
is_focused: bool,
|
|
}
|
|
|
|
impl<WebView> Default for WebViewManager<WebView> {
|
|
fn default() -> Self {
|
|
Self {
|
|
webviews: HashMap::default(),
|
|
focus_order: Vec::default(),
|
|
is_focused: false,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<WebView> WebViewManager<WebView> {
|
|
pub fn add(
|
|
&mut self,
|
|
top_level_browsing_context_id: TopLevelBrowsingContextId,
|
|
webview: WebView,
|
|
) {
|
|
self.webviews.insert(top_level_browsing_context_id, webview);
|
|
}
|
|
|
|
pub fn remove(
|
|
&mut self,
|
|
top_level_browsing_context_id: TopLevelBrowsingContextId,
|
|
) -> Option<WebView> {
|
|
if self.focus_order.last() == Some(&top_level_browsing_context_id) {
|
|
self.is_focused = false;
|
|
}
|
|
self.focus_order
|
|
.retain(|b| *b != top_level_browsing_context_id);
|
|
self.webviews.remove(&top_level_browsing_context_id)
|
|
}
|
|
|
|
pub fn get(
|
|
&self,
|
|
top_level_browsing_context_id: TopLevelBrowsingContextId,
|
|
) -> Option<&WebView> {
|
|
self.webviews.get(&top_level_browsing_context_id)
|
|
}
|
|
|
|
pub fn get_mut(
|
|
&mut self,
|
|
top_level_browsing_context_id: TopLevelBrowsingContextId,
|
|
) -> Option<&mut WebView> {
|
|
self.webviews.get_mut(&top_level_browsing_context_id)
|
|
}
|
|
|
|
pub fn focused_webview(&self) -> Option<(TopLevelBrowsingContextId, &WebView)> {
|
|
if !self.is_focused {
|
|
return None;
|
|
}
|
|
|
|
if let Some(top_level_browsing_context_id) = self.focus_order.last().cloned() {
|
|
debug_assert!(
|
|
self.webviews.contains_key(&top_level_browsing_context_id),
|
|
"BUG: webview in .focus_order not in .webviews!",
|
|
);
|
|
self.get(top_level_browsing_context_id)
|
|
.map(|webview| (top_level_browsing_context_id, webview))
|
|
} else {
|
|
debug_assert!(false, "BUG: .is_focused but no webviews in .focus_order!");
|
|
None
|
|
}
|
|
}
|
|
|
|
pub fn focus(&mut self, top_level_browsing_context_id: TopLevelBrowsingContextId) {
|
|
debug_assert!(self.webviews.contains_key(&top_level_browsing_context_id));
|
|
self.focus_order
|
|
.retain(|b| *b != top_level_browsing_context_id);
|
|
self.focus_order.push(top_level_browsing_context_id);
|
|
self.is_focused = true;
|
|
}
|
|
|
|
pub fn unfocus(&mut self) {
|
|
self.is_focused = false;
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use std::num::NonZeroU32;
|
|
|
|
use msg::constellation_msg::{
|
|
BrowsingContextId, BrowsingContextIndex, PipelineNamespace, PipelineNamespaceId,
|
|
TopLevelBrowsingContextId, WebViewId,
|
|
};
|
|
|
|
use crate::webview::WebViewManager;
|
|
|
|
fn id(namespace_id: u32, index: u32) -> WebViewId {
|
|
TopLevelBrowsingContextId(BrowsingContextId {
|
|
namespace_id: PipelineNamespaceId(namespace_id),
|
|
index: BrowsingContextIndex(NonZeroU32::new(index).expect("Incorrect test case")),
|
|
})
|
|
}
|
|
|
|
fn webviews_sorted<WebView: Clone>(
|
|
webviews: &WebViewManager<WebView>,
|
|
) -> Vec<(WebViewId, WebView)> {
|
|
let mut keys = webviews.webviews.keys().collect::<Vec<_>>();
|
|
keys.sort();
|
|
keys.iter()
|
|
.map(|&id| {
|
|
(
|
|
*id,
|
|
webviews
|
|
.webviews
|
|
.get(id)
|
|
.cloned()
|
|
.expect("Incorrect test case"),
|
|
)
|
|
})
|
|
.collect()
|
|
}
|
|
|
|
#[test]
|
|
fn test() {
|
|
PipelineNamespace::install(PipelineNamespaceId(0));
|
|
let mut webviews = WebViewManager::default();
|
|
|
|
// add() adds the webview to the map, but does not focus it.
|
|
webviews.add(WebViewId::new(), 'a');
|
|
webviews.add(WebViewId::new(), 'b');
|
|
webviews.add(WebViewId::new(), 'c');
|
|
assert_eq!(
|
|
webviews_sorted(&webviews),
|
|
vec![(id(0, 1), 'a'), (id(0, 2), 'b'), (id(0, 3), 'c'),]
|
|
);
|
|
assert!(webviews.focus_order.is_empty());
|
|
assert_eq!(webviews.is_focused, false);
|
|
|
|
// focus() makes the given webview the latest in focus order.
|
|
webviews.focus(id(0, 2));
|
|
assert_eq!(webviews.focus_order, vec![id(0, 2)]);
|
|
assert_eq!(webviews.is_focused, true);
|
|
webviews.focus(id(0, 1));
|
|
assert_eq!(webviews.focus_order, vec![id(0, 2), id(0, 1)]);
|
|
assert_eq!(webviews.is_focused, true);
|
|
webviews.focus(id(0, 3));
|
|
assert_eq!(webviews.focus_order, vec![id(0, 2), id(0, 1), id(0, 3)]);
|
|
assert_eq!(webviews.is_focused, true);
|
|
|
|
// unfocus() clears the “is focused” flag, but does not touch the focus order.
|
|
webviews.unfocus();
|
|
assert_eq!(webviews.focus_order, vec![id(0, 2), id(0, 1), id(0, 3)]);
|
|
assert_eq!(webviews.is_focused, false);
|
|
|
|
// focus() avoids duplicates in focus order, when the given webview has been focused before.
|
|
webviews.focus(id(0, 1));
|
|
assert_eq!(webviews.focus_order, vec![id(0, 2), id(0, 3), id(0, 1)]);
|
|
assert_eq!(webviews.is_focused, true);
|
|
|
|
// remove() clears the “is focused” flag iff the given webview was focused.
|
|
webviews.remove(id(1, 1));
|
|
assert_eq!(webviews.is_focused, true);
|
|
webviews.remove(id(1, 2));
|
|
assert_eq!(webviews.is_focused, true);
|
|
webviews.remove(id(2, 1));
|
|
assert_eq!(webviews.is_focused, true);
|
|
webviews.remove(id(2, 2));
|
|
assert_eq!(webviews.is_focused, true);
|
|
webviews.remove(id(2, 3));
|
|
assert_eq!(webviews.is_focused, true);
|
|
webviews.remove(id(2, 4));
|
|
assert_eq!(webviews.is_focused, true);
|
|
webviews.remove(id(3, 1));
|
|
assert_eq!(webviews.is_focused, true);
|
|
webviews.remove(id(4, 1));
|
|
assert_eq!(webviews.is_focused, true);
|
|
webviews.remove(id(0, 2));
|
|
assert_eq!(webviews.is_focused, true);
|
|
webviews.remove(id(0, 1));
|
|
assert_eq!(webviews.is_focused, false);
|
|
webviews.remove(id(0, 3));
|
|
assert_eq!(webviews.is_focused, false);
|
|
|
|
// remove() removes the given webview from both the map and the focus order.
|
|
assert!(webviews_sorted(&webviews).is_empty());
|
|
assert!(webviews.focus_order.is_empty());
|
|
}
|
|
}
|