RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 11:18:11 +00:00
Code Issues Activity Actions

LibWeb: Move replaced element layout out of Layout::ReplacedBox

Browse source 
Replaced elements are now laid out by the current formatting context.
Since the logic is almost identical in BFC and IFC, it's implemented
by static helpers in FormattingContext.
This commit is contained in:
Andreas Kling 2020-12-11 22:27:09 +01:00
parent e8d6691470
commit 67732df034
7 changed files with 102 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

79
Libraries/LibWeb/Layout/FormattingContext.cpp
View file

@ -25,10 +25,12 @@
*/
#include <LibWeb/Dump.h>
#include <LibWeb/Layout/BlockBox.h>
#include <LibWeb/Layout/BlockFormattingContext.h>
#include <LibWeb/Layout/Box.h>
#include <LibWeb/Layout/FormattingContext.h>
#include <LibWeb/Layout/InlineFormattingContext.h>
#include <LibWeb/Layout/ReplacedBox.h>
#include <LibWeb/Layout/TableFormattingContext.h>
namespace Web::Layout {
@ -118,4 +120,81 @@ FormattingContext::ShrinkToFitResult FormattingContext::calculate_shrink_to_fit_
return { preferred_width, preferred_minimum_width };
}
float FormattingContext::compute_width_for_replaced_element(const ReplacedBox& box)
{
// 10.3.4 Block-level, replaced elements in normal flow...
// 10.3.2 Inline, replaced elements
auto zero_value = CSS::Length::make_px(0);
auto& containing_block = *box.containing_block();
auto margin_left = box.style().margin().left.resolved_or_zero(box, containing_block.width());
auto margin_right = box.style().margin().right.resolved_or_zero(box, containing_block.width());
// A computed value of 'auto' for 'margin-left' or 'margin-right' becomes a used value of '0'.
if (margin_left.is_auto())
margin_left = zero_value;
if (margin_right.is_auto())
margin_right = zero_value;
auto specified_width = box.style().width().resolved_or_auto(box, containing_block.width());
auto specified_height = box.style().height().resolved_or_auto(box, containing_block.height());
// FIXME: Actually compute 'width'
auto computed_width = specified_width;
float used_width = specified_width.to_px(box);
// If 'height' and 'width' both have computed values of 'auto' and the element also has an intrinsic width,
// then that intrinsic width is the used value of 'width'.
if (specified_height.is_auto() && specified_width.is_auto() && box.has_intrinsic_width()) {
used_width = box.intrinsic_width();
}
// If 'height' and 'width' both have computed values of 'auto' and the element has no intrinsic width,
// but does have an intrinsic height and intrinsic ratio;
// or if 'width' has a computed value of 'auto',
// 'height' has some other computed value, and the element does have an intrinsic ratio; then the used value of 'width' is:
//
// (used height) * (intrinsic ratio)
else if ((specified_height.is_auto() && specified_width.is_auto() && !box.has_intrinsic_width() && box.has_intrinsic_height() && box.has_intrinsic_ratio()) || (computed_width.is_auto() && box.has_intrinsic_ratio())) {
used_width = compute_height_for_replaced_element(box) * box.intrinsic_ratio();
}
else if (computed_width.is_auto() && box.has_intrinsic_width()) {
used_width = box.intrinsic_width();
}
else if (computed_width.is_auto()) {
used_width = 300;
}
return used_width;
}
float FormattingContext::compute_height_for_replaced_element(const ReplacedBox& box)
{
// 10.6.2 Inline replaced elements, block-level replaced elements in normal flow,
// 'inline-block' replaced elements in normal flow and floating replaced elements
auto& containing_block = *box.containing_block();
auto specified_width = box.style().width().resolved_or_auto(box, containing_block.width());
auto specified_height = box.style().height().resolved_or_auto(box, containing_block.height());
float used_height = specified_height.to_px(box);
// If 'height' and 'width' both have computed values of 'auto' and the element also has
// an intrinsic height, then that intrinsic height is the used value of 'height'.
if (specified_width.is_auto() && specified_height.is_auto() && box.has_intrinsic_height())
used_height = box.intrinsic_height();
else if (specified_height.is_auto() && box.has_intrinsic_ratio())
used_height = compute_width_for_replaced_element(box) / box.intrinsic_ratio();
else if (specified_height.is_auto() && box.has_intrinsic_height())
used_height = box.intrinsic_height();
else if (specified_height.is_auto())
used_height = 150;
return used_height;
}
}