diff --git a/Applications/Browser/Tab.cpp b/Applications/Browser/Tab.cpp index 4225b75a8a..0303d6ede2 100644 --- a/Applications/Browser/Tab.cpp +++ b/Applications/Browser/Tab.cpp @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -55,7 +56,6 @@ #include #include #include -#include #include namespace Browser { @@ -88,14 +88,14 @@ Tab::Tab(Type type) else m_web_content_view = widget.add(); - m_go_back_action = GUI::CommonActions::make_go_back_action( [this](auto&) { go_back(); }, this); + m_go_back_action = GUI::CommonActions::make_go_back_action([this](auto&) { go_back(); }, this); m_go_forward_action = GUI::CommonActions::make_go_forward_action([this](auto&) { go_forward(); }, this); toolbar.add_action(*m_go_back_action); toolbar.add_action(*m_go_forward_action); toolbar.add_action(GUI::CommonActions::make_go_home_action([this](auto&) { load(g_home_url); }, this)); - m_reload_action = GUI::CommonActions::make_reload_action( [this](auto&) { reload(); }, this); + m_reload_action = GUI::CommonActions::make_reload_action([this](auto&) { reload(); }, this); toolbar.add_action(*m_reload_action); diff --git a/Libraries/LibWeb/CMakeLists.txt b/Libraries/LibWeb/CMakeLists.txt index a793a7748c..1573c0a74f 100644 --- a/Libraries/LibWeb/CMakeLists.txt +++ b/Libraries/LibWeb/CMakeLists.txt @@ -11,6 +11,7 @@ set(SOURCES Bindings/XMLHttpRequestWrapper.cpp CSS/DefaultStyleSheetSource.cpp CSS/Length.cpp + CSS/Parser/CSSParser.cpp CSS/PropertyID.cpp CSS/PropertyID.h CSS/Selector.cpp @@ -107,7 +108,6 @@ set(SOURCES Page.cpp PageView.cpp Painting/StackingContext.cpp - Parser/CSSParser.cpp SVG/SVGElement.cpp SVG/SVGGeometryElement.cpp SVG/SVGGraphicsElement.cpp diff --git a/Libraries/LibWeb/Parser/CSSParser.cpp b/Libraries/LibWeb/CSS/Parser/CSSParser.cpp similarity index 100% rename from Libraries/LibWeb/Parser/CSSParser.cpp rename to Libraries/LibWeb/CSS/Parser/CSSParser.cpp diff --git a/Libraries/LibWeb/Parser/CSSParser.h b/Libraries/LibWeb/CSS/Parser/CSSParser.h similarity index 100% rename from Libraries/LibWeb/Parser/CSSParser.h rename to Libraries/LibWeb/CSS/Parser/CSSParser.h diff --git a/Libraries/LibWeb/CSS/StyleResolver.cpp b/Libraries/LibWeb/CSS/StyleResolver.cpp index 51746c52b0..9ba4519fb5 100644 --- a/Libraries/LibWeb/CSS/StyleResolver.cpp +++ b/Libraries/LibWeb/CSS/StyleResolver.cpp @@ -25,13 +25,13 @@ */ #include +#include #include #include #include #include #include #include -#include #include #include @@ -344,7 +344,7 @@ static void set_property_expanding_shorthands(StyleProperties& style, CSS::Prope auto right = parse_css_value(context, parts[1]); auto bottom = parse_css_value(context, parts[2]); auto left = parse_css_value(context, parts[3]); - if (top && right && bottom &&left) { + if (top && right && bottom && left) { style.set_property(CSS::PropertyID::BorderTopColor, *top); style.set_property(CSS::PropertyID::BorderRightColor, *right); style.set_property(CSS::PropertyID::BorderBottomColor, *bottom); diff --git a/Libraries/LibWeb/DOM/Document.cpp b/Libraries/LibWeb/DOM/Document.cpp index 1a69da0ee3..a2235779a3 100644 --- a/Libraries/LibWeb/DOM/Document.cpp +++ b/Libraries/LibWeb/DOM/Document.cpp @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -42,20 +43,19 @@ #include #include #include +#include +#include +#include +#include #include #include #include #include #include -#include -#include -#include -#include #include #include #include #include -#include #include #include diff --git a/Libraries/LibWeb/HTML/HTMLImageElement.cpp b/Libraries/LibWeb/HTML/HTMLImageElement.cpp index c584801f3c..b22ae27dca 100644 --- a/Libraries/LibWeb/HTML/HTMLImageElement.cpp +++ b/Libraries/LibWeb/HTML/HTMLImageElement.cpp @@ -27,13 +27,13 @@ #include #include #include +#include #include #include #include #include #include #include -#include namespace Web::HTML { diff --git a/Libraries/LibWeb/HTML/HTMLLinkElement.cpp b/Libraries/LibWeb/HTML/HTMLLinkElement.cpp index dc12be1cef..af07ebdabb 100644 --- a/Libraries/LibWeb/HTML/HTMLLinkElement.cpp +++ b/Libraries/LibWeb/HTML/HTMLLinkElement.cpp @@ -27,10 +27,10 @@ #include #include #include +#include #include #include #include -#include namespace Web::HTML { diff --git a/Libraries/LibWeb/HTML/HTMLStyleElement.cpp b/Libraries/LibWeb/HTML/HTMLStyleElement.cpp index 40e239b547..985075a6cd 100644 --- a/Libraries/LibWeb/HTML/HTMLStyleElement.cpp +++ b/Libraries/LibWeb/HTML/HTMLStyleElement.cpp @@ -25,10 +25,10 @@ */ #include +#include #include -#include #include -#include +#include namespace Web::HTML { diff --git a/Libraries/LibWeb/HTML/HTMLTableCellElement.cpp b/Libraries/LibWeb/HTML/HTMLTableCellElement.cpp index c1edb20176..79d16b0c14 100644 --- a/Libraries/LibWeb/HTML/HTMLTableCellElement.cpp +++ b/Libraries/LibWeb/HTML/HTMLTableCellElement.cpp @@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include -#include namespace Web::HTML { diff --git a/Libraries/LibWeb/HTML/HTMLTableElement.cpp b/Libraries/LibWeb/HTML/HTMLTableElement.cpp index 2374c6b751..3ba08a495e 100644 --- a/Libraries/LibWeb/HTML/HTMLTableElement.cpp +++ b/Libraries/LibWeb/HTML/HTMLTableElement.cpp @@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include -#include namespace Web::HTML {