Merge branch 'servo:master' into libmlservo#29768

13 files changed, 10 insertions, 52 deletions

diff --git a/components/layout_2020/flexbox/layout.rs b/components/layout_2020/flexbox/layout.rs
index 8826622276c..a7a2875a703 100644
--- a/components/layout_2020/flexbox/layout.rs
+++ b/components/layout_2020/flexbox/layout.rs
@@ -943,6 +943,8 @@ impl FlexLine<'_> {
                 //  it’s a min violation.”
                 for (item_and_target_main_size, frozen) in items() {
                     if violation(item_and_target_main_size) > Length::zero() {
+                        let (item, target_main_size) = item_and_target_main_size;
+                        target_main_size.set(item.content_min_size.main);
                         frozen_count.set(frozen_count.get() + 1);
                         frozen.set(true);
                     }
@@ -954,6 +956,11 @@ impl FlexLine<'_> {
                 //  it’s a max violation.”
                 for (item_and_target_main_size, frozen) in items() {
                     if violation(item_and_target_main_size) < Length::zero() {
+                        let (item, target_main_size) = item_and_target_main_size;
+                        let Some(max_size) = item.content_max_size.main else {
+                            unreachable!()
+                        };
+                        target_main_size.set(max_size);
                         frozen_count.set(frozen_count.get() + 1);
                         frozen.set(true);
                     }
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index 1f69637ad85..b65321cb5d3 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -557,8 +557,6 @@ class MachCommands(CommandBase):
             features=features, **kwargs
         )
 
-        elapsed = time() - build_start
-
         # Do some additional things if the build succeeded
         if status == 0:
             if android and not no_package:
@@ -631,6 +629,7 @@ class MachCommands(CommandBase):
 
                 if has_media_stack:
                     gst_root = gstreamer_root(target, env)
+                    print("Packaging gstreamer dylibs")
                     if not package_gstreamer_dylibs(gst_root, servo_path):
                         return 1
 
@@ -655,6 +654,7 @@ class MachCommands(CommandBase):
 
         # Generate Desktop Notification if elapsed-time > some threshold value
 
+        elapsed = time() - build_start
         elapsed_delta = datetime.timedelta(seconds=int(elapsed))
         build_message = f"{'Succeeded' if status == 0 else 'Failed'} in {elapsed_delta}"
         self.notify("Servo build", build_message)
@@ -858,8 +858,8 @@ def copy_dependencies(binary_path, lib_path, gst_root):
 
     # Update binary libraries
     binary_dependencies = set(otool(binary_path))
-    binary_dependencies = binary_dependencies.union(macos_plugins())
     change_non_system_libraries_path(binary_dependencies, relative_path, binary_path)
+    binary_dependencies = binary_dependencies.union(macos_plugins())
 
     # Update dependencies libraries
     need_checked = binary_dependencies
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-008.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-008.html.ini
deleted file mode 100644
index b0f1a4130ae..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-008.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-grow-008.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-center.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-center.html.ini
deleted file mode 100644
index 7868f916baf..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-center.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_justifycontent-center.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-flex-end.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-flex-end.html.ini
deleted file mode 100644
index 7321ceb98ea..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-flex-end.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_justifycontent-flex-end.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-flex-start.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-flex-start.html.ini
deleted file mode 100644
index 42330ff573f..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-flex-start.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_justifycontent-flex-start.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-spacearound-only.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-spacearound-only.html.ini
deleted file mode 100644
index 59b9e06f11b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-spacearound-only.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_justifycontent-spacearound-only.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-spacearound.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-spacearound.html.ini
deleted file mode 100644
index b886e442416..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-spacearound.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_justifycontent-spacearound.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-spacebetween-only.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-spacebetween-only.html.ini
deleted file mode 100644
index 32087d8f027..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-spacebetween-only.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_justifycontent-spacebetween-only.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-spacebetween.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-spacebetween.html.ini
deleted file mode 100644
index f326a468948..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-spacebetween.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_justifycontent-spacebetween.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005.html.ini
index 1702a404fe5..88fb94109a5 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005.html.ini
@@ -1,7 +1,4 @@
 [image-as-flexitem-size-005.html]
-  [.flexbox > img 11]
-    expected: FAIL
-
   [.flexbox > img 18]
     expected: FAIL
 
@@ -25,15 +22,3 @@
 
   [.flexbox > img 2]
     expected: FAIL
-
-  [.flexbox > img 14]
-    expected: FAIL
-
-  [.flexbox > img 17]
-    expected: FAIL
-
-  [.flexbox > img 12]
-    expected: FAIL
-
-  [.flexbox > img 9]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005v.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005v.html.ini
index caa6f8d9c11..c2089394dcd 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005v.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005v.html.ini
@@ -1,19 +1,4 @@
 [image-as-flexitem-size-005v.html]
-  [.flexbox > img 9]
-    expected: FAIL
-
-  [.flexbox > img 12]
-    expected: FAIL
-
-  [.flexbox > img 14]
-    expected: FAIL
-
-  [.flexbox > img 17]
-    expected: FAIL
-
-  [.flexbox > img 11]
-    expected: FAIL
-
   [.flexbox > img 18]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-012.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-012.html.ini
index 515fe962775..35f1c062419 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-012.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-012.html.ini
@@ -1,6 +1,3 @@
 [percentage-heights-012.html]
   [.flexbox 9]
     expected: FAIL
-
-  [.flexbox 10]
-    expected: FAIL