From 4b82ac3c8ed06985b5623fafac4500d91c421e60 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Wed, 3 Jul 2019 07:25:04 +0200 Subject: [PATCH] LibHTML: Rename LayoutStyle => ComputedStyle. --- LibHTML/Layout/ComputedStyle.cpp | 9 +++++++++ LibHTML/Layout/{LayoutStyle.h => ComputedStyle.h} | 6 +++--- LibHTML/Layout/LayoutNode.h | 8 ++++---- LibHTML/Layout/LayoutStyle.cpp | 9 --------- LibHTML/Makefile.shared | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) create mode 100644 LibHTML/Layout/ComputedStyle.cpp rename LibHTML/Layout/{LayoutStyle.h => ComputedStyle.h} (94%) delete mode 100644 LibHTML/Layout/LayoutStyle.cpp diff --git a/LibHTML/Layout/ComputedStyle.cpp b/LibHTML/Layout/ComputedStyle.cpp new file mode 100644 index 0000000000..2716ff6463 --- /dev/null +++ b/LibHTML/Layout/ComputedStyle.cpp @@ -0,0 +1,9 @@ +#include + +ComputedStyle::ComputedStyle() +{ +} + +ComputedStyle::~ComputedStyle() +{ +} diff --git a/LibHTML/Layout/LayoutStyle.h b/LibHTML/Layout/ComputedStyle.h similarity index 94% rename from LibHTML/Layout/LayoutStyle.h rename to LibHTML/Layout/ComputedStyle.h index ddee1736ad..af339fecd6 100644 --- a/LibHTML/Layout/LayoutStyle.h +++ b/LibHTML/Layout/ComputedStyle.h @@ -9,10 +9,10 @@ enum FontStyle { Bold, }; -class LayoutStyle { +class ComputedStyle { public: - LayoutStyle(); - ~LayoutStyle(); + ComputedStyle(); + ~ComputedStyle(); Color text_color() const { return m_text_color; } Color background_color() const { return m_background_color; } diff --git a/LibHTML/Layout/LayoutNode.h b/LibHTML/Layout/LayoutNode.h index d049d37913..b30b26e025 100644 --- a/LibHTML/Layout/LayoutNode.h +++ b/LibHTML/Layout/LayoutNode.h @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include @@ -18,8 +18,8 @@ public: Rect& rect() { return m_rect; } void set_rect(const Rect& rect) { m_rect = rect; } - LayoutStyle& style() { return m_style; } - const LayoutStyle& style() const { return m_style; } + ComputedStyle& style() { return m_style; } + const ComputedStyle& style() const { return m_style; } bool is_anonymous() const { return !m_node; } const Node* node() const { return m_node; } @@ -53,6 +53,6 @@ private: const Node* m_node { nullptr }; NonnullRefPtr m_styled_node; - LayoutStyle m_style; + ComputedStyle m_style; Rect m_rect; }; diff --git a/LibHTML/Layout/LayoutStyle.cpp b/LibHTML/Layout/LayoutStyle.cpp deleted file mode 100644 index 13b0c94b00..0000000000 --- a/LibHTML/Layout/LayoutStyle.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include - -LayoutStyle::LayoutStyle() -{ -} - -LayoutStyle::~LayoutStyle() -{ -} diff --git a/LibHTML/Makefile.shared b/LibHTML/Makefile.shared index df6e17befc..e93ccf54c7 100644 --- a/LibHTML/Makefile.shared +++ b/LibHTML/Makefile.shared @@ -19,7 +19,7 @@ LIBHTML_OBJS = \ Layout/LayoutBlock.o \ Layout/LayoutInline.o \ Layout/LayoutDocument.o \ - Layout/LayoutStyle.o \ + Layout/ComputedStyle.o \ Frame.o \ Dump.o