RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 18:47:44 +00:00
Code Issues Activity Actions

LibWeb+WebContent: Make document background and Viewport transparent

Browse source 
This means iframes are transparent by default (as in firefox/chrome).

Painting the outermost canvas background is moved to the PageHost.
This commit is contained in:
Sigmund Lahn 2023-04-24 22:38:50 +02:00 • committed by Andreas Kling
parent 5e7c838160
commit f2f14ad9bd
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Libraries/LibWeb/DOM/Document.cpp
View file

@ -722,7 +722,7 @@ void Document::tear_down_layout_tree()
m_layout_root = nullptr; m_layout_root = nullptr;
} }
Color Document::background_color(Gfx::Palette const& palette) const Color Document::background_color() const
{ {
// CSS2 says we should use the HTML element's background color unless it's transparent... // CSS2 says we should use the HTML element's background color unless it's transparent...
if (auto* html_element = this->html_element(); html_element && html_element->layout_node()) { if (auto* html_element = this->html_element(); html_element && html_element->layout_node()) {
@ -734,12 +734,12 @@ Color Document::background_color(Gfx::Palette const& palette) const
// ...in which case we use the BODY element's background color. // ...in which case we use the BODY element's background color.
if (auto* body_element = body(); body_element && body_element->layout_node()) { if (auto* body_element = body(); body_element && body_element->layout_node()) {
auto color = body_element->layout_node()->computed_values().background_color(); auto color = body_element->layout_node()->computed_values().background_color();
if (color.alpha()) return color;
return color;
} }
// If both HTML and BODY are transparent, we fall back to the system's "base" palette color. // By default, the document is transparent.
return palette.base(); // The outermost canvas is colored by the PageHost.
return Color::Transparent;
} }
Vector<CSS::BackgroundLayerData> const* Document::background_layers() const Vector<CSS::BackgroundLayerData> const* Document::background_layers() const

2
Userland/Libraries/LibWeb/DOM/Document.h
View file

@ -179,7 +179,7 @@ public:
Page* page(); Page* page();
Page const* page() const; Page const* page() const;
Color background_color(Gfx::Palette const&) const; Color background_color() const;
Vector<CSS::BackgroundLayerData> const* background_layers() const; Vector<CSS::BackgroundLayerData> const* background_layers() const;
Color link_color() const; Color link_color() const;

1
Userland/Libraries/LibWeb/Layout/Viewport.cpp
View file

@ -55,7 +55,6 @@ void Viewport::build_stacking_context_tree()
void Viewport::paint_all_phases(PaintContext& context) void Viewport::paint_all_phases(PaintContext& context)
{ {
build_stacking_context_tree_if_needed(); build_stacking_context_tree_if_needed();
context.painter().fill_rect(context.enclosing_device_rect(paintable_box()->absolute_rect()).to_type<int>(), document().background_color(context.palette()));
context.painter().translate(-context.device_viewport_rect().location().to_type<int>()); context.painter().translate(-context.device_viewport_rect().location().to_type<int>());
paintable_box()->stacking_context()->paint(context); paintable_box()->stacking_context()->paint(context);
} }

2
Userland/Libraries/LibWeb/Painting/PaintableBox.cpp
View file

@ -257,7 +257,7 @@ void PaintableBox::paint_background(PaintContext& context) const
// user agents must instead propagate the computed values of the background properties from that element’s first HTML BODY child element. // user agents must instead propagate the computed values of the background properties from that element’s first HTML BODY child element.
if (document().html_element()->should_use_body_background_properties()) { if (document().html_element()->should_use_body_background_properties()) {
background_layers = document().background_layers(); background_layers = document().background_layers();
background_color = document().background_color(context.palette()); background_color = document().background_color();
} }
} else { } else {
background_rect = absolute_padding_box_rect(); background_rect = absolute_padding_box_rect();

3
Userland/Services/WebContent/PageHost.cpp
View file

@ -116,9 +116,10 @@ void PageHost::paint(Web::DevicePixelRect const& content_rect, Gfx::Bitmap& targ
if (auto* document = page().top_level_browsing_context().active_document()) if (auto* document = page().top_level_browsing_context().active_document())
document->update_layout(); document->update_layout();
painter.fill_rect(bitmap_rect, palette().base());
auto* layout_root = this->layout_root(); auto* layout_root = this->layout_root();
if (!layout_root) { if (!layout_root) {
painter.fill_rect(bitmap_rect, palette().base());
return; return;
} }