feat(servo): upgrade to latest secure upstream snapshot
This commit is contained in:
@@ -47,9 +47,6 @@ pub struct SoftwareServoHost {
|
||||
default_surface_size: ServoSurfaceSize,
|
||||
rendering_context_kind: RenderingContextKind,
|
||||
webviews: HashMap<WebViewId, HostWebView>,
|
||||
// Servo 0.1.0 can still run script tasks after a remote page moves away.
|
||||
// Retain hidden about:blank WebViews until host shutdown releases them together.
|
||||
retired_webviews: Vec<HostWebView>,
|
||||
permissions: PermissionStore,
|
||||
wake_requested: Arc<AtomicBool>,
|
||||
last_rendered_frame: Option<RenderedFrame>,
|
||||
@@ -112,27 +109,7 @@ impl SoftwareServoHost {
|
||||
}
|
||||
|
||||
pub fn close_webview(&mut self, webview_id: &WebViewId) -> bool {
|
||||
let Some(webview) = self.webviews.remove(webview_id) else {
|
||||
return false;
|
||||
};
|
||||
self.retire_webview(webview);
|
||||
true
|
||||
}
|
||||
|
||||
fn retire_webview(&mut self, webview: HostWebView) {
|
||||
webview.webview.hide();
|
||||
if let Ok(blank_url) = Url::parse("about:blank") {
|
||||
webview.webview.load(blank_url);
|
||||
}
|
||||
for _ in 0..32 {
|
||||
self.servo.spin_event_loop();
|
||||
if webview.current_url().as_deref() == Some("about:blank")
|
||||
&& matches!(webview.state(), WebViewState::Complete)
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
self.retired_webviews.push(webview);
|
||||
self.webviews.remove(webview_id).is_some()
|
||||
}
|
||||
|
||||
fn new_started(
|
||||
@@ -155,7 +132,6 @@ impl SoftwareServoHost {
|
||||
default_surface_size: size,
|
||||
rendering_context_kind,
|
||||
webviews: HashMap::new(),
|
||||
retired_webviews: Vec::new(),
|
||||
permissions: Rc::new(RefCell::new(HashMap::new())),
|
||||
wake_requested,
|
||||
last_rendered_frame: None,
|
||||
@@ -399,11 +375,7 @@ impl ServoHost for SoftwareServoHost {
|
||||
|
||||
impl Drop for SoftwareServoHost {
|
||||
fn drop(&mut self) {
|
||||
let webviews = std::mem::take(&mut self.webviews);
|
||||
for webview in webviews.into_values() {
|
||||
self.retire_webview(webview);
|
||||
}
|
||||
self.retired_webviews.clear();
|
||||
self.webviews.clear();
|
||||
self.drain_after_webview_close();
|
||||
SERVO_RUNTIME_STARTED.store(false, Ordering::Release);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user