From b4df4d66dcd3ad76312a4580f4f9c8f6c1a6af36 Mon Sep 17 00:00:00 2001 From: Sebastian Zaha Date: Sat, 12 Aug 2023 22:44:37 +0200 Subject: [PATCH] Meta: Port recent build changes to gn build This ports the following commits: f76c614a84aad2792c853756af71a0d4d3e0d445 ddbe6bd7b4a200c899fd416407d0f7839cab2f0c 2eaa528a0ea606b2be9a1868ba711b1987409d70 1b40bf97837a5cad6813dff44438cac46272c2c5 9f6ceff7cf86e88cc5fd19933ce96c260c1dba5b 52d6df5ee5834bb7edf0e0f533a5069c4ebeb348 9e22f01ebad1b08367b3a9719e79f396351ea175 bf4e2f3e9c0a2757f42228c26518468b1bdbefa6 da2cd73bcf094c89c9a6d3afbb8fe1bc57fd74d2 --- .../Lagom/Tools/CodeGenerators/LibWeb/BUILD.gn | 8 ++++++++ .../Userland/Libraries/LibCore/BUILD.gn | 6 ++---- .../secondary/Userland/Libraries/LibJS/BUILD.gn | 1 - .../Userland/Libraries/LibSQL/BUILD.gn | 1 - .../Userland/Libraries/LibWeb/BUILD.gn | 17 ++++++++++------- .../Libraries/LibWeb/CSS/StyleValues/BUILD.gn | 1 + .../Libraries/LibWeb/Internals/BUILD.gn | 5 +++++ .../Userland/Libraries/LibWeb/MathML/BUILD.gn | 8 ++++++++ .../Userland/Libraries/LibWeb/SVG/BUILD.gn | 1 + .../Userland/Libraries/LibWeb/idl_files.gni | 4 ++++ 10 files changed, 39 insertions(+), 13 deletions(-) create mode 100644 Meta/gn/secondary/Userland/Libraries/LibWeb/Internals/BUILD.gn create mode 100644 Meta/gn/secondary/Userland/Libraries/LibWeb/MathML/BUILD.gn diff --git a/Meta/gn/secondary/Meta/Lagom/Tools/CodeGenerators/LibWeb/BUILD.gn b/Meta/gn/secondary/Meta/Lagom/Tools/CodeGenerators/LibWeb/BUILD.gn index 92324994ed..ec465f6747 100644 --- a/Meta/gn/secondary/Meta/Lagom/Tools/CodeGenerators/LibWeb/BUILD.gn +++ b/Meta/gn/secondary/Meta/Lagom/Tools/CodeGenerators/LibWeb/BUILD.gn @@ -52,6 +52,14 @@ lagom_tool("GenerateCSSPropertyID") { ] } +lagom_tool("GenerateCSSPseudoClass") { + sources = [ "GenerateCSSPseudoClass.cpp" ] + deps = [ + ":headers", + "//Userland/Libraries/LibMain", + ] +} + lagom_tool("GenerateCSSTransformFunctions") { sources = [ "GenerateCSSTransformFunctions.cpp" ] deps = [ diff --git a/Meta/gn/secondary/Userland/Libraries/LibCore/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibCore/BUILD.gn index 9ee63dd86c..986daa4dae 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibCore/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibCore/BUILD.gn @@ -30,6 +30,8 @@ source_set("sources") { "EventLoopImplementation.h", "EventLoopImplementationUnix.cpp", "EventLoopImplementationUnix.h", + "EventReceiver.cpp", + "EventReceiver.h", "File.cpp", "File.h", "Forward.h", @@ -44,15 +46,11 @@ source_set("sources") { "NetworkResponse.h", "Notifier.cpp", "Notifier.h", - "Object.cpp", - "Object.h", "Process.cpp", "Process.h", "ProcessStatisticsReader.cpp", "ProcessStatisticsReader.h", "Promise.h", - "Property.cpp", - "Property.h", "Proxy.h", "SOCKSProxyClient.cpp", "SOCKSProxyClient.h", diff --git a/Meta/gn/secondary/Userland/Libraries/LibJS/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibJS/BUILD.gn index 4524e5e5c9..557db0f029 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibJS/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibJS/BUILD.gn @@ -42,7 +42,6 @@ shared_library("LibJS") { "Heap/Heap.cpp", "Heap/HeapBlock.cpp", "Heap/MarkedVector.cpp", - "Interpreter.cpp", "Lexer.cpp", "MarkupGenerator.cpp", "Module.cpp", diff --git a/Meta/gn/secondary/Userland/Libraries/LibSQL/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibSQL/BUILD.gn index fd5d48b002..02b2bb21c7 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibSQL/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibSQL/BUILD.gn @@ -45,7 +45,6 @@ shared_library("LibSQL") { "BTree.cpp", "BTreeIterator.cpp", "Database.cpp", - "HashIndex.cpp", "Heap.cpp", "Index.cpp", "Key.cpp", diff --git a/Meta/gn/secondary/Userland/Libraries/LibWeb/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibWeb/BUILD.gn index 35ac4b22f5..102fa7f30a 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibWeb/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibWeb/BUILD.gn @@ -223,6 +223,13 @@ embed_as_string_view("generate_default_stylesheet_source") { namespace = "Web::CSS" } +embed_as_string_view("generate_mathml_stylesheet_source") { + input = "MathML/Default.css" + output = "$target_gen_dir/MathML/MathMLStyleSheetSource.cpp" + variable_name = "mathml_stylesheet_source" + namespace = "Web::CSS" +} + embed_as_string_view("generate_quirks_mode_stylesheet_source") { input = "CSS/QuirksMode.css" output = "$target_gen_dir/CSS/QuirksModeStyleSheetSource.cpp" @@ -230,13 +237,6 @@ embed_as_string_view("generate_quirks_mode_stylesheet_source") { namespace = "Web::CSS" } -embed_as_string_view("generate_mathml_stylesheet_source") { - input = "MathML/Default.css" - output = "$target_gen_dir/MathML/MathMLStyleSheetSource.cpp" - variable_name = "mathml_stylesheet_source" - namespace = "Web::MathML" -} - source_set("all_generated") { generated_deps = [ ":generate_aria_roles", @@ -249,6 +249,7 @@ source_set("all_generated") { ":generate_css_transform_functions", ":generate_css_value_id", ":generate_default_stylesheet_source", + ":generate_mathml_stylesheet_source", ":generate_quirks_mode_stylesheet_source", ":generate_window_or_worker_interfaces", ] @@ -293,9 +294,11 @@ shared_library("LibWeb") { "HTML", "HighResolutionTime", "Infra", + "Internals", "IntersectionObserver", "Layout", "Loader", + "MathML", "MimeSniff", "NavigationTiming", "Page", diff --git a/Meta/gn/secondary/Userland/Libraries/LibWeb/CSS/StyleValues/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibWeb/CSS/StyleValues/BUILD.gn index 3ba3532267..d7e8ec577f 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibWeb/CSS/StyleValues/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibWeb/CSS/StyleValues/BUILD.gn @@ -37,6 +37,7 @@ source_set("StyleValues") { "OverflowStyleValue.cpp", "PlaceContentStyleValue.cpp", "PlaceItemsStyleValue.cpp", + "PlaceSelfStyleValue.cpp", "PositionStyleValue.cpp", "RadialGradientStyleValue.cpp", "RectStyleValue.cpp", diff --git a/Meta/gn/secondary/Userland/Libraries/LibWeb/Internals/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibWeb/Internals/BUILD.gn new file mode 100644 index 0000000000..b68609ef1f --- /dev/null +++ b/Meta/gn/secondary/Userland/Libraries/LibWeb/Internals/BUILD.gn @@ -0,0 +1,5 @@ +source_set("Internals") { + configs += [ "//Userland/Libraries/LibWeb:configs" ] + deps = [ "//Userland/Libraries/LibWeb:all_generated" ] + sources = [ "Internals.cpp" ] +} diff --git a/Meta/gn/secondary/Userland/Libraries/LibWeb/MathML/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibWeb/MathML/BUILD.gn new file mode 100644 index 0000000000..4297be11aa --- /dev/null +++ b/Meta/gn/secondary/Userland/Libraries/LibWeb/MathML/BUILD.gn @@ -0,0 +1,8 @@ +source_set("MathML") { + configs += [ "//Userland/Libraries/LibWeb:configs" ] + deps = [ "//Userland/Libraries/LibWeb:all_generated" ] + sources = [ + "MathMLElement.cpp", + "TagNames.cpp", + ] +} diff --git a/Meta/gn/secondary/Userland/Libraries/LibWeb/SVG/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibWeb/SVG/BUILD.gn index 8b29875269..41ce4ec14a 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibWeb/SVG/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibWeb/SVG/BUILD.gn @@ -20,6 +20,7 @@ source_set("SVG") { "SVGLength.cpp", "SVGLineElement.cpp", "SVGLinearGradientElement.cpp", + "SVGMaskElement.cpp", "SVGPathElement.cpp", "SVGPolygonElement.cpp", "SVGPolylineElement.cpp", diff --git a/Meta/gn/secondary/Userland/Libraries/LibWeb/idl_files.gni b/Meta/gn/secondary/Userland/Libraries/LibWeb/idl_files.gni index 8021134455..ae24b2fd68 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibWeb/idl_files.gni +++ b/Meta/gn/secondary/Userland/Libraries/LibWeb/idl_files.gni @@ -41,6 +41,7 @@ standard_idl_files = [ "//Userland/Libraries/LibWeb/CSS/Screen.idl", "//Userland/Libraries/LibWeb/CSS/StyleSheet.idl", "//Userland/Libraries/LibWeb/CSS/StyleSheetList.idl", + "//Userland/Libraries/LibWeb/CSS/VisualViewport.idl", "//Userland/Libraries/LibWeb/DOM/AbstractRange.idl", "//Userland/Libraries/LibWeb/DOM/Attr.idl", "//Userland/Libraries/LibWeb/DOM/AbortController.idl", @@ -198,8 +199,10 @@ standard_idl_files = [ "//Userland/Libraries/LibWeb/HTML/WorkerLocation.idl", "//Userland/Libraries/LibWeb/HTML/WorkerNavigator.idl", "//Userland/Libraries/LibWeb/HighResolutionTime/Performance.idl", + "//Userland/Libraries/LibWeb/Internals/Internals.idl", "//Userland/Libraries/LibWeb/IntersectionObserver/IntersectionObserver.idl", "//Userland/Libraries/LibWeb/IntersectionObserver/IntersectionObserverEntry.idl", + "//Userland/Libraries/LibWeb/MathML/MathMLElement.idl", "//Userland/Libraries/LibWeb/NavigationTiming/PerformanceTiming.idl", "//Userland/Libraries/LibWeb/PerformanceTimeline/PerformanceEntry.idl", "//Userland/Libraries/LibWeb/RequestIdleCallback/IdleDeadline.idl", @@ -231,6 +234,7 @@ standard_idl_files = [ "//Userland/Libraries/LibWeb/SVG/SVGLength.idl", "//Userland/Libraries/LibWeb/SVG/SVGLineElement.idl", "//Userland/Libraries/LibWeb/SVG/SVGLinearGradientElement.idl", + "//Userland/Libraries/LibWeb/SVG/SVGMaskElement.idl", "//Userland/Libraries/LibWeb/SVG/SVGPathElement.idl", "//Userland/Libraries/LibWeb/SVG/SVGPolygonElement.idl", "//Userland/Libraries/LibWeb/SVG/SVGPolylineElement.idl",