Store max-content width in layout cache

Source/Core/Layout/ContainerBox.cpp

@@ -381,8 +381,8 @@ bool CachedContainer::GetBaselineOfLastLine(float& out_baseline) const
 
 float CachedContainer::GetShrinkToFitWidth() const
 {
-	RMLUI_ERRORMSG("Internal error: CachedContainer should not be used under a max-content constraint.");
-	return 0.f;
+	RMLUI_ASSERTMSG(max_content_width >= 0.f, "Internal error: Using undefined max-content width from CachedContainer.");
+	return max_content_width;
 }
 
 String CachedContainer::DebugDumpTree(int depth) const

Source/Core/Layout/ContainerBox.h

@@ -204,10 +204,10 @@ private:
 */
 class CachedContainer final : public ContainerBox {
 public:
-	CachedContainer(Element* element, ContainerBox* parent_container, const Box& box, Vector2f visible_overflow_size,
+	CachedContainer(Element* element, ContainerBox* parent_container, const Box& box, Vector2f visible_overflow_size, float max_content_width,
 		Optional<float> baseline_of_last_line) :
 		ContainerBox(Type::CachedContainer, element, parent_container, parent_container->GetFormattingMode()), box(box),
-		baseline_of_last_line(baseline_of_last_line)
+		max_content_width(max_content_width), baseline_of_last_line(baseline_of_last_line)
 	{
 		SetVisibleOverflowSize(visible_overflow_size);
 	}
@@ -220,6 +220,7 @@ public:
 
 private:
 	const Box& box;
+	float max_content_width;
 	Optional<float> baseline_of_last_line;
 };
 

Source/Core/Layout/FormattingContext.cpp

@@ -105,17 +105,17 @@ UniquePtr<LayoutBox> FormattingContext::FormatIndependent(ContainerBox* parent_c
 
 	const FormattingMode& formatting_mode = parent_container->GetFormattingMode();
 
+	if (formatting_mode.allow_format_independent_cache)
 	{
 		const Vector2f containing_block = parent_container->GetContainingBlockSize(Style::Position::Static);
 		const Vector2f absolute_containing_block = parent_container->GetContainingBlockSize(Style::Position::Absolute);
 
 #ifdef RMLUI_TRACY_PROFILING
 		auto DebugCacheTracyMessage = [&](const char* cache_info) {
-			const String message = CreateString("%s on %x. Containing block: %g, %g. Absolute containing block: %g, %g. Box (size): %g, %g",
-				cache_info, element, containing_block.x, containing_block.y, absolute_containing_block.x, absolute_containing_block.y,
+			RMLUI_ZoneText(CreateString("%s on %x. Containing block: %g, %g. Absolute containing block: %g, %g. Box (size): %g, %g", cache_info,
+				element, containing_block.x, containing_block.y, absolute_containing_block.x, absolute_containing_block.y,
 				override_initial_box ? override_initial_box->GetSize().x : std::numeric_limits<float>::quiet_NaN(),
-				override_initial_box ? override_initial_box->GetSize().y : std::numeric_limits<float>::quiet_NaN());
-			RMLUI_ZoneText(message.c_str(), message.size());
+				override_initial_box ? override_initial_box->GetSize().y : std::numeric_limits<float>::quiet_NaN()));
 		};
 #else
 	#define DebugCacheTracyMessage(message)
@@ -126,18 +126,19 @@ UniquePtr<LayoutBox> FormattingContext::FormatIndependent(ContainerBox* parent_c
 				formatting_mode.constraint != FormattingMode::Constraint::None))
 		{
 			DebugCacheTracyMessage("Cache match");
-
-			if (formatting_mode.allow_format_independent_cache)
-			{
-				layout_box = MakeUnique<CachedContainer>(element, parent_container, element->GetBox(),
-					layout_node->GetCommittedLayout()->visible_overflow_size, layout_node->GetCommittedLayout()->baseline_of_last_line);
-			}
+			const CommittedLayout& commited_layout = layout_node->GetCommittedLayout().value();
+			layout_box = MakeUnique<CachedContainer>(element, parent_container, element->GetBox(), commited_layout.visible_overflow_size,
+				commited_layout.max_content_width, commited_layout.baseline_of_last_line);
 		}
 		else
 		{
 			DebugCacheTracyMessage(layout_node->HasCommittedLayout() ? "Cache miss" : "No cache");
 		}
 	}
+	else
+	{
+		RMLUI_ZoneText("Cache disabled");
+	}
 
 	if (!layout_box)
 	{
@@ -168,17 +169,19 @@ UniquePtr<LayoutBox> FormattingContext::FormatIndependent(ContainerBox* parent_c
 		case FormattingContextType::None: RMLUI_ERROR; break;
 		}
 
-		if (layout_box)
+		if (layout_box && formatting_mode.allow_format_independent_cache)
 		{
-			Optional<float> baseline_of_last_line;
-			float baseline_of_last_line_value = 0.f;
-			if (layout_box->GetBaselineOfLastLine(baseline_of_last_line_value))
-				baseline_of_last_line = baseline_of_last_line_value;
+			Optional<float> baseline_of_last_line = 0.f;
+			if (!layout_box->GetBaselineOfLastLine(*baseline_of_last_line))
+				baseline_of_last_line.reset();
 
 			LayoutNode* layout_node = element->GetLayoutNode();
+			const bool layout_constraint = (formatting_mode.constraint != FormattingMode::Constraint::None);
+			const float max_content_width =
+				(formatting_mode.constraint == FormattingMode::Constraint::MaxContent ? layout_box->GetShrinkToFitWidth() : -1.f);
 			layout_node->CommitLayout(parent_container->GetContainingBlockSize(Style::Position::Static),
-				parent_container->GetContainingBlockSize(Style::Position::Absolute), override_initial_box,
-				formatting_mode.constraint != FormattingMode::Constraint::None, layout_box->GetVisibleOverflowSize(), baseline_of_last_line);
+				parent_container->GetContainingBlockSize(Style::Position::Absolute), override_initial_box, layout_constraint,
+				layout_box->GetVisibleOverflowSize(), max_content_width, baseline_of_last_line);
 		}
 	}
 
@@ -210,6 +213,7 @@ float FormattingContext::FormatFitContentWidth(ContainerBox* parent_container, E
 
 float FormattingContext::FormatFitContentHeight(ContainerBox* parent_container, Element* element, const Box& box)
 {
+	RMLUI_ZoneScoped;
 	if (box.GetSize().y >= 0.f)
 		return box.GetSize().y;
 
@@ -254,12 +258,9 @@ void FormattingContext::FormatFitContentWidth(Box& box, Element* element, Format
 	const Vector2f containing_block)
 {
 	RMLUI_ASSERT(element);
-#ifdef RMLUI_TRACY_PROFILING
 	RMLUI_ZoneScoped;
-	const String zone_text = CreateString("%s    %x    Containing block: %g x %g", element->GetAddress(false, false).c_str(), element,
-		containing_block.x, containing_block.y);
-	RMLUI_ZoneText(zone_text.c_str(), zone_text.size());
-#endif
+	RMLUI_ZoneText(CreateString("%s    %x    Containing block: %g x %g", element->GetAddress(false, false).c_str(), element, containing_block.x,
+		containing_block.y));
 
 #ifdef RMLUI_DEBUG
 	auto* debug_tracker = FormatIndependentDebugTracker::GetIf();

Source/Core/Layout/LayoutNode.cpp

@@ -90,7 +90,7 @@ void LayoutNode::SetDirty(DirtyLayoutType dirty_type)
 }
 
 void LayoutNode::CommitLayout(Vector2f containing_block_size, Vector2f absolutely_positioning_containing_block_size, const Box* override_box,
-	bool layout_constraint, Vector2f visible_overflow_size, Optional<float> baseline_of_last_line)
+	bool layout_constraint, Vector2f visible_overflow_size, float max_content_width, Optional<float> baseline_of_last_line)
 {
 	// TODO: This is mixing slightly different concepts. Rather, it might be advantageous to separate what is the input
 	// to the layout of the current element, and what is the output. That way we can e.g. set the containing block size
@@ -107,6 +107,7 @@ void LayoutNode::CommitLayout(Vector2f containing_block_size, Vector2f absolutel
 		override_box ? Optional<Box>(*override_box) : Optional<Box>(),
 		layout_constraint,
 		visible_overflow_size,
+		max_content_width,
 		baseline_of_last_line,
 	});
 	ClearDirty();

Source/Core/Layout/LayoutNode.h

@@ -64,6 +64,7 @@ struct CommittedLayout {
 	bool layout_constraint;
 
 	Vector2f visible_overflow_size;
+	float max_content_width;
 	Optional<float> baseline_of_last_line;
 };
 
@@ -87,7 +88,7 @@ public:
 	bool IsSelfDirty() const { return !(dirty_flag == DirtyLayoutType::None || dirty_flag == DirtyLayoutType::Child); }
 
 	void CommitLayout(Vector2f containing_block_size, Vector2f absolutely_positioning_containing_block_size, const Box* override_box,
-		bool layout_constraint, Vector2f visible_overflow_size, Optional<float> baseline_of_last_line);
+		bool layout_constraint, Vector2f visible_overflow_size, float max_content_width, Optional<float> baseline_of_last_line);
 
 	// TODO: Currently, should only be used by `Context::SetDimensions`. Ideally, we would remove this and "commit" the
 	// containing block (without the layout result, see comment in `CommitLayout`).
@@ -149,9 +150,6 @@ private:
 
 	DirtyLayoutType dirty_flag = DirtyLayoutType::None;
 
-	// TODO: Cache this after running LayoutDetails::GetShrinkToFitWidth. Clear the cache whenever any child or self is dirtied.
-	float max_content_size = 0;
-
 	// Store this for partial layout updates / reflow. If this changes, always do layout again, regardless of any cache.
 	Vector2f containing_block;