0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

LibWeb: Rename NestedBrowsingContextP => NavigableContainerViewportP

Browse source 
...where P is for Paintable :^)
This commit is contained in:
Andreas Kling 2024-11-26 12:04:14 +01:00 • committed by Andreas Kling
parent 11d966f3ba
commit dd7623eb30
Notes: github-actions[bot] 2024-11-26 17:59:29 +00:00
7 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Libraries/LibWeb/CMakeLists.txt
View file

@ -624,7 +624,7 @@ set(SOURCES
Painting/LabelablePaintable.cpp
Painting/MarkerPaintable.cpp
Painting/MediaPaintable.cpp
Painting/NestedBrowsingContextPaintable.cpp
Painting/NavigableContainerViewportPaintable.cpp
Painting/PaintContext.cpp
Painting/Paintable.cpp
Painting/PaintableBox.cpp

2
Libraries/LibWeb/HTML/HTMLObjectElement.cpp
View file

@ -143,7 +143,7 @@ GC::Ptr<Layout::Node> HTMLObjectElement::create_layout_node(CSS::StyleProperties
case Representation::Children:
return NavigableContainer::create_layout_node(move(style));
case Representation::NestedBrowsingContext:
// FIXME: Actually paint the nested browsing context's document, similar to how iframes are painted with NavigableContainerViewport and NestedBrowsingContextPaintable.
// FIXME: Actually paint the nested browsing context's document, similar to how iframes are painted with NavigableContainerViewport and NavigableContainerViewportPaintable.
return nullptr;
case Representation::Image:
if (image_data())

4
Libraries/LibWeb/Layout/NavigableContainerViewport.cpp
View file

@ -7,7 +7,7 @@
#include <LibWeb/DOM/Document.h>
#include <LibWeb/Layout/NavigableContainerViewport.h>
#include <LibWeb/Layout/Viewport.h>
#include <LibWeb/Painting/NestedBrowsingContextPaintable.h>
#include <LibWeb/Painting/NavigableContainerViewportPaintable.h>
namespace Web::Layout {
@ -37,7 +37,7 @@ void NavigableContainerViewport::did_set_content_size()
GC::Ptr<Painting::Paintable> NavigableContainerViewport::create_paintable() const
{
return Painting::NestedBrowsingContextPaintable::create(*this);
return Painting::NavigableContainerViewportPaintable::create(*this);
}
}

14
Libraries/LibWeb/Painting/NestedBrowsingContextPaintable.cpp → Libraries/LibWeb/Painting/NavigableContainerViewportPaintable.cpp
View file

@ -9,29 +9,29 @@
#include <LibWeb/Layout/NavigableContainerViewport.h>
#include <LibWeb/Layout/Viewport.h>
#include <LibWeb/Painting/BorderRadiusCornerClipper.h>
#include <LibWeb/Painting/NestedBrowsingContextPaintable.h>
#include <LibWeb/Painting/NavigableContainerViewportPaintable.h>
#include <LibWeb/Painting/ViewportPaintable.h>
namespace Web::Painting {
GC_DEFINE_ALLOCATOR(NestedBrowsingContextPaintable);
GC_DEFINE_ALLOCATOR(NavigableContainerViewportPaintable);
GC::Ref<NestedBrowsingContextPaintable> NestedBrowsingContextPaintable::create(Layout::NavigableContainerViewport const& layout_box)
GC::Ref<NavigableContainerViewportPaintable> NavigableContainerViewportPaintable::create(Layout::NavigableContainerViewport const& layout_box)
{
return layout_box.heap().allocate<NestedBrowsingContextPaintable>(layout_box);
return layout_box.heap().allocate<NavigableContainerViewportPaintable>(layout_box);
}
NestedBrowsingContextPaintable::NestedBrowsingContextPaintable(Layout::NavigableContainerViewport const& layout_box)
NavigableContainerViewportPaintable::NavigableContainerViewportPaintable(Layout::NavigableContainerViewport const& layout_box)
: PaintableBox(layout_box)
{
}
Layout::NavigableContainerViewport const& NestedBrowsingContextPaintable::layout_box() const
Layout::NavigableContainerViewport const& NavigableContainerViewportPaintable::layout_box() const
{
return static_cast<Layout::NavigableContainerViewport const&>(layout_node());
}
void NestedBrowsingContextPaintable::paint(PaintContext& context, PaintPhase phase) const
void NavigableContainerViewportPaintable::paint(PaintContext& context, PaintPhase phase) const
{
if (!is_visible())
return;

10
Libraries/LibWeb/Painting/NestedBrowsingContextPaintable.h → Libraries/LibWeb/Painting/NavigableContainerViewportPaintable.h
View file

@ -11,19 +11,19 @@
namespace Web::Painting {
class NestedBrowsingContextPaintable final : public PaintableBox {
GC_CELL(NestedBrowsingContextPaintable, PaintableBox);
GC_DECLARE_ALLOCATOR(NestedBrowsingContextPaintable);
class NavigableContainerViewportPaintable final : public PaintableBox {
GC_CELL(NavigableContainerViewportPaintable, PaintableBox);
GC_DECLARE_ALLOCATOR(NavigableContainerViewportPaintable);
public:
static GC::Ref<NestedBrowsingContextPaintable> create(Layout::NavigableContainerViewport const&);
static GC::Ref<NavigableContainerViewportPaintable> create(Layout::NavigableContainerViewport const&);
virtual void paint(PaintContext&, PaintPhase) const override;
Layout::NavigableContainerViewport const& layout_box() const;
private:
NestedBrowsingContextPaintable(Layout::NavigableContainerViewport const&);
NavigableContainerViewportPaintable(Layout::NavigableContainerViewport const&);
};
}

2
Meta/gn/secondary/Userland/Libraries/LibWeb/Painting/BUILD.gn
View file

@ -26,7 +26,7 @@ source_set("Painting") {
"LabelablePaintable.cpp",
"MarkerPaintable.cpp",
"MediaPaintable.cpp",
"NestedBrowsingContextPaintable.cpp",
"NavigableContainerViewportPaintable.cpp",
"PaintContext.cpp",
"PaintStyle.cpp",
"Paintable.cpp",

20
Tests/LibWeb/Layout/expected/misc/create-iframes-using-innerhtml.txt
View file

@ -29,13 +29,13 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600]
PaintableWithLines (BlockContainer<BODY>) [8,8 784x0]
PaintableWithLines (BlockContainer<DIV>#container) [8,8 784x0]
PaintableWithLines (BlockContainer<DIV>) [8,8 1x1] overflow: [8,8 20x290]
NestedBrowsingContextPaintable (NavigableContainerViewport<IFRAME>) [13,13 20x20]
NestedBrowsingContextPaintable (NavigableContainerViewport<IFRAME>) [13,43 20x20]
NestedBrowsingContextPaintable (NavigableContainerViewport<IFRAME>) [13,73 20x20]
NestedBrowsingContextPaintable (NavigableContainerViewport<IFRAME>) [13,103 20x20]
NestedBrowsingContextPaintable (NavigableContainerViewport<IFRAME>) [13,133 20x20]
NestedBrowsingContextPaintable (NavigableContainerViewport<IFRAME>) [13,163 20x20]
NestedBrowsingContextPaintable (NavigableContainerViewport<IFRAME>) [13,193 20x20]
NestedBrowsingContextPaintable (NavigableContainerViewport<IFRAME>) [13,223 20x20]
NestedBrowsingContextPaintable (NavigableContainerViewport<IFRAME>) [13,253 20x20]
NestedBrowsingContextPaintable (NavigableContainerViewport<IFRAME>) [13,283 20x20]
NavigableContainerViewportPaintable (NavigableContainerViewport<IFRAME>) [13,13 20x20]
NavigableContainerViewportPaintable (NavigableContainerViewport<IFRAME>) [13,43 20x20]
NavigableContainerViewportPaintable (NavigableContainerViewport<IFRAME>) [13,73 20x20]
NavigableContainerViewportPaintable (NavigableContainerViewport<IFRAME>) [13,103 20x20]
NavigableContainerViewportPaintable (NavigableContainerViewport<IFRAME>) [13,133 20x20]
NavigableContainerViewportPaintable (NavigableContainerViewport<IFRAME>) [13,163 20x20]
NavigableContainerViewportPaintable (NavigableContainerViewport<IFRAME>) [13,193 20x20]
NavigableContainerViewportPaintable (NavigableContainerViewport<IFRAME>) [13,223 20x20]
NavigableContainerViewportPaintable (NavigableContainerViewport<IFRAME>) [13,253 20x20]
NavigableContainerViewportPaintable (NavigableContainerViewport<IFRAME>) [13,283 20x20]