Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'servo:master' into issue#29773

Browse source
This commit is contained in:
Michael Grigoryan 2023-05-23 00:03:11 +04:00 • committed by GitHub
commit 9c5119b951
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 10 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/layout_2020/flexbox/layout.rs
View file

@ -943,6 +943,8 @@ impl FlexLine<'_> {
// it’s a min violation.” // it’s a min violation.”
for (item_and_target_main_size, frozen) in items() { for (item_and_target_main_size, frozen) in items() {
if violation(item_and_target_main_size) > Length::zero() { 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_count.set(frozen_count.get() + 1);
frozen.set(true); frozen.set(true);
} }
@ -954,6 +956,11 @@ impl FlexLine<'_> {
// it’s a max violation.” // it’s a max violation.”
for (item_and_target_main_size, frozen) in items() { for (item_and_target_main_size, frozen) in items() {
if violation(item_and_target_main_size) < Length::zero() { 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_count.set(frozen_count.get() + 1);
frozen.set(true); frozen.set(true);
} }

6
python/servo/build_commands.py
View file

@ -557,8 +557,6 @@ class MachCommands(CommandBase):
features=features, **kwargs features=features, **kwargs
) )
elapsed = time() - build_start
# Do some additional things if the build succeeded # Do some additional things if the build succeeded
if status == 0: if status == 0:
if android and not no_package: if android and not no_package:
@ -631,6 +629,7 @@ class MachCommands(CommandBase):
if has_media_stack: if has_media_stack:
gst_root = gstreamer_root(target, env) gst_root = gstreamer_root(target, env)
print("Packaging gstreamer dylibs")
if not package_gstreamer_dylibs(gst_root, servo_path): if not package_gstreamer_dylibs(gst_root, servo_path):
return 1 return 1
@ -655,6 +654,7 @@ class MachCommands(CommandBase):
# Generate Desktop Notification if elapsed-time > some threshold value # Generate Desktop Notification if elapsed-time > some threshold value
elapsed = time() - build_start
elapsed_delta = datetime.timedelta(seconds=int(elapsed)) elapsed_delta = datetime.timedelta(seconds=int(elapsed))
build_message = f"{'Succeeded' if status == 0 else 'Failed'} in {elapsed_delta}" build_message = f"{'Succeeded' if status == 0 else 'Failed'} in {elapsed_delta}"
self.notify("Servo build", build_message) self.notify("Servo build", build_message)
@ -858,8 +858,8 @@ def copy_dependencies(binary_path, lib_path, gst_root):
# Update binary libraries # Update binary libraries
binary_dependencies = set(otool(binary_path)) binary_dependencies = set(otool(binary_path))
binary_dependencies = binary_dependencies.union(macos_plugins())
change_non_system_libraries_path(binary_dependencies, relative_path, binary_path) change_non_system_libraries_path(binary_dependencies, relative_path, binary_path)
binary_dependencies = binary_dependencies.union(macos_plugins())
# Update dependencies libraries # Update dependencies libraries
need_checked = binary_dependencies need_checked = binary_dependencies

2
tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-008.html.ini
View file

@ -1,2 +0,0 @@
[flex-grow-008.html]
expected: FAIL

2
tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-center.html.ini
View file

@ -1,2 +0,0 @@
[flexbox_justifycontent-center.html]
expected: FAIL

2
tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-flex-end.html.ini
View file

@ -1,2 +0,0 @@
[flexbox_justifycontent-flex-end.html]
expected: FAIL

2
tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-flex-start.html.ini
View file

@ -1,2 +0,0 @@
[flexbox_justifycontent-flex-start.html]
expected: FAIL

2
tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-spacearound-only.html.ini
View file

@ -1,2 +0,0 @@
[flexbox_justifycontent-spacearound-only.html]
expected: FAIL

2
tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-spacearound.html.ini
View file

@ -1,2 +0,0 @@
[flexbox_justifycontent-spacearound.html]
expected: FAIL

2
tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-spacebetween-only.html.ini
View file

@ -1,2 +0,0 @@
[flexbox_justifycontent-spacebetween-only.html]
expected: FAIL

2
tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-spacebetween.html.ini
View file

@ -1,2 +0,0 @@
[flexbox_justifycontent-spacebetween.html]
expected: FAIL

15
tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005.html.ini
View file

@ -1,7 +1,4 @@
[image-as-flexitem-size-005.html] [image-as-flexitem-size-005.html]
[.flexbox > img 11]
expected: FAIL
[.flexbox > img 18] [.flexbox > img 18]
expected: FAIL expected: FAIL
@ -25,15 +22,3 @@
[.flexbox > img 2] [.flexbox > img 2]
expected: FAIL expected: FAIL
[.flexbox > img 14]
expected: FAIL
[.flexbox > img 17]
expected: FAIL
[.flexbox > img 12]
expected: FAIL
[.flexbox > img 9]
expected: FAIL

15
tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005v.html.ini
View file

@ -1,19 +1,4 @@
[image-as-flexitem-size-005v.html] [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] [.flexbox > img 18]
expected: FAIL expected: FAIL

3
tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-012.html.ini
View file

@ -1,6 +1,3 @@
[percentage-heights-012.html] [percentage-heights-012.html]
[.flexbox 9] [.flexbox 9]
expected: FAIL expected: FAIL
[.flexbox 10]
expected: FAIL