vaev-engine: Working on getting it build with clang 21.

Author: sleepy-monax

src/main.cpp

@@ -10,6 +10,7 @@ import Karm.Gc;
 import Karm.Http;
 import Karm.Image;
 import Karm.Print;
+import Karm.Debug;
 import Vaev.Engine;
 
 using namespace Karm;
@@ -30,7 +31,7 @@ static Rc<Http::Client> _createHttpClient(bool unsecure) {
     }
 
     auto client = makeRc<Http::Client>(
-        multiplexTransport(std::move(transports))
+        Http::multiplexTransport(std::move(transports))
     );
     client->userAgent = "Paper-Muncher/" stringify$(__ck_version_value) ""s;
 

src/vaev-engine/layout/builder.cpp

@@ -8,6 +8,8 @@ export module Vaev.Engine:layout.builder;
 
 import Karm.Image;
 import Karm.Gc;
+import Karm.Debug;
+
 import :values;
 import :style;
 import :dom;
@@ -831,9 +833,18 @@ static void _buildNode(BuilderContext bc, Gc::Ref<Dom::Node> node) {
 
 // MARK: Entry points -----------------------------------------------------------------
 
+static Debug::Flag dumpBoxes{"web-boxes"s};
+
 export Box build(Gc::Ref<Dom::Document> doc) {
+    // NOTE: Fallback in case of an empty document
+    Box root{
+        makeRc<Style::SpecifiedValues>(Style::SpecifiedValues::initial()),
+        Text::Fontface::fallback(),
+        nullptr
+    };
+
     if (auto el = doc->documentElement()) {
-        Box root = {el->specifiedValues(), el->computedValues()->fontFace, el};
+         root = {el->specifiedValues(), el->computedValues()->fontFace, el};
         InlineBox rootInlineBox{_proseStyleFomStyle(*el->specifiedValues(), el->computedValues()->fontFace)};
 
         BuilderContext bc{
@@ -844,14 +855,11 @@ export Box build(Gc::Ref<Dom::Document> doc) {
         };
 
         buildBlockFlowFromElement(bc, *el);
-        return root;
     }
-    // NOTE: Fallback in case of an empty document
-    return {
-        makeRc<Style::SpecifiedValues>(Style::SpecifiedValues::initial()),
-        Text::Fontface::fallback(),
-        nullptr
-    };
+
+    logDebugIf(dumpBoxes,"document boxes: {}", root);
+
+    return root;
 }
 
 export Box buildForPseudoElement(Dom::PseudoElement& el) {

src/vaev-engine/layout/paint.cpp

@@ -3,12 +3,15 @@ module;
 #include <karm-gfx/borders.h>
 #include <karm-gfx/outline.h>
 #include <karm-math/au.h>
+#include <karm-logger/logger.h>
 
 export module Vaev.Engine:layout.paint;
 
 import Karm.Image;
 import Karm.Gc;
 import Karm.Scene;
+import Karm.Debug;
+
 import :style;
 import :layout.base;
 import :layout.values;

src/vaev-engine/loader/loader.cpp

@@ -10,6 +10,8 @@ export module Vaev.Engine:loader.loader;
 import Karm.Gc;
 import Karm.Http;
 import Karm.Core;
+import Karm.Debug;
+
 import :dom;
 import :html;
 import :xml;
@@ -136,6 +138,9 @@ Async::Task<> _fetchStylesheetsAsync(Http::Client& client, Gc::Ref<Dom::Node> no
     co_return Ok();
 }
 
+static Debug::Flag dumpDom{"web-dom"};
+static Debug::Flag dumpStylesheets{"web-stylesheets"};
+
 export Async::Task<Gc::Ref<Dom::Document>> fetchDocumentAsync(Gc::Heap& heap, Http::Client& client, Mime::Url const& url) {
     if (url.scheme == "about") {
         if (url.path.str() == "blank")
@@ -160,6 +165,13 @@ export Async::Task<Gc::Ref<Dom::Document>> fetchDocumentAsync(Gc::Heap& heap, Ht
 
     (void)co_await _fetchStylesheetsAsync(client, *dom, *stylesheets);
     dom->styleSheets = stylesheets;
+
+    if (dumpDom)
+        logDebugIf(dumpDom, "document tree: {}", dom);
+
+    if (dumpStylesheets)
+        logDebugIf(dumpStylesheets, "document stylesheets: {}", stylesheets);
+
     co_return Ok(dom);
 }
 

src/vaev-engine/values/angle.cpp

@@ -1,3 +1,5 @@
+module;
+
 #include <karm-core/macros.h>
 
 export module Vaev.Engine:values.angle;

src/vaev-engine/values/background.cpp

@@ -1,3 +1,5 @@
+module;
+
 #include <karm-core/macros.h>
 
 export module Vaev.Engine:values.background;

src/vaev-engine/values/borders.cpp

@@ -12,7 +12,7 @@ import :values.base;
 import :values.calc;
 import :values.color;
 import :values.length;
-import :values.line_width;
+import :values.lineWidth;
 import :values.percent;
 
 namespace Vaev {

src/vaev-engine/values/calc.cpp

@@ -1,3 +1,5 @@
+module;
+
 #include <karm-core/macros.h>
 
 export module Vaev.Engine:values.calc;

src/vaev-engine/values/display.cpp

@@ -1,3 +1,5 @@
+module;
+
 #include <karm-core/macros.h>
 
 export module Vaev.Engine:values.display;

src/vaev-engine/values/font.cpp

@@ -1,6 +1,5 @@
 module;
 
-
 #include <karm-core/macros.h>
 #include <karm-mime/url.h>
 #include <karm-text/base.h>