RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 21:52:45 +00:00
Code Issues Activity Actions

LibWeb: Move the Page/Frame/EventHandler classes into Page/

Browse source
This commit is contained in:
Andreas Kling 2020-07-28 19:27:41 +02:00
parent 481e838054
commit ef711f501e
24 changed files with 32 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Applications/Browser/Tab.cpp
View file

@ -49,12 +49,12 @@
#include <LibWeb/DOM/Element.h>
#include <LibWeb/DOMTreeModel.h>
#include <LibWeb/Dump.h>
#include <LibWeb/Frame/Frame.h>
#include <LibWeb/Layout/LayoutBlock.h>
#include <LibWeb/Layout/LayoutDocument.h>
#include <LibWeb/Layout/LayoutInline.h>
#include <LibWeb/Layout/LayoutNode.h>
#include <LibWeb/Loader/ResourceLoader.h>
#include <LibWeb/Page/Frame.h>
#include <LibWeb/PageView.h>
#include <LibWeb/WebContentView.h>

6
Libraries/LibWeb/CMakeLists.txt
View file

@ -42,8 +42,6 @@ set(SOURCES
DOMTreeModel.cpp
Dump.cpp
FontCache.cpp
Frame/EventHandler.cpp
Frame/Frame.cpp
HTML/CanvasRenderingContext2D.cpp
HTML/HTMLAnchorElement.cpp
HTML/HTMLBRElement.cpp
@ -105,7 +103,9 @@ set(SOURCES
Loader/ImageResource.cpp
Loader/Resource.cpp
Loader/ResourceLoader.cpp
Page.cpp
Page/EventHandler.cpp
Page/Frame.cpp
Page/Page.cpp
PageView.cpp
Painting/StackingContext.cpp
SVG/SVGElement.cpp

2
Libraries/LibWeb/CSS/StyleValue.cpp
View file

@ -29,9 +29,9 @@
#include <LibGfx/Palette.h>
#include <LibWeb/CSS/StyleValue.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/Frame/Frame.h>
#include <LibWeb/Loader/LoadRequest.h>
#include <LibWeb/Loader/ResourceLoader.h>
#include <LibWeb/Page/Frame.h>
#include <LibWeb/PageView.h>
namespace Web::CSS {

2
Libraries/LibWeb/DOM/Document.cpp
View file

@ -46,7 +46,6 @@
#include <LibWeb/DOM/Text.h>
#include <LibWeb/DOM/Window.h>
#include <LibWeb/Dump.h>
#include <LibWeb/Frame/Frame.h>
#include <LibWeb/HTML/HTMLBodyElement.h>
#include <LibWeb/HTML/HTMLHeadElement.h>
#include <LibWeb/HTML/HTMLHtmlElement.h>
@ -55,6 +54,7 @@
#include <LibWeb/Layout/LayoutDocument.h>
#include <LibWeb/Layout/LayoutTreeBuilder.h>
#include <LibWeb/Origin.h>
#include <LibWeb/Page/Frame.h>
#include <LibWeb/PageView.h>
#include <LibWeb/SVG/TagNames.h>
#include <stdio.h>

2
Libraries/LibWeb/DOM/Window.cpp
View file

@ -32,7 +32,7 @@
#include <LibWeb/DOM/Document.h>
#include <LibWeb/DOM/Timer.h>
#include <LibWeb/DOM/Window.h>
#include <LibWeb/Frame/Frame.h>
#include <LibWeb/Page/Frame.h>
#include <LibWeb/PageView.h>
namespace Web::DOM {

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

@ -27,7 +27,7 @@
#include <AK/StringBuilder.h>
#include <LibWeb/HTML/HTMLFormElement.h>
#include <LibWeb/HTML/HTMLInputElement.h>
#include <LibWeb/Frame/Frame.h>
#include <LibWeb/Page/Frame.h>
#include <LibWeb/PageView.h>
#include <LibWeb/URLEncoder.h>

6
Libraries/LibWeb/HTML/HTMLIFrameElement.cpp
View file

@ -29,15 +29,15 @@
#include <LibGUI/TextBox.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/DOM/Event.h>
#include <LibWeb/Dump.h>
#include <LibWeb/HTML/HTMLFormElement.h>
#include <LibWeb/HTML/HTMLIFrameElement.h>
#include <LibWeb/Dump.h>
#include <LibWeb/Frame/Frame.h>
#include <LibWeb/HTML/Parser/HTMLDocumentParser.h>
#include <LibWeb/Layout/LayoutFrame.h>
#include <LibWeb/Layout/LayoutWidget.h>
#include <LibWeb/Loader/ResourceLoader.h>
#include <LibWeb/Page/Frame.h>
#include <LibWeb/PageView.h>
#include <LibWeb/HTML/Parser/HTMLDocumentParser.h>
namespace Web::HTML {

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

@ -31,8 +31,8 @@
#include <LibWeb/DOM/Event.h>
#include <LibWeb/HTML/HTMLFormElement.h>
#include <LibWeb/HTML/HTMLInputElement.h>
#include <LibWeb/Frame/Frame.h>
#include <LibWeb/Layout/LayoutWidget.h>
#include <LibWeb/Page/Frame.h>
#include <LibWeb/PageView.h>
namespace Web::HTML {

2
Libraries/LibWeb/Layout/LayoutBox.cpp
View file

@ -27,7 +27,7 @@
#include <LibGUI/Painter.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/HTML/HTMLBodyElement.h>
#include <LibWeb/Frame/Frame.h>
#include <LibWeb/Page/Frame.h>
#include <LibWeb/Layout/LayoutBlock.h>
#include <LibWeb/Layout/LayoutBox.h>

2
Libraries/LibWeb/Layout/LayoutDocument.cpp
View file

@ -25,10 +25,10 @@
*/
#include <LibWeb/Dump.h>
#include <LibWeb/Frame/Frame.h>
#include <LibWeb/Layout/LayoutDocument.h>
#include <LibWeb/Layout/LayoutImage.h>
#include <LibWeb/Layout/LayoutWidget.h>
#include <LibWeb/Page/Frame.h>
#include <LibWeb/Painting/StackingContext.h>
namespace Web {

2
Libraries/LibWeb/Layout/LayoutFrame.cpp
View file

@ -30,9 +30,9 @@
#include <LibGfx/Font.h>
#include <LibGfx/StylePainter.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/Frame/Frame.h>
#include <LibWeb/Layout/LayoutDocument.h>
#include <LibWeb/Layout/LayoutFrame.h>
#include <LibWeb/Page/Frame.h>
#include <LibWeb/PageView.h>
namespace Web {

2
Libraries/LibWeb/Layout/LayoutNode.cpp
View file

@ -27,11 +27,11 @@
#include <LibGUI/Painter.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/DOM/Element.h>
#include <LibWeb/Frame/Frame.h>
#include <LibWeb/Layout/LayoutBlock.h>
#include <LibWeb/Layout/LayoutDocument.h>
#include <LibWeb/Layout/LayoutNode.h>
#include <LibWeb/Layout/LayoutReplaced.h>
#include <LibWeb/Page/Frame.h>
namespace Web {

2
Libraries/LibWeb/Layout/LayoutWidget.cpp
View file

@ -30,8 +30,8 @@
#include <LibGfx/Font.h>
#include <LibGfx/StylePainter.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/Frame/Frame.h>
#include <LibWeb/Layout/LayoutWidget.h>
#include <LibWeb/Page/Frame.h>
#include <LibWeb/PageView.h>
namespace Web {

6
Libraries/LibWeb/Loader/FrameLoader.cpp
View file

@ -31,11 +31,11 @@
#include <LibWeb/DOM/Document.h>
#include <LibWeb/DOM/ElementFactory.h>
#include <LibWeb/DOM/Text.h>
#include <LibWeb/Frame/Frame.h>
#include <LibWeb/HTML/Parser/HTMLDocumentParser.h>
#include <LibWeb/Loader/FrameLoader.h>
#include <LibWeb/Loader/ResourceLoader.h>
#include <LibWeb/Page.h>
#include <LibWeb/HTML/Parser/HTMLDocumentParser.h>
#include <LibWeb/Page/Frame.h>
#include <LibWeb/Page/Page.h>
namespace Web {

4
Libraries/LibWeb/Frame/EventHandler.cpp → Libraries/LibWeb/Page/EventHandler.cpp
View file

@ -28,11 +28,11 @@
#include <LibGUI/Window.h>
#include <LibJS/Runtime/Value.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/Frame/EventHandler.h>
#include <LibWeb/Frame/Frame.h>
#include <LibWeb/HTML/HTMLAnchorElement.h>
#include <LibWeb/HTML/HTMLIFrameElement.h>
#include <LibWeb/Layout/LayoutDocument.h>
#include <LibWeb/Page/EventHandler.h>
#include <LibWeb/Page/Frame.h>
#include <LibWeb/PageView.h>
#include <LibWeb/UIEvents/MouseEvent.h>

0
Libraries/LibWeb/Frame/EventHandler.h → Libraries/LibWeb/Page/EventHandler.h
View file

2
Libraries/LibWeb/Frame/Frame.cpp → Libraries/LibWeb/Page/Frame.cpp
View file

@ -26,9 +26,9 @@
#include <LibWeb/DOM/Document.h>
#include <LibWeb/HTML/HTMLAnchorElement.h>
#include <LibWeb/Frame/Frame.h>
#include <LibWeb/Layout/LayoutDocument.h>
#include <LibWeb/Layout/LayoutWidget.h>
#include <LibWeb/Page/Frame.h>
#include <LibWeb/PageView.h>
namespace Web {

3
Libraries/LibWeb/Frame/Frame.h → Libraries/LibWeb/Page/Frame.h
View file

@ -33,8 +33,8 @@
#include <LibGfx/Bitmap.h>
#include <LibGfx/Rect.h>
#include <LibGfx/Size.h>
#include <LibWeb/Frame/EventHandler.h>
#include <LibWeb/Loader/FrameLoader.h>
#include <LibWeb/Page/EventHandler.h>
#include <LibWeb/TreeNode.h>
namespace Web {
@ -83,7 +83,6 @@ public:
Gfx::IntPoint to_main_frame_position(const Gfx::IntPoint&);
Gfx::IntRect to_main_frame_rect(const Gfx::IntRect&);
private:
explicit Frame(DOM::Element& host_element, Frame& main_frame);
explicit Frame(Page&);

4
Libraries/LibWeb/Page.cpp → Libraries/LibWeb/Page/Page.cpp
View file

@ -24,8 +24,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <LibWeb/Frame/Frame.h>
#include <LibWeb/Page.h>
#include <LibWeb/Page/Frame.h>
#include <LibWeb/Page/Page.h>
#include <LibWeb/PageView.h>
namespace Web {

0
Libraries/LibWeb/Page.h → Libraries/LibWeb/Page/Page.h
View file

6
Libraries/LibWeb/PageView.cpp
View file

@ -40,18 +40,18 @@
#include <LibWeb/DOM/ElementFactory.h>
#include <LibWeb/DOM/Text.h>
#include <LibWeb/Dump.h>
#include <LibWeb/Frame/EventHandler.h>
#include <LibWeb/Frame/Frame.h>
#include <LibWeb/HTML/HTMLAnchorElement.h>
#include <LibWeb/HTML/HTMLImageElement.h>
#include <LibWeb/HTML/Parser/HTMLDocumentParser.h>
#include <LibWeb/Layout/LayoutBreak.h>
#include <LibWeb/Layout/LayoutDocument.h>
#include <LibWeb/Layout/LayoutNode.h>
#include <LibWeb/Layout/LayoutText.h>
#include <LibWeb/Loader/ResourceLoader.h>
#include <LibWeb/Page/EventHandler.h>
#include <LibWeb/Page/Frame.h>
#include <LibWeb/PageView.h>
#include <LibWeb/Painting/PaintContext.h>
#include <LibWeb/HTML/Parser/HTMLDocumentParser.h>
#include <LibWeb/UIEvents/MouseEvent.h>
#include <stdio.h>

2
Libraries/LibWeb/PageView.h
View file

@ -29,7 +29,7 @@
#include <AK/URL.h>
#include <LibGUI/ScrollableWidget.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/Page.h>
#include <LibWeb/Page/Page.h>
#include <LibWeb/WebViewHooks.h>
namespace Web {

2
Services/WebContent/PageHost.cpp
View file

@ -29,8 +29,8 @@
#include <AK/SharedBuffer.h>
#include <LibGfx/Painter.h>
#include <LibGfx/SystemTheme.h>
#include <LibWeb/Frame/Frame.h>
#include <LibWeb/Layout/LayoutDocument.h>
#include <LibWeb/Page/Frame.h>
#include <WebContent/WebContentClientEndpoint.h>
namespace WebContent {

2
Services/WebContent/PageHost.h
View file

@ -26,7 +26,7 @@
#pragma once
#include <LibWeb/Page.h>
#include <LibWeb/Page/Page.h>
namespace WebContent {