chore: update Servo to 36aa8e9c739e6e4beb8f96e488202aaaf77d3b6a

forkme.lock

···
-c6fbaf33e2bdb9b7c7bcf2a03486f0c6b8ebf308
+36aa8e9c739e6e4beb8f96e488202aaaf77d3b6a

htmlshell/Cargo.toml

···
 edition.workspace = true
 
 [features]
-default = ["libservo/clipboard", "js_jit", "max_log_level", "media-gstreamer", "native-bluetooth",  "webgpu"]
+default = ["libservo/clipboard", "js_jit", "max_log_level", "media-gstreamer", "native-bluetooth", "webgpu"]
 gamepad = ["libservo/gamepad"]
 global-hotkeys = ["dep:global-hotkey"]
 crown = ["libservo/crown"]

patches/components/layout/display_list/mod.rs.patch

···
  use style::values::specified::text::TextDecorationLine;
  use style_traits::{CSSPixel as StyloCSSPixel, DevicePixel as StyloDevicePixel};
  use webrender_api::units::{
--    DeviceIntSize, DevicePixel, LayoutPixel, LayoutRect, LayoutSideOffsets, LayoutSize,
+-    DeviceIntSize, DevicePixel, LayoutPixel, LayoutPoint, LayoutRect, LayoutSideOffsets, LayoutSize,
 +    DeviceIntSize, DevicePixel, LayoutPixel, LayoutPoint, LayoutRect, LayoutSideOffsets,
 +    LayoutSize, LayoutTransform,
  };
  use webrender_api::{
      self as wr, BorderDetails, BorderRadius, BorderSide, BoxShadowClipMode, BuiltDisplayList,
--    ClipChainId, ClipMode, ColorF, CommonItemProperties, ComplexClipRegion, NinePatchBorder,
--    NinePatchBorderSource, NormalBorder, PrimitiveFlags, PropertyBinding, SpatialId,
--    SpatialTreeItemKey, units,
+-    ClipChainId, ClipMode, ColorF, CommonItemProperties, ComplexClipRegion, GlyphInstance,
+-    NinePatchBorder, NinePatchBorderSource, NormalBorder, PrimitiveFlags, PropertyBinding,
+-    SpatialId, SpatialTreeItemKey, units,
 +    ClipChainId, ClipMode, ColorF, CommonItemProperties, ComplexClipRegion, ExternalScrollId,
-+    NinePatchBorder, NinePatchBorderSource, NormalBorder, PrimitiveFlags, PropertyBinding,
-+    ReferenceFrameKind, SpatialId, SpatialTreeItemKey, TransformStyle, units,
++    GlyphInstance, NinePatchBorder, NinePatchBorderSource, NormalBorder, PrimitiveFlags,
++    PropertyBinding, ReferenceFrameKind, SpatialId, SpatialTreeItemKey, TransformStyle, units,
  };
  use wr::units::LayoutVector2D;
 

patches/components/script/dom/document.rs.patch

···
  use fonts::WebFontDocumentContext;
  use html5ever::{LocalName, Namespace, QualName, local_name, ns};
  use hyper_serde::Serde;
-@@ -611,6 +614,9 @@
+@@ -613,6 +616,9 @@
      #[ignore_malloc_size_of = "TODO: unimplemented on Image"]
      favicon: RefCell<Option<Image>>,
 
···
      /// All websockets created that are associated with this document.
      websockets: DOMTracker<WebSocket>,
 
-@@ -843,6 +849,12 @@
+@@ -845,6 +851,12 @@
 
          // Set the document's activity level, reflow if necessary, and suspend or resume timers.
          self.activity.set(activity);
···
          let media = ServoMedia::get();
          let pipeline_id = self.window().pipeline_id();
          let client_context_id =
-@@ -856,6 +868,7 @@
+@@ -858,6 +870,7 @@
 
          self.title_changed();
          self.notify_embedder_favicon();
···
          self.dirty_all_nodes();
          self.window().resume(can_gc);
          media.resume(&client_context_id);
-@@ -1248,6 +1261,9 @@
+@@ -1262,6 +1275,9 @@
                          LoadStatus::Started,
                      ));
                      self.send_to_embedder(EmbedderMsg::Status(self.webview_id(), None));
···
                  }
              },
              DocumentReadyState::Complete => {
-@@ -1256,6 +1272,9 @@
+@@ -1270,6 +1286,9 @@
                          self.webview_id(),
                          LoadStatus::Complete,
                      ));
···
                  }
                  update_with_current_instant(&self.dom_complete);
              },
-@@ -1664,7 +1683,13 @@
+@@ -1678,7 +1697,13 @@
          let window = self.window();
          if window.is_top_level() {
              let title = self.title().map(String::from);
···
          }
      }
 
-@@ -1673,6 +1698,18 @@
+@@ -1687,6 +1712,18 @@
          window.send_to_embedder(msg);
      }
 
···
      pub(crate) fn dirty_all_nodes(&self) {
          let root = match self.GetDocumentElement() {
              Some(root) => root,
-@@ -3158,9 +3195,59 @@
+@@ -3172,9 +3209,59 @@
              current_rendering_epoch,
          );
 
···
      pub(crate) fn handle_no_longer_waiting_on_asynchronous_image_updates(&self) {
          self.waiting_on_canvas_image_updates.set(false);
      }
-@@ -3893,6 +3980,7 @@
+@@ -3908,6 +3995,7 @@
              active_sandboxing_flag_set: Cell::new(SandboxingFlagSet::empty()),
              creation_sandboxing_flag_set: Cell::new(creation_sandboxing_flag_set),
              favicon: RefCell::new(None),
···
              websockets: DOMTracker::new(),
              details_name_groups: Default::default(),
              protocol_handler_automation_mode: Default::default(),
-@@ -4992,6 +5080,36 @@
+@@ -5007,6 +5095,36 @@
 
      pub(crate) fn notify_embedder_favicon(&self) {
          if let Some(ref image) = *self.favicon.borrow() {
···
              self.send_to_embedder(EmbedderMsg::NewFavicon(self.webview_id(), image.clone()));
          }
      }
-@@ -5000,6 +5118,20 @@
+@@ -5015,6 +5133,20 @@
          *self.favicon.borrow_mut() = Some(favicon);
          self.notify_embedder_favicon();
      }

patches/components/script/dom/html/htmlformelement.rs.patch

···
 --- original
 +++ modified
-@@ -857,8 +857,11 @@
-
-         // Step 19
+@@ -868,7 +868,7 @@
+         // form's node navigable, and noopener.
          let source = doc.browsing_context().unwrap();
--        let (maybe_chosen, _new) = source
--            .choose_browsing_context(target_attribute_value.unwrap_or(DOMString::new()), noopener);
-+        let (maybe_chosen, _new) = source.choose_browsing_context(
-+            target_attribute_value.unwrap_or(DOMString::new()),
-+            noopener,
-+            None,
-+        );
+         let (maybe_chosen, _new) =
+-            source.choose_browsing_context(target.unwrap_or_default(), noopener);
++            source.choose_browsing_context(target.unwrap_or_default(), noopener, None);
 
-         // Step 20
-         let chosen = match maybe_chosen {
+         let Some(chosen) = maybe_chosen else {
+             // Step 23. If targetNavigable is null, then return.

patches/components/script/dom/html/htmliframeelement.rs.patch

···
  #[dom_struct]
  pub(crate) struct HTMLIFrameElement {
      htmlelement: HTMLElement,
-@@ -93,6 +105,30 @@
-     /// while script at this point(when the flag is set)
-     /// expects those to run only for the navigated documented.
-     pending_navigation: Cell<bool>,
+@@ -97,6 +109,30 @@
+     /// an empty iframe is attached. In that case, we shouldn't fire a
+     /// subsequent asynchronous load event.
+     already_fired_synchronous_load_event: Cell<bool>,
 +    /// Whether this iframe is in "embed" mode (hosting a top-level webview).
 +    is_embedded_webview: Cell<bool>,
 +    /// The embedded webview ID when in embed mode.
···
  }
 
  impl HTMLIFrameElement {
-@@ -229,6 +265,8 @@
+@@ -255,6 +291,8 @@
                      viewport_details,
                      user_content_manager_id: None,
                      theme: window.theme(),
···
                  };
 
                  self.pipeline_id.set(Some(new_pipeline_id));
-@@ -443,6 +481,143 @@
+@@ -484,6 +522,147 @@
          );
      }
 
 +    /// Create an embedded webview for this iframe when the "embed" attribute is present.
 +    /// This creates a new top-level WebView instead of a nested browsing context.
 +    fn create_embedded_webview(&self) {
-+        let url = self.get_url();
++        let Some(url) = self.shared_attribute_processing_steps_for_iframe_and_frame_elements()
++        else {
++            error!("Can't create embedded webview without url");
++            return;
++        };
 +        let document = self.owner_document();
 +        let window = self.owner_window();
 +
···
      fn destroy_nested_browsing_context(&self) {
          self.pipeline_id.set(None);
          self.pending_pipeline_id.set(None);
-@@ -502,6 +677,13 @@
-             throttled: Cell::new(false),
+@@ -544,6 +723,13 @@
              script_window_proxies: ScriptThread::window_proxies(),
              pending_navigation: Default::default(),
+             already_fired_synchronous_load_event: Default::default(),
 +            is_embedded_webview: Cell::new(false),
 +            embedded_webview_id: Cell::new(None),
 +            embedded_history: DomRefCell::new(Vec::new()),
···
          }
      }
 
-@@ -537,7 +719,150 @@
+@@ -579,6 +765,149 @@
          self.webview_id.get()
      }
 
···
 +
 +    /// Get the effective webview ID, taking into account embedded webview mode.
 +    /// Returns the embedded webview ID if in embed mode, otherwise the parent webview ID.
-     #[inline]
++    #[inline]
 +    pub(crate) fn embedded_webview_id(&self) -> Option<WebViewId> {
 +        if self.is_embedded_webview.get() {
 +            self.embedded_webview_id.get()
···
 +        self.page_zoom.set(zoom);
 +    }
 +
-+    #[inline]
+     #[inline]
      pub(crate) fn sandboxing_flag_set(&self) -> SandboxingFlagSet {
          self.sandboxing_flag_set
-             .get()
-@@ -871,6 +1196,85 @@
+@@ -917,6 +1246,85 @@
      // This is specified as reflecting the name content attribute of the
      // element, not the name of the child browsing context.
      make_getter!(Name, "name");
···
  }
 
  impl VirtualMethods for HTMLIFrameElement {
-@@ -922,8 +1326,34 @@
+@@ -968,8 +1376,36 @@
                  // is in a document tree and has a browsing context, which is what causes
                  // the child browsing context to be created.
                  if self.upcast::<Node>().is_connected_with_browsing_context() {
···
 +                    // processing iframe attributes (which is for regular nested iframes).
 +                    if self.is_embedded_webview.get() {
 +                        if let Some(webview_id) = self.embedded_webview_id.get() {
-+                            let url = self.get_url();
++                            let url = self
++                                .shared_attribute_processing_steps_for_iframe_and_frame_elements()
++                                .expect("Failed to get embedding iframe url");
 +                            let window = self.owner_window();
 +                            window
 +                                .as_global_scope()
···
                  }
              },
              _ => {},
-@@ -967,6 +1397,23 @@
+@@ -1013,6 +1449,23 @@
 
          debug!("<iframe> running post connection steps");
 
···
          // Step 1. Create a new child navigable for insertedNode.
          self.create_nested_browsing_context(can_gc);
 
-@@ -989,8 +1436,22 @@
+@@ -1035,8 +1488,22 @@
      fn unbind_from_tree(&self, context: &UnbindContext, can_gc: CanGc) {
          self.super_type().unwrap().unbind_from_tree(context, can_gc);
 

patches/components/script/links.rs.patch

···
 --- original
 +++ modified
-@@ -386,7 +386,7 @@
+@@ -434,7 +434,7 @@
      let source = document.browsing_context().unwrap();
      let (maybe_chosen, history_handling) = match target_attribute_value {
          Some(name) => {

patches/components/script_bindings/codegen/Bindings.conf.patch

···
 --- original
 +++ modified
-@@ -253,6 +253,10 @@
+@@ -257,6 +257,10 @@
      'canGc': ['CheckValidity', 'GetLabels', 'GetValidity', 'SetValidity', 'ReportValidity', 'States'],
  },