Page base size

src/main.cpp

@@ -53,9 +53,6 @@ struct PrintOption {
 
         auto paper = self.paper;
 
-        if (self.orientation == Print::Orientation::LANDSCAPE)
-            paper = paper.landscape();
-
         if (self.width) {
             paper.name = "custom";
             paper.width = resolver.resolve(*self.width).template cast<f64>();
@@ -68,6 +65,7 @@ struct PrintOption {
 
         return {
             .paper = paper,
+            .orientation = self.orientation,
             .scale = self.scale.toDppx(),
         };
     }

src/vaev-engine/dom/element.cpp

@@ -10,22 +10,15 @@ import :dom.token_list;
 using namespace Karm;
 
 namespace Vaev::Style {
-
-export struct ComputedValues;
 export struct SpecifiedValues;
 
 } // namespace Vaev::Style
 
 namespace Vaev::Dom {
 
 export struct PseudoElement {
-    Opt<Rc<Style::ComputedValues>> _computedValues = NONE;
     Opt<Rc<Style::SpecifiedValues>> _specifiedValues = NONE;
 
-    Rc<Style::ComputedValues> computedValues() const {
-        return _computedValues.unwrap("unstyled pseudo-element");
-    }
-
     Rc<Style::SpecifiedValues> specifiedValues() const {
         return _specifiedValues.unwrap("unstyled pseudo-element");
     }
@@ -38,7 +31,6 @@ export struct Element : Node {
     QualifiedName qualifiedName;
     // NOSPEC: Should be a NamedNodeMap
     Map<QualifiedName, Rc<Attr>> attributes;
-    Opt<Rc<Style::ComputedValues>> _computedValues;
     Opt<Rc<Style::SpecifiedValues>> _specifiedValues; // FIXME: We should not have this store here
     TokenList classList;
 
@@ -58,10 +50,6 @@ export struct Element : Node {
         return TYPE;
     }
 
-    Rc<Style::ComputedValues> computedValues() const {
-        return _computedValues.unwrap("unstyled element");
-    }
-
     Rc<Style::SpecifiedValues> specifiedValues() const {
         return _specifiedValues.unwrap("unstyled element");
     }

src/vaev-engine/driver/print.cpp

@@ -88,8 +88,65 @@ void _paintMargins(Style::PageSpecifiedValues& pageStyle, RectAu pageRect, RectA
     _paintMainMargin(pageStyle, stack, rightRect, Style::PageArea::RIGHT, {Style::PageArea::RIGHT_TOP, Style::PageArea::RIGHT_MIDDLE, Style::PageArea::RIGHT_BOTTOM});
 }
 
+Pair<RectAu> _computePageBounds(Print::Settings const& settings, Style::Media const& media, Style::PageSpecifiedValues const& pageStyle) {
+    Vec2Au pageRectSize = resolve(
+        *pageStyle.style->pageSize,
+        Vec2Au{
+            media.width / Au{media.resolution.toDppx()},
+            media.height / Au{media.resolution.toDppx()}
+        }
+    );
+
+    InsetsAu pageMargin;
+    if (settings.margins == Print::Margins::DEFAULT) {
+        Layout::Resolver resolver{};
+        pageMargin = {
+            resolver.resolve(pageStyle.style->margin->top, pageRectSize.height),
+            resolver.resolve(pageStyle.style->margin->end, pageRectSize.width),
+            resolver.resolve(pageStyle.style->margin->bottom, pageRectSize.height),
+            resolver.resolve(pageStyle.style->margin->start, pageRectSize.width),
+        };
+    } else if (settings.margins == Print::Margins::CUSTOM) {
+        pageMargin = settings.margins.custom.cast<Au>();
+    } else if (settings.margins == Print::Margins::MINIMUM) {
+        pageMargin = {};
+    }
+
+    return {
+        pageRectSize,
+        RectAu{pageRectSize}.shrink(pageMargin)
+    };
+}
+
+// https://www.w3.org/TR/css-page-3/#issue-59a903e8
+Style::Media _constructMediaForBasePageSize(Gc::Ref<Dom::Document> dom, Print::Settings const& settings) {
+    auto const media = Style::Media::forPrint(settings);
+
+    // ----------------- Computing UA page size
+    InsetsAu uAPageMargin;
+    if (settings.margins == Print::Margins::DEFAULT) {
+        uAPageMargin = {resolveAbsoluteLength(Length{0.5, Length::Unit::IN})};
+    } else if (settings.margins == Print::Margins::CUSTOM) {
+        uAPageMargin = settings.margins.custom.cast<Au>();
+    } else if (settings.margins == Print::Margins::MINIMUM) {
+        uAPageMargin = {};
+    }
+
+    RectAu uAPageRect{
+        media.width / Au{media.resolution.toDppx()},
+        media.height / Au{media.resolution.toDppx()}
+    };
+
+    RectAu uAPageContent = uAPageRect.shrink(uAPageMargin);
+
+    // ----------------- Computing Page Base Size
+    auto pageStyleFromUAPage = computePageBaseSize(*dom->styleSheets, media);
+    auto [basePageRect, _] = _computePageBounds(settings, media, *pageStyleFromUAPage);
+    return media.withPixelsDimensions(basePageRect.size());
+}
+
 export Generator<Print::Page> print(Gc::Ref<Dom::Document> dom, Print::Settings const& settings) {
-    auto media = Style::Media::forPrint(settings);
+    auto const media = _constructMediaForBasePageSize(dom, settings);
 
     Font::Database db;
     if (not db.loadSystemFonts())
@@ -98,6 +155,7 @@ export Generator<Print::Page> print(Gc::Ref<Dom::Document> dom, Print::Settings
     Style::Computer computer{
         media, *dom->styleSheets, db
     };
+
     computer.build();
     computer.styleDocument(*dom);
 
@@ -130,36 +188,10 @@ export Generator<Print::Page> print(Gc::Ref<Dom::Document> dom, Print::Settings
         };
 
         auto pageStyle = computer.computeFor(initialStyle, page);
-        RectAu pageRect{
-            media.width / Au{media.resolution.toDppx()},  
-            media.height / Au{media.resolution.toDppx()}  
-        };
-        auto pageStack = makeRc<Scene::Stack>();
 
-        InsetsAu pageMargin;
-
-        if (settings.margins == Print::Margins::DEFAULT) {
-            Layout::Resolver resolver{};
-            pageMargin = {
-                resolver.resolve(pageStyle->style->margin->top, pageRect.height),
-                resolver.resolve(pageStyle->style->margin->end, pageRect.width),
-                resolver.resolve(pageStyle->style->margin->bottom, pageRect.height),
-                resolver.resolve(pageStyle->style->margin->start, pageRect.width),
-            };
-        } else if (settings.margins == Print::Margins::CUSTOM) {
-            pageMargin = settings.margins.custom.cast<Au>();
-        } else if (settings.margins == Print::Margins::MINIMUM) {
-            pageMargin = {};
-        }
-
-        RectAu pageContent = pageRect.shrink(pageMargin);
+        auto [pageRect, pageContent] = _computePageBounds(settings, media, *pageStyle);
 
-        Layout::Viewport vp{
-            .small = pageContent.size(),
-        };
-
-        contentTree.viewport = vp;
-        contentTree.fc = {pageContent.size()};
+        auto pageStack = makeRc<Scene::Stack>();
 
         if (settings.headerFooter and settings.margins != Print::Margins::NONE)
             _paintMargins(*pageStyle, pageRect, pageContent, *pageStack);
@@ -171,6 +203,13 @@ export Generator<Print::Page> print(Gc::Ref<Dom::Document> dom, Print::Settings
             .containingBlock = pageContent.size(),
         };
 
+        Layout::Viewport vp{
+            .small = pageContent.size(),
+        };
+
+        contentTree.viewport = vp;
+        contentTree.fc = {pageContent.size()};
+
         contentTree.fc.enterDiscovery();
         auto outDiscovery = Layout::layout(
             contentTree,
@@ -192,8 +231,14 @@ export Generator<Print::Page> print(Gc::Ref<Dom::Document> dom, Print::Settings
         Layout::paint(fragment, *pageStack);
         pageStack->prepare();
 
+        Print::PaperStock pagePaperStock{
+            ""s,
+            (f64)pageRect.size().width * media.resolution.toDppx(),
+            (f64)pageRect.size().height * media.resolution.toDppx()
+        };
+
         co_yield Print::Page(
-            settings.paper,
+            pagePaperStock,
             makeRc<Scene::Clear>(
                 makeRc<Scene::Transform>(
                     pageStack,

src/vaev-engine/driver/tests/manifest.json

@@ -0,0 +1,15 @@
+{
+    "$schema": "https://schemas.cute.engineering/stable/cutekit.manifest.component.v1",
+    "id": "vaev-engine.driver.tests",
+    "type": "lib",
+    "props": {
+        "cpp-excluded": true
+    },
+    "requires": [
+        "karm-test",
+        "vaev-engine"
+    ],
+    "injects": [
+        "__tests__"
+    ]
+}