summaryrefslogtreecommitdiff
path: root/Libraries
diff options
context:
space:
mode:
Diffstat (limited to 'Libraries')
-rw-r--r--Libraries/LibWeb/CMakeLists.txt22
-rw-r--r--Libraries/LibWeb/DOM/Element.cpp2
-rw-r--r--Libraries/LibWeb/HTML/HTMLIFrameElement.cpp2
-rw-r--r--Libraries/LibWeb/HTML/Parser/Entities.cpp (renamed from Libraries/LibWeb/Parser/Entities.cpp)2
-rw-r--r--Libraries/LibWeb/HTML/Parser/Entities.h (renamed from Libraries/LibWeb/Parser/Entities.h)0
-rw-r--r--Libraries/LibWeb/HTML/Parser/HTMLDocumentParser.cpp (renamed from Libraries/LibWeb/Parser/HTMLDocumentParser.cpp)4
-rw-r--r--Libraries/LibWeb/HTML/Parser/HTMLDocumentParser.h (renamed from Libraries/LibWeb/Parser/HTMLDocumentParser.h)6
-rw-r--r--Libraries/LibWeb/HTML/Parser/HTMLToken.cpp (renamed from Libraries/LibWeb/Parser/HTMLToken.cpp)2
-rw-r--r--Libraries/LibWeb/HTML/Parser/HTMLToken.h (renamed from Libraries/LibWeb/Parser/HTMLToken.h)0
-rw-r--r--Libraries/LibWeb/HTML/Parser/HTMLTokenizer.cpp (renamed from Libraries/LibWeb/Parser/HTMLTokenizer.cpp)20
-rw-r--r--Libraries/LibWeb/HTML/Parser/HTMLTokenizer.h (renamed from Libraries/LibWeb/Parser/HTMLTokenizer.h)2
-rw-r--r--Libraries/LibWeb/HTML/Parser/ListOfActiveFormattingElements.cpp (renamed from Libraries/LibWeb/Parser/ListOfActiveFormattingElements.cpp)2
-rw-r--r--Libraries/LibWeb/HTML/Parser/ListOfActiveFormattingElements.h (renamed from Libraries/LibWeb/Parser/ListOfActiveFormattingElements.h)0
-rw-r--r--Libraries/LibWeb/HTML/Parser/StackOfOpenElements.cpp (renamed from Libraries/LibWeb/Parser/StackOfOpenElements.cpp)4
-rw-r--r--Libraries/LibWeb/HTML/Parser/StackOfOpenElements.h (renamed from Libraries/LibWeb/Parser/StackOfOpenElements.h)0
-rw-r--r--Libraries/LibWeb/Loader/FrameLoader.cpp2
-rw-r--r--Libraries/LibWeb/PageView.cpp2
17 files changed, 31 insertions, 41 deletions
diff --git a/Libraries/LibWeb/CMakeLists.txt b/Libraries/LibWeb/CMakeLists.txt
index 61cce0f1db..a793a7748c 100644
--- a/Libraries/LibWeb/CMakeLists.txt
+++ b/Libraries/LibWeb/CMakeLists.txt
@@ -9,7 +9,10 @@ set(SOURCES
Bindings/XMLHttpRequestConstructor.cpp
Bindings/XMLHttpRequestPrototype.cpp
Bindings/XMLHttpRequestWrapper.cpp
+ CSS/DefaultStyleSheetSource.cpp
CSS/Length.cpp
+ CSS/PropertyID.cpp
+ CSS/PropertyID.h
CSS/Selector.cpp
CSS/SelectorEngine.cpp
CSS/StyleDeclaration.cpp
@@ -65,6 +68,12 @@ set(SOURCES
HTML/HTMLTableRowElement.cpp
HTML/HTMLTitleElement.cpp
HTML/ImageData.cpp
+ HTML/Parser/Entities.cpp
+ HTML/Parser/HTMLDocumentParser.cpp
+ HTML/Parser/HTMLToken.cpp
+ HTML/Parser/HTMLTokenizer.cpp
+ HTML/Parser/ListOfActiveFormattingElements.cpp
+ HTML/Parser/StackOfOpenElements.cpp
Layout/BoxModelMetrics.cpp
Layout/LayoutBlock.cpp
Layout/LayoutBox.cpp
@@ -99,25 +108,16 @@ set(SOURCES
PageView.cpp
Painting/StackingContext.cpp
Parser/CSSParser.cpp
- Parser/Entities.cpp
- Parser/HTMLDocumentParser.cpp
- Parser/HTMLToken.cpp
- Parser/HTMLTokenizer.cpp
- Parser/ListOfActiveFormattingElements.cpp
- Parser/StackOfOpenElements.cpp
- StylePropertiesModel.cpp
SVG/SVGElement.cpp
SVG/SVGGeometryElement.cpp
SVG/SVGGraphicsElement.cpp
SVG/SVGPathElement.cpp
SVG/SVGSVGElement.cpp
SVG/TagNames.cpp
+ StylePropertiesModel.cpp
URLEncoder.cpp
- CSS/PropertyID.h
- CSS/PropertyID.cpp
- CSS/DefaultStyleSheetSource.cpp
- WebContentView.cpp
WebContentClient.cpp
+ WebContentView.cpp
)
set(GENERATED_SOURCES
diff --git a/Libraries/LibWeb/DOM/Element.cpp b/Libraries/LibWeb/DOM/Element.cpp
index abfd3ccef1..78a2fc7120 100644
--- a/Libraries/LibWeb/DOM/Element.cpp
+++ b/Libraries/LibWeb/DOM/Element.cpp
@@ -41,7 +41,7 @@
#include <LibWeb/Layout/LayoutTableRow.h>
#include <LibWeb/Layout/LayoutTableRowGroup.h>
#include <LibWeb/Layout/LayoutTreeBuilder.h>
-#include <LibWeb/Parser/HTMLDocumentParser.h>
+#include <LibWeb/HTML/Parser/HTMLDocumentParser.h>
namespace Web::DOM {
diff --git a/Libraries/LibWeb/HTML/HTMLIFrameElement.cpp b/Libraries/LibWeb/HTML/HTMLIFrameElement.cpp
index d365210a70..b4534898b9 100644
--- a/Libraries/LibWeb/HTML/HTMLIFrameElement.cpp
+++ b/Libraries/LibWeb/HTML/HTMLIFrameElement.cpp
@@ -37,7 +37,7 @@
#include <LibWeb/Layout/LayoutWidget.h>
#include <LibWeb/Loader/ResourceLoader.h>
#include <LibWeb/PageView.h>
-#include <LibWeb/Parser/HTMLDocumentParser.h>
+#include <LibWeb/HTML/Parser/HTMLDocumentParser.h>
namespace Web::HTML {
diff --git a/Libraries/LibWeb/Parser/Entities.cpp b/Libraries/LibWeb/HTML/Parser/Entities.cpp
index 20b7d2750f..088d6f9bc9 100644
--- a/Libraries/LibWeb/Parser/Entities.cpp
+++ b/Libraries/LibWeb/HTML/Parser/Entities.cpp
@@ -26,7 +26,7 @@
#include <AK/LogStream.h>
#include <AK/StringView.h>
-#include <LibWeb/Parser/Entities.h>
+#include <LibWeb/HTML/Parser/Entities.h>
namespace Web {
namespace HTML {
diff --git a/Libraries/LibWeb/Parser/Entities.h b/Libraries/LibWeb/HTML/Parser/Entities.h
index 0e65a068a6..0e65a068a6 100644
--- a/Libraries/LibWeb/Parser/Entities.h
+++ b/Libraries/LibWeb/HTML/Parser/Entities.h
diff --git a/Libraries/LibWeb/Parser/HTMLDocumentParser.cpp b/Libraries/LibWeb/HTML/Parser/HTMLDocumentParser.cpp
index 96da68d5cf..59aaef631a 100644
--- a/Libraries/LibWeb/Parser/HTMLDocumentParser.cpp
+++ b/Libraries/LibWeb/HTML/Parser/HTMLDocumentParser.cpp
@@ -36,8 +36,8 @@
#include <LibWeb/HTML/HTMLFormElement.h>
#include <LibWeb/HTML/HTMLHeadElement.h>
#include <LibWeb/HTML/HTMLScriptElement.h>
-#include <LibWeb/Parser/HTMLDocumentParser.h>
-#include <LibWeb/Parser/HTMLToken.h>
+#include <LibWeb/HTML/Parser/HTMLDocumentParser.h>
+#include <LibWeb/HTML/Parser/HTMLToken.h>
namespace Web::HTML {
diff --git a/Libraries/LibWeb/Parser/HTMLDocumentParser.h b/Libraries/LibWeb/HTML/Parser/HTMLDocumentParser.h
index ebcfd9ec46..bc75cf4990 100644
--- a/Libraries/LibWeb/Parser/HTMLDocumentParser.h
+++ b/Libraries/LibWeb/HTML/Parser/HTMLDocumentParser.h
@@ -28,9 +28,9 @@
#include <AK/NonnullRefPtrVector.h>
#include <LibWeb/DOM/Node.h>
-#include <LibWeb/Parser/HTMLTokenizer.h>
-#include <LibWeb/Parser/ListOfActiveFormattingElements.h>
-#include <LibWeb/Parser/StackOfOpenElements.h>
+#include <LibWeb/HTML/Parser/HTMLTokenizer.h>
+#include <LibWeb/HTML/Parser/ListOfActiveFormattingElements.h>
+#include <LibWeb/HTML/Parser/StackOfOpenElements.h>
namespace Web::HTML {
diff --git a/Libraries/LibWeb/Parser/HTMLToken.cpp b/Libraries/LibWeb/HTML/Parser/HTMLToken.cpp
index 2a82660297..aa9f33c35e 100644
--- a/Libraries/LibWeb/Parser/HTMLToken.cpp
+++ b/Libraries/LibWeb/HTML/Parser/HTMLToken.cpp
@@ -24,7 +24,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibWeb/Parser/HTMLToken.h>
+#include <LibWeb/HTML/Parser/HTMLToken.h>
namespace Web::HTML {
diff --git a/Libraries/LibWeb/Parser/HTMLToken.h b/Libraries/LibWeb/HTML/Parser/HTMLToken.h
index 13e12e9a83..13e12e9a83 100644
--- a/Libraries/LibWeb/Parser/HTMLToken.h
+++ b/Libraries/LibWeb/HTML/Parser/HTMLToken.h
diff --git a/Libraries/LibWeb/Parser/HTMLTokenizer.cpp b/Libraries/LibWeb/HTML/Parser/HTMLTokenizer.cpp
index 7a03e77aa5..cdc8ec8044 100644
--- a/Libraries/LibWeb/Parser/HTMLTokenizer.cpp
+++ b/Libraries/LibWeb/HTML/Parser/HTMLTokenizer.cpp
@@ -25,9 +25,9 @@
*/
#include <LibTextCodec/Decoder.h>
-#include <LibWeb/Parser/Entities.h>
-#include <LibWeb/Parser/HTMLToken.h>
-#include <LibWeb/Parser/HTMLTokenizer.h>
+#include <LibWeb/HTML/Parser/Entities.h>
+#include <LibWeb/HTML/Parser/HTMLToken.h>
+#include <LibWeb/HTML/Parser/HTMLTokenizer.h>
#include <ctype.h>
namespace Web::HTML {
@@ -2215,12 +2215,7 @@ _StartOfFunction:
return false;
// FIXME: Is there a better way of doing this?
- return m_temporary_buffer[0] == 's' &&
- m_temporary_buffer[1] == 'c' &&
- m_temporary_buffer[2] == 'r' &&
- m_temporary_buffer[3] == 'i' &&
- m_temporary_buffer[4] == 'p' &&
- m_temporary_buffer[5] == 't';
+ return m_temporary_buffer[0] == 's' && m_temporary_buffer[1] == 'c' && m_temporary_buffer[2] == 'r' && m_temporary_buffer[3] == 'i' && m_temporary_buffer[4] == 'p' && m_temporary_buffer[5] == 't';
};
ON_WHITESPACE
{
@@ -2366,12 +2361,7 @@ _StartOfFunction:
return false;
// FIXME: Is there a better way of doing this?
- return m_temporary_buffer[0] == 's' &&
- m_temporary_buffer[1] == 'c' &&
- m_temporary_buffer[2] == 'r' &&
- m_temporary_buffer[3] == 'i' &&
- m_temporary_buffer[4] == 'p' &&
- m_temporary_buffer[5] == 't';
+ return m_temporary_buffer[0] == 's' && m_temporary_buffer[1] == 'c' && m_temporary_buffer[2] == 'r' && m_temporary_buffer[3] == 'i' && m_temporary_buffer[4] == 'p' && m_temporary_buffer[5] == 't';
};
ON_WHITESPACE
{
diff --git a/Libraries/LibWeb/Parser/HTMLTokenizer.h b/Libraries/LibWeb/HTML/Parser/HTMLTokenizer.h
index 1f8b8e6648..f4aa69ab91 100644
--- a/Libraries/LibWeb/Parser/HTMLTokenizer.h
+++ b/Libraries/LibWeb/HTML/Parser/HTMLTokenizer.h
@@ -31,7 +31,7 @@
#include <AK/Types.h>
#include <AK/Utf8View.h>
#include <LibWeb/Forward.h>
-#include <LibWeb/Parser/HTMLToken.h>
+#include <LibWeb/HTML/Parser/HTMLToken.h>
namespace Web::HTML {
diff --git a/Libraries/LibWeb/Parser/ListOfActiveFormattingElements.cpp b/Libraries/LibWeb/HTML/Parser/ListOfActiveFormattingElements.cpp
index 9594fd0024..ae38e2288e 100644
--- a/Libraries/LibWeb/Parser/ListOfActiveFormattingElements.cpp
+++ b/Libraries/LibWeb/HTML/Parser/ListOfActiveFormattingElements.cpp
@@ -25,7 +25,7 @@
*/
#include <LibWeb/DOM/Element.h>
-#include <LibWeb/Parser/ListOfActiveFormattingElements.h>
+#include <LibWeb/HTML/Parser/ListOfActiveFormattingElements.h>
namespace Web::HTML {
diff --git a/Libraries/LibWeb/Parser/ListOfActiveFormattingElements.h b/Libraries/LibWeb/HTML/Parser/ListOfActiveFormattingElements.h
index 65064be7e5..65064be7e5 100644
--- a/Libraries/LibWeb/Parser/ListOfActiveFormattingElements.h
+++ b/Libraries/LibWeb/HTML/Parser/ListOfActiveFormattingElements.h
diff --git a/Libraries/LibWeb/Parser/StackOfOpenElements.cpp b/Libraries/LibWeb/HTML/Parser/StackOfOpenElements.cpp
index 9624c483b8..bd58f25062 100644
--- a/Libraries/LibWeb/Parser/StackOfOpenElements.cpp
+++ b/Libraries/LibWeb/HTML/Parser/StackOfOpenElements.cpp
@@ -25,8 +25,8 @@
*/
#include <LibWeb/DOM/Element.h>
-#include <LibWeb/Parser/HTMLDocumentParser.h>
-#include <LibWeb/Parser/StackOfOpenElements.h>
+#include <LibWeb/HTML/Parser/HTMLDocumentParser.h>
+#include <LibWeb/HTML/Parser/StackOfOpenElements.h>
namespace Web::HTML {
diff --git a/Libraries/LibWeb/Parser/StackOfOpenElements.h b/Libraries/LibWeb/HTML/Parser/StackOfOpenElements.h
index 54a709d943..54a709d943 100644
--- a/Libraries/LibWeb/Parser/StackOfOpenElements.h
+++ b/Libraries/LibWeb/HTML/Parser/StackOfOpenElements.h
diff --git a/Libraries/LibWeb/Loader/FrameLoader.cpp b/Libraries/LibWeb/Loader/FrameLoader.cpp
index 811da754b8..0d34ce9034 100644
--- a/Libraries/LibWeb/Loader/FrameLoader.cpp
+++ b/Libraries/LibWeb/Loader/FrameLoader.cpp
@@ -35,7 +35,7 @@
#include <LibWeb/Loader/FrameLoader.h>
#include <LibWeb/Loader/ResourceLoader.h>
#include <LibWeb/Page.h>
-#include <LibWeb/Parser/HTMLDocumentParser.h>
+#include <LibWeb/HTML/Parser/HTMLDocumentParser.h>
namespace Web {
diff --git a/Libraries/LibWeb/PageView.cpp b/Libraries/LibWeb/PageView.cpp
index 69ecd7ea98..40e731adbf 100644
--- a/Libraries/LibWeb/PageView.cpp
+++ b/Libraries/LibWeb/PageView.cpp
@@ -51,7 +51,7 @@
#include <LibWeb/Loader/ResourceLoader.h>
#include <LibWeb/PageView.h>
#include <LibWeb/Painting/PaintContext.h>
-#include <LibWeb/Parser/HTMLDocumentParser.h>
+#include <LibWeb/HTML/Parser/HTMLDocumentParser.h>
#include <LibWeb/UIEvents/MouseEvent.h>
#include <stdio.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 14:21:03 +0000