vaev-engine: Remove duplicated fontface ptr from Box.

Author: pauloamed

src/vaev-engine/layout/base.cpp

@@ -354,17 +354,16 @@ export struct Attrs {
 
 struct Box : Meta::NoCopy {
     Rc<Style::SpecifiedValues> style;
-    Rc<Text::Fontface> fontFace;
     Content content = NONE;
     Attrs attrs;
     Opt<Rc<FormatingContext>> formatingContext = NONE;
     Gc::Ptr<Dom::Element> origin;
 
-    Box(Rc<Style::SpecifiedValues> style, Rc<Text::Fontface> font, Gc::Ptr<Dom::Element> og)
-        : style{std::move(style)}, fontFace{font}, origin{og} {}
+    Box(Rc<Style::SpecifiedValues> style, Gc::Ptr<Dom::Element> og)
+        : style{std::move(style)}, origin{og} {}
 
-    Box(Rc<Style::SpecifiedValues> style, Rc<Text::Fontface> font, Content content, Gc::Ptr<Dom::Element> og)
-        : style{std::move(style)}, fontFace{font}, content{std::move(content)}, origin{og} {}
+    Box(Rc<Style::SpecifiedValues> style, Content content, Gc::Ptr<Dom::Element> og)
+        : style{std::move(style)}, content{std::move(content)}, origin{og} {}
 
     Slice<Box> children() const {
         if (auto children = content.is<Vec<Box>>())

src/vaev-engine/layout/builder.cpp

@@ -216,7 +216,7 @@ struct BuilderContext {
         style->display = Display{Display::Inside::FLOW, Display::Outside::BLOCK};
 
         auto newInlineBox = InlineBox::fromInterruptedInlineBox(*_rootInlineBox);
-        _parent.add({style, _parent.fontFace, std::move(*_rootInlineBox), nullptr});
+        _parent.add({style, std::move(*_rootInlineBox), nullptr});
         *_rootInlineBox = std::move(newInlineBox);
     }
 
@@ -403,7 +403,7 @@ void buildSVGElement(Gc::Ref<Dom::Element> el, SVG::Group* group) {
         buildSVGAggregate(el, &newSvgRoot);
         group->add(std::move(newSvgRoot));
     } else if (el->qualifiedName == Svg::FOREIGN_OBJECT_TAG) {
-        Box box{el->specifiedValues(), el->specifiedValues()->fontFace, el};
+        Box box{el->specifiedValues(), el};
 
         InlineBox rootInlineBox{_proseStyleFomStyle(
             *el->specifiedValues(),
@@ -498,7 +498,7 @@ static void buildBlockFlowFromElement(BuilderContext bc, Gc::Ref<Dom::Element> e
 }
 
 static Box createAndBuildBoxFromElement(BuilderContext bc, Rc<Style::SpecifiedValues> style, Gc::Ref<Dom::Element> el, Display display) {
-    Box box = {style, el->specifiedValues()->fontFace, el};
+    Box box = {style, el};
     InlineBox rootInlineBox{_proseStyleFomStyle(*style, el->specifiedValues()->fontFace)};
 
     auto newBc = display == Display::Inside::FLEX
@@ -531,7 +531,7 @@ struct AnonymousTableBoxWrapper {
         rowStyle->inherit(*style);
         rowStyle->display = Display::Internal::TABLE_ROW;
 
-        rowBox = Box{rowStyle, style->fontFace, nullptr};
+        rowBox = Box{rowStyle, nullptr};
     }
 
     void createCellIfNone(Rc<Style::SpecifiedValues> style) {
@@ -542,7 +542,7 @@ struct AnonymousTableBoxWrapper {
         cellStyle->inherit(*style);
         cellStyle->display = Display::Internal::TABLE_CELL;
 
-        cellBox = Box{cellStyle, style->fontFace, nullptr};
+        cellBox = Box{cellStyle, nullptr};
         rootInlineBoxForCell = InlineBox{_proseStyleFomStyle(*style, style->fontFace)};
     }
 
@@ -642,7 +642,7 @@ static void _buildTableChildrenWhileWrappingIntoAnonymousBox(BuilderContext bc,
 
 // https://www.w3.org/TR/css-tables-3/#fixup-algorithm
 static void _buildTableInternal(BuilderContext bc, Gc::Ref<Dom::Element> el, Rc<Style::SpecifiedValues> style, Display display) {
-    Box tableInternalBox = {style, el->specifiedValues()->fontFace, el};
+    Box tableInternalBox = {style, el};
     tableInternalBox.attrs = _parseDomAttr(el);
 
     switch (display.internal()) {
@@ -706,7 +706,7 @@ static void _buildTableBox(BuilderContext tableWrapperBc, Gc::Ref<Dom::Element>
     };
 
     tableBoxStyle->display = Display::Internal::TABLE_BOX;
-    Box tableBox = {tableBoxStyle, el->specifiedValues()->fontFace, el};
+    Box tableBox = {tableBoxStyle, el};
     tableBox.attrs = _parseDomAttr(el);
 
     bool captionsOnTop = tableBoxStyle->table->captionSide == CaptionSide::TOP;
@@ -731,7 +731,7 @@ static Box _createTableWrapperAndBuildTable(BuilderContext bc, Rc<Style::Specifi
     wrapperStyle->display = tableStyle->display;
     wrapperStyle->margin = tableStyle->margin;
 
-    Box wrapper = {wrapperStyle, tableBoxEl->specifiedValues()->fontFace, tableBoxEl};
+    Box wrapper = {wrapperStyle, tableBoxEl};
     InlineBox rootInlineBox{_proseStyleFomStyle(*wrapperStyle, tableBoxEl->specifiedValues()->fontFace)};
 
     // SPEC: The table wrapper box establishes a block formatting context.
@@ -833,7 +833,7 @@ static void _buildNode(BuilderContext bc, Gc::Ref<Dom::Node> node) {
 
 export Box build(Gc::Ref<Dom::Document> doc) {
     if (auto el = doc->documentElement()) {
-        Box root = {el->specifiedValues(), el->specifiedValues()->fontFace, el};
+        Box root = {el->specifiedValues(), el};
         InlineBox rootInlineBox{_proseStyleFomStyle(*el->specifiedValues(), el->specifiedValues()->fontFace)};
 
         BuilderContext bc{
@@ -849,7 +849,6 @@ export Box build(Gc::Ref<Dom::Document> doc) {
     // NOTE: Fallback in case of an empty document
     return {
         makeRc<Style::SpecifiedValues>(Style::SpecifiedValues::initial()),
-        Text::Fontface::fallback(),
         nullptr
     };
 }
@@ -860,10 +859,10 @@ export Box buildForPseudoElement(Dom::PseudoElement& el) {
     auto prose = makeRc<Text::Prose>(proseStyle);
     if (el.specifiedValues()->content) {
         prose->append(el.specifiedValues()->content.str());
-        return {el.specifiedValues(), el.specifiedValues()->fontFace, InlineBox{prose}, nullptr};
+        return {el.specifiedValues(), InlineBox{prose}, nullptr};
     }
 
-    return {el.specifiedValues(), el.specifiedValues()->fontFace, nullptr};
+    return {el.specifiedValues(), nullptr};
 }
 
 } // namespace Vaev::Layout

src/vaev-engine/layout/values.cpp

@@ -26,8 +26,8 @@ export struct Resolver {
         Au fontSize{16};
 
         Resolver resolver;
-        resolver.rootFont = Text::Font{tree.root.fontFace, fontSize.cast<f64>()};
-        resolver.boxFont = Text::Font{box.fontFace, fontSize.cast<f64>()};
+        resolver.rootFont = Text::Font{tree.root.style->fontFace, fontSize.cast<f64>()};
+        resolver.boxFont = Text::Font{box.style->fontFace, fontSize.cast<f64>()};
         resolver.viewport = tree.viewport;
         resolver.boxAxis = mainAxis(box);
         return resolver;