From 967cb86c5b97840f1b6a124912dcbc19bd0d2210 Mon Sep 17 00:00:00 2001 From: Sebastian Zaha Date: Mon, 28 Aug 2023 11:38:30 +0200 Subject: [PATCH] Meta: Port recent build changes to gn build This ports the following commits: 848ec538c62594c783032008615abf4a732ed366 703c2bb06ed772c32158d87d629504bd50980f73 27dd2a40ad547e94e1dc428f9c0be53c77c9ada2 daefe744ba7ab10515c8b56303dc16b4569730ca 9812031a02e539f08a6936e9c17d919a44c912b8 4c0816b002692a19e6ff1c3175812e639b9c4f48 8bb275f2ea8fb990a2979e8d6b4db109a64e6945 3f122b7335193b0b8a018a1bcc695e22ead196c5 --- .../secondary/Userland/Libraries/LibWeb/CSS/BUILD.gn | 1 + .../Libraries/LibWeb/CSS/StyleValues/BUILD.gn | 1 + .../secondary/Userland/Libraries/LibWeb/DOM/BUILD.gn | 2 ++ .../Userland/Libraries/LibWeb/HTML/BUILD.gn | 1 + .../Userland/Libraries/LibWeb/Layout/BUILD.gn | 1 + .../Userland/Libraries/LibWeb/Painting/BUILD.gn | 1 + .../Userland/Libraries/LibWeb/idl_files.gni | 2 ++ .../secondary/Userland/Libraries/LibWebView/BUILD.gn | 12 +++++++++++- 8 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Meta/gn/secondary/Userland/Libraries/LibWeb/CSS/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibWeb/CSS/BUILD.gn index 1ae917fdd2..7cb1eec785 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibWeb/CSS/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibWeb/CSS/BUILD.gn @@ -56,6 +56,7 @@ source_set("CSS") { "StyleSheetList.cpp", "StyleValue.cpp", "Supports.cpp", + "SystemColor.cpp", "Time.cpp", "VisualViewport.cpp", ] 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 d7e8ec577f..d2086f2d0f 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibWeb/CSS/StyleValues/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibWeb/CSS/StyleValues/BUILD.gn @@ -22,6 +22,7 @@ source_set("StyleValues") { "FlexStyleValue.cpp", "FontStyleValue.cpp", "GridAreaShorthandStyleValue.cpp", + "GridAutoFlowStyleValue.cpp", "GridTemplateAreaStyleValue.cpp", "GridTrackPlacementShorthandStyleValue.cpp", "GridTrackPlacementStyleValue.cpp", diff --git a/Meta/gn/secondary/Userland/Libraries/LibWeb/DOM/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibWeb/DOM/BUILD.gn index 0d78e2327c..7b25d6b443 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibWeb/DOM/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibWeb/DOM/BUILD.gn @@ -26,6 +26,7 @@ source_set("DOM") { "EventDispatcher.cpp", "EventTarget.cpp", "HTMLCollection.cpp", + "HTMLFormControlsCollection.cpp", "IDLEventListener.cpp", "LiveNodeList.cpp", "MutationObserver.cpp", @@ -41,6 +42,7 @@ source_set("DOM") { "Position.cpp", "ProcessingInstruction.cpp", "QualifiedName.cpp", + "RadioNodeList.cpp", "Range.cpp", "ShadowRoot.cpp", "StaticNodeList.cpp", diff --git a/Meta/gn/secondary/Userland/Libraries/LibWeb/HTML/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibWeb/HTML/BUILD.gn index db329619f7..360b56b5b3 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibWeb/HTML/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibWeb/HTML/BUILD.gn @@ -131,6 +131,7 @@ source_set("HTML") { "NavigationTransition.cpp", "Navigator.cpp", "NavigatorID.cpp", + "Numbers.cpp", "PageTransitionEvent.cpp", "Path2D.cpp", "Plugin.cpp", diff --git a/Meta/gn/secondary/Userland/Libraries/LibWeb/Layout/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibWeb/Layout/BUILD.gn index 46f7485761..aa5ccd934d 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibWeb/Layout/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibWeb/Layout/BUILD.gn @@ -42,6 +42,7 @@ source_set("Layout") { "SVGSVGBox.cpp", "SVGTextBox.cpp", "TableFormattingContext.cpp", + "TableGrid.cpp", "TableWrapper.cpp", "TextNode.cpp", "TreeBuilder.cpp", diff --git a/Meta/gn/secondary/Userland/Libraries/LibWeb/Painting/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibWeb/Painting/BUILD.gn index cc1f6eaf30..b64ba6883f 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibWeb/Painting/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibWeb/Painting/BUILD.gn @@ -35,5 +35,6 @@ source_set("Painting") { "TableBordersPainting.cpp", "TextPaintable.cpp", "VideoPaintable.cpp", + "ViewportPaintable.cpp", ] } diff --git a/Meta/gn/secondary/Userland/Libraries/LibWeb/idl_files.gni b/Meta/gn/secondary/Userland/Libraries/LibWeb/idl_files.gni index 0cba944175..18422d17fc 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibWeb/idl_files.gni +++ b/Meta/gn/secondary/Userland/Libraries/LibWeb/idl_files.gni @@ -59,6 +59,7 @@ standard_idl_files = [ "//Userland/Libraries/LibWeb/DOM/Event.idl", "//Userland/Libraries/LibWeb/DOM/EventTarget.idl", "//Userland/Libraries/LibWeb/DOM/HTMLCollection.idl", + "//Userland/Libraries/LibWeb/DOM/HTMLFormControlsCollection.idl", "//Userland/Libraries/LibWeb/DOM/MutationRecord.idl", "//Userland/Libraries/LibWeb/DOM/MutationObserver.idl", "//Userland/Libraries/LibWeb/DOM/NamedNodeMap.idl", @@ -67,6 +68,7 @@ standard_idl_files = [ "//Userland/Libraries/LibWeb/DOM/NodeIterator.idl", "//Userland/Libraries/LibWeb/DOM/NodeList.idl", "//Userland/Libraries/LibWeb/DOM/ProcessingInstruction.idl", + "//Userland/Libraries/LibWeb/DOM/RadioNodeList.idl", "//Userland/Libraries/LibWeb/DOM/Range.idl", "//Userland/Libraries/LibWeb/DOM/ShadowRoot.idl", "//Userland/Libraries/LibWeb/DOM/StaticRange.idl", diff --git a/Meta/gn/secondary/Userland/Libraries/LibWebView/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibWebView/BUILD.gn index 63f91ad852..7c49f5eeb2 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibWebView/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibWebView/BUILD.gn @@ -1,4 +1,5 @@ import("//Meta/gn/build/compiled_action.gni") +import("//Meta/gn/build/embed_as_string_view.gni") compiled_action("WebContentClientEndpoint") { tool = "//Meta/Lagom/Tools/CodeGenerators/IPCCompiler" @@ -44,6 +45,13 @@ compiled_action("WebDriverServerEndpoint") { ] } +embed_as_string_view("generate_native_stylesheet_source") { + input = "Native.css" + output = "$target_gen_dir/NativeStyleSheetSource.cpp" + variable_name = "native_stylesheet_source" + namespace = "WebView" +} + shared_library("LibWebView") { output_name = "webview" include_dirs = [ @@ -56,6 +64,7 @@ shared_library("LibWebView") { ":WebContentServerEndpoint", ":WebDriverClientEndpoint", ":WebDriverServerEndpoint", + ":generate_native_stylesheet_source", "//AK", "//Userland/Libraries/LibCore", "//Userland/Libraries/LibGUI", @@ -76,5 +85,6 @@ shared_library("LibWebView") { sources += get_target_outputs(":WebContentClientEndpoint") + get_target_outputs(":WebContentServerEndpoint") + get_target_outputs(":WebDriverClientEndpoint") + - get_target_outputs(":WebDriverServerEndpoint") + get_target_outputs(":WebDriverServerEndpoint") + + get_target_outputs(":generate_native_stylesheet_source") }