refactor: simplify document size calculation by removing content size handling

tordex · tordex · commit bfcca39e24c3 · 2025-06-10T01:43:14.000+03:00
document::width() and document::height() can be used in all cases to calculate the document size.
diff --git a/containers/cairo/render2png.cpp b/containers/cairo/render2png.cpp
@@ -219,8 +219,8 @@ namespace html2png
 			std::swap(m_screen_width, best_width);
 		}
 
-		width = cfg.get_int("width", doc->content_width() > 0 ? doc->content_width() : 1);
-		height = cfg.get_int("height", doc->content_height() > 0 ? doc->content_height() : 1);
+		width = cfg.get_int("width", doc->width() > 0 ? doc->width() : 1);
+		height = cfg.get_int("height", doc->height() > 0 ? doc->height() : 1);
 
 		auto surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
 		if(surface)
diff --git a/include/litehtml/document.h b/include/litehtml/document.h
@@ -59,7 +59,6 @@ namespace litehtml
 		litehtml::css						m_master_css;
 		litehtml::css						m_user_css;
 		litehtml::size						m_size;
-		litehtml::size						m_content_size;
 		position::vector					m_fixed_boxes;
 		std::shared_ptr<element>			m_over_element;
 		std::shared_ptr<element>			m_active_element;
@@ -84,8 +83,6 @@ namespace litehtml
 		int								to_pixels(const css_length& val, const font_metrics& metrics, int size) const;
 		int								width() const;
 		int								height() const;
-		int								content_width() const;
-		int								content_height() const;
 		void							add_stylesheet(const char* str, const char* baseurl, const char* media);
 		bool							on_mouse_over(int x, int y, int client_x, int client_y, position::vector& redraw_boxes);
 		bool							on_lbutton_down(int x, int y, int client_x, int client_y, position::vector& redraw_boxes);
diff --git a/include/litehtml/render_item.h b/include/litehtml/render_item.h
@@ -412,7 +412,7 @@ namespace litehtml
 		std::tuple<int, int> element_static_offset(const std::shared_ptr<litehtml::render_item> &el);
         void add_positioned(const std::shared_ptr<litehtml::render_item> &el);
         void get_redraw_box(litehtml::position& pos, int x = 0, int y = 0);
-        void calc_document_size( litehtml::size& sz, litehtml::size& content_size, int x = 0, int y = 0 );
+        void calc_document_size( litehtml::size& sz, int x = 0, int y = 0 );
 		virtual void get_inline_boxes( position::vector& /*boxes*/ ) const {};
 		virtual void set_inline_boxes( position::vector& /*boxes*/ ) {};
 		virtual void add_inline_box( const position& /*box*/ ) {};
diff --git a/src/document.cpp b/src/document.cpp
@@ -512,9 +512,7 @@ int document::render( int max_width, render_type rt )
 			}
 			m_size.width	= 0;
 			m_size.height	= 0;
-			m_content_size.width = 0;
-			m_content_size.height = 0;
-			m_root_render->calc_document_size(m_size, m_content_size);
+			m_root_render->calc_document_size(m_size);
 		}
 	}
 	return ret;
@@ -612,17 +610,6 @@ int document::height() const
 	return m_size.height;
 }
 
-int document::content_width() const
-{
-	return m_content_size.width;
-}
-
-int document::content_height() const
-{
-	return m_content_size.height;
-}
-
-
 void document::add_stylesheet( const char* str, const char* baseurl, const char* media )
 {
 	if(str && str[0])
diff --git a/src/render_item.cpp b/src/render_item.cpp
@@ -707,7 +707,7 @@ void litehtml::render_item::get_redraw_box(litehtml::position& pos, int x /*= 0*
     }
 }
 
-void litehtml::render_item::calc_document_size( litehtml::size& sz, litehtml::size& content_size, int x /*= 0*/, int y /*= 0*/ )
+void litehtml::render_item::calc_document_size( litehtml::size& sz, int x /*= 0*/, int y /*= 0*/ )
 {
 	if(css().get_display() != display_inline && css().get_display() != display_table_row)
 	{
@@ -716,36 +716,24 @@ void litehtml::render_item::calc_document_size( litehtml::size& sz, litehtml::si
 			sz.width = std::max(sz.width, x + right());
 			sz.height = std::max(sz.height, y + bottom());
 
-			if (!src_el()->is_root() && !src_el()->is_body())
-			{
-				content_size.width = std::max(content_size.width, x + right());
-				content_size.height = std::max(content_size.height, y + bottom());
-			}
-
 			// All children of tables and blocks with style other than "overflow: visible" are inside element.
 			// We can skip calculating size of children
 			if (src_el()->css().get_overflow() == overflow_visible && src_el()->css().get_display() != display_table)
 			{
 				for (auto &el: m_children)
 				{
-					el->calc_document_size(sz, content_size, x + m_pos.x, y + m_pos.y);
+					el->calc_document_size(sz, x + m_pos.x, y + m_pos.y);
 				}
 			}
-
-			if (src_el()->is_root() || src_el()->is_body())
-			{
-				content_size.width = std::max(content_size.width, x + right());
-				content_size.height = std::max(content_size.height, y + bottom());
-			}
 		}
 	} else
 	{
 		position::vector boxes;
 		get_inline_boxes(boxes);
 		for(auto& box : boxes)
 		{
-			content_size.width = std::max(content_size.width, x + box.x + box.width);
-			content_size.height = std::max(content_size.height, y + box.y + box.height);
+			sz.width = std::max(sz.width, x + box.x + box.width);
+			sz.height = std::max(sz.height, y + box.y + box.height);
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -219,8 +219,8 @@ namespace html2png`
`219`	`219`	`std::swap(m_screen_width, best_width);`
`220`	`220`	`}`
`221`	`221`
`222`		`- width = cfg.get_int("width", doc->content_width() > 0 ? doc->content_width() : 1);`
`223`		`- height = cfg.get_int("height", doc->content_height() > 0 ? doc->content_height() : 1);`
	`222`	`+ width = cfg.get_int("width", doc->width() > 0 ? doc->width() : 1);`
	`223`	`+ height = cfg.get_int("height", doc->height() > 0 ? doc->height() : 1);`
`224`	`224`
`225`	`225`	`auto surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);`
`226`	`226`	`if(surface)`
Original file line number	Diff line number	Diff line change
`@@ -512,9 +512,7 @@ int document::render( int max_width, render_type rt )`
`512`	`512`	`}`
`513`	`513`	`m_size.width = 0;`
`514`	`514`	`m_size.height = 0;`
`515`		`- m_content_size.width = 0;`
`516`		`- m_content_size.height = 0;`
`517`		`- m_root_render->calc_document_size(m_size, m_content_size);`
	`515`	`+ m_root_render->calc_document_size(m_size);`
`518`	`516`	`}`
`519`	`517`	`}`
`520`	`518`	`return ret;`
`@@ -612,17 +610,6 @@ int document::height() const`
`612`	`610`	`return m_size.height;`
`613`	`611`	`}`
`614`	`612`
`615`		`-int document::content_width() const`
`616`		`-{`
`617`		`- return m_content_size.width;`
`618`		`-}`
`619`		`-`
`620`		`-int document::content_height() const`
`621`		`-{`
`622`		`- return m_content_size.height;`
`623`		`-}`
`624`		`-`
`625`		`-`
`626`	`613`	`void document::add_stylesheet( const char* str, const char* baseurl, const char* media )`
`627`	`614`	`{`
`628`	`615`	`if(str && str[0])`
Original file line number	Diff line number	Diff line change
`@@ -707,7 +707,7 @@ void litehtml::render_item::get_redraw_box(litehtml::position& pos, int x /= 0`
`707`	`707`	`}`
`708`	`708`	`}`
`709`	`709`
`710`		`-void litehtml::render_item::calc_document_size( litehtml::size& sz, litehtml::size& content_size, int x /= 0/, int y /= 0/ )`
	`710`	`+void litehtml::render_item::calc_document_size( litehtml::size& sz, int x /= 0/, int y /= 0/ )`
`711`	`711`	`{`
`712`	`712`	`if(css().get_display() != display_inline && css().get_display() != display_table_row)`
`713`	`713`	`{`
`@@ -716,36 +716,24 @@ void litehtml::render_item::calc_document_size( litehtml::size& sz, litehtml::si`
`716`	`716`	`sz.width = std::max(sz.width, x + right());`
`717`	`717`	`sz.height = std::max(sz.height, y + bottom());`
`718`	`718`
`719`		`- if (!src_el()->is_root() && !src_el()->is_body())`
`720`		`- {`
`721`		`- content_size.width = std::max(content_size.width, x + right());`
`722`		`- content_size.height = std::max(content_size.height, y + bottom());`
`723`		`- }`
`724`		`-`
`725`	`719`	`// All children of tables and blocks with style other than "overflow: visible" are inside element.`
`726`	`720`	`// We can skip calculating size of children`
`727`	`721`	`if (src_el()->css().get_overflow() == overflow_visible && src_el()->css().get_display() != display_table)`
`728`	`722`	`{`
`729`	`723`	`for (auto &el: m_children)`
`730`	`724`	`{`
`731`		`- el->calc_document_size(sz, content_size, x + m_pos.x, y + m_pos.y);`
	`725`	`+ el->calc_document_size(sz, x + m_pos.x, y + m_pos.y);`
`732`	`726`	`}`
`733`	`727`	`}`
`734`		`-`
`735`		`- if (src_el()->is_root() \|\| src_el()->is_body())`
`736`		`- {`
`737`		`- content_size.width = std::max(content_size.width, x + right());`
`738`		`- content_size.height = std::max(content_size.height, y + bottom());`
`739`		`- }`
`740`	`728`	`}`
`741`	`729`	`} else`
`742`	`730`	`{`
`743`	`731`	`position::vector boxes;`
`744`	`732`	`get_inline_boxes(boxes);`
`745`	`733`	`for(auto& box : boxes)`
`746`	`734`	`{`
`747`		`- content_size.width = std::max(content_size.width, x + box.x + box.width);`
`748`		`- content_size.height = std::max(content_size.height, y + box.y + box.height);`
	`735`	`+ sz.width = std::max(sz.width, x + box.x + box.width);`
	`736`	`+ sz.height = std::max(sz.height, y + box.y + box.height);`
`749`	`737`	`}`
`750`	`738`	`}`
`751`	`739`	`}`