Skip to content

Unify the LibWeb Rust crates in preparation for Rust layout #10897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kalenikaliaksandr merged 2 commits into from
Jul 28, 2026
Merged

Unify the LibWeb Rust crates in preparation for Rust layout #10897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0652323
LibWeb: Move style computation into the shared libweb crate
kalenikaliaksandr Jul 28, 2026
3ad466b
LibWeb: Move layout tree building into the shared libweb crate
kalenikaliaksandr Jul 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@ members = [
"Libraries/LibURL/Rust",
"Libraries/LibWasm/Rust",
"Libraries/LibWeb/ContentBlocker/Rust",
"Libraries/LibWeb/CSS/Rust",
"Libraries/LibWeb/Rust",
"Libraries/LibWeb/HTML/Parser/Rust",
"Libraries/LibWeb/Layout/Rust",
]
exclude = [
"Libraries/LibJS/Flap",
Expand Down
40 changes: 10 additions & 30 deletions Libraries/LibWeb/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1343,40 +1343,22 @@ endforeach()
import_rust_crate(
MANIFEST_PATH Rust/Cargo.toml
CRATE_NAME libweb_rust
FFI_HEADERS HTML/Parser/RustFFI.h
)

set(layout_rust_features "")
if (NOT BUILD_SHARED_LIBS)
set(layout_rust_features FEATURES allocator)
endif()
import_rust_crate(
MANIFEST_PATH Layout/Rust/Cargo.toml
CRATE_NAME libweb_layout_rust
${layout_rust_features}
FFI_HEADERS Layout/TreeBuilderRustFFI.h
)

set(css_rust_features "")
if (NOT BUILD_SHARED_LIBS)
set(css_rust_features FEATURES allocator)
endif()
import_rust_crate(
MANIFEST_PATH CSS/Rust/Cargo.toml
CRATE_NAME libweb_css_rust
${css_rust_features}
FFI_HEADERS RustFFI.h SelectorRustFFI.h StyleValueRustFFI.h ComputedValuesRustFFI.h
FFI_HEADERS
HTML/Parser/RustFFI.h
RustFFI.h
SelectorRustFFI.h
StyleValueRustFFI.h
ComputedValuesRustFFI.h
Layout/TreeBuilderRustFFI.h
)

set(content_blocker_rust_features "")
if (NOT BUILD_SHARED_LIBS)
set(content_blocker_rust_features FEATURES allocator)
endif()
import_rust_crate(MANIFEST_PATH ContentBlocker/Rust/Cargo.toml CRATE_NAME libweb_content_blocker_rust ${content_blocker_rust_features} FFI_HEADER ContentBlockerRustFFI.h)
target_link_libraries(LibWeb PRIVATE libweb_rust libweb_layout_rust libweb_css_rust libweb_content_blocker_rust)
target_link_libraries(LibWeb PRIVATE libweb_rust libweb_content_blocker_rust)
get_target_property(_libweb_rust_lib libweb_rust IMPORTED_LOCATION)
get_target_property(_libweb_layout_rust_lib libweb_layout_rust IMPORTED_LOCATION)
get_target_property(_libweb_css_rust_lib libweb_css_rust IMPORTED_LOCATION)
get_target_property(_libweb_content_blocker_rust_lib libweb_content_blocker_rust IMPORTED_LOCATION)
set_property(SOURCE HTML/Parser/HTMLTokenizer.cpp APPEND PROPERTY OBJECT_DEPENDS ${_libweb_rust_lib})
set_property(SOURCE HTML/Parser/HTMLParser.cpp APPEND PROPERTY OBJECT_DEPENDS ${_libweb_rust_lib})
Expand All @@ -1388,8 +1370,6 @@ endif()
if(NOT BUILD_SHARED_LIBS)
add_custom_command(TARGET LibWeb POST_BUILD
COMMAND ${CMAKE_AR} -x $<TARGET_FILE:libweb_rust>
COMMAND ${CMAKE_AR} -x $<TARGET_FILE:libweb_layout_rust>
COMMAND ${CMAKE_AR} -x $<TARGET_FILE:libweb_css_rust>
COMMAND ${CMAKE_AR} -x $<TARGET_FILE:libweb_content_blocker_rust>
COMMAND ${CMAKE_AR} -qS $<TARGET_FILE:LibWeb> *.o
COMMAND ${CMAKE_RANLIB} $<TARGET_FILE:LibWeb>
Expand All @@ -1404,9 +1384,9 @@ if(NOT BUILD_SHARED_LIBS)
# stale Rust objects. Force the C++ FFI bridge files to depend on the
# Rust archives: when they change, LibWeb re-archives, and POST_BUILD
# re-merges the fresh Rust objects.
set_property(SOURCE CSS/Parser/RustTokenizer.cpp APPEND PROPERTY OBJECT_DEPENDS ${_libweb_css_rust_lib})
set_property(SOURCE CSS/Parser/RustTokenizer.cpp APPEND PROPERTY OBJECT_DEPENDS ${_libweb_rust_lib})
set_property(SOURCE HTML/Parser/HTMLEncodingDetection.cpp APPEND PROPERTY OBJECT_DEPENDS ${_libweb_rust_lib})
set_property(SOURCE Layout/TreeBuilder.cpp APPEND PROPERTY OBJECT_DEPENDS ${_libweb_layout_rust_lib})
set_property(SOURCE Layout/TreeBuilder.cpp APPEND PROPERTY OBJECT_DEPENDS ${_libweb_rust_lib})
set_property(SOURCE Loader/ContentBlocker.cpp APPEND PROPERTY OBJECT_DEPENDS ${_libweb_content_blocker_rust_lib})
endif()

Expand Down
20 changes: 0 additions & 20 deletions Libraries/LibWeb/CSS/Rust/Cargo.toml
View file
Open in desktop

This file was deleted.

Loading