From f970578cd4e2eab05e1c2e5adedebaa8031bfbdc Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sat, 19 Oct 2019 19:56:49 +0200 Subject: [PATCH] LibDraw: Rename ImageLoader => ImageDecoder ImageLoader was not the right name for this, as there is no loading happening, only decoding. :^) --- Libraries/LibDraw/ImageDecoder.cpp | 11 +++++++++++ .../LibDraw/{ImageLoader.h => ImageDecoder.h} | 16 ++++++++-------- Libraries/LibDraw/ImageLoader.cpp | 11 ----------- Libraries/LibDraw/Makefile | 2 +- Libraries/LibDraw/PNGLoader.cpp | 8 ++++---- Libraries/LibDraw/PNGLoader.h | 8 ++++---- Libraries/LibHTML/DOM/HTMLImageElement.cpp | 2 +- Libraries/LibHTML/DOM/HTMLImageElement.h | 6 +++--- 8 files changed, 32 insertions(+), 32 deletions(-) create mode 100644 Libraries/LibDraw/ImageDecoder.cpp rename Libraries/LibDraw/{ImageLoader.h => ImageDecoder.h} (56%) delete mode 100644 Libraries/LibDraw/ImageLoader.cpp diff --git a/Libraries/LibDraw/ImageDecoder.cpp b/Libraries/LibDraw/ImageDecoder.cpp new file mode 100644 index 0000000000..7cc4461f76 --- /dev/null +++ b/Libraries/LibDraw/ImageDecoder.cpp @@ -0,0 +1,11 @@ +#include +#include + +ImageDecoder::ImageDecoder(const u8* data, size_t size) +{ + m_plugin = make(data, size); +} + +ImageDecoder::~ImageDecoder() +{ +} diff --git a/Libraries/LibDraw/ImageLoader.h b/Libraries/LibDraw/ImageDecoder.h similarity index 56% rename from Libraries/LibDraw/ImageLoader.h rename to Libraries/LibDraw/ImageDecoder.h index 3b72b5cba7..90ba053184 100644 --- a/Libraries/LibDraw/ImageLoader.h +++ b/Libraries/LibDraw/ImageDecoder.h @@ -7,21 +7,21 @@ class GraphicsBitmap; -class ImageLoaderPlugin { +class ImageDecoderPlugin { public: - virtual ~ImageLoaderPlugin() {} + virtual ~ImageDecoderPlugin() {} virtual Size size() = 0; virtual RefPtr bitmap() = 0; protected: - ImageLoaderPlugin() {} + ImageDecoderPlugin() {} }; -class ImageLoader : public RefCounted { +class ImageDecoder : public RefCounted { public: - static NonnullRefPtr create(const u8* data, size_t size) { return adopt(*new ImageLoader(data, size)); } - ~ImageLoader(); + static NonnullRefPtr create(const u8* data, size_t size) { return adopt(*new ImageDecoder(data, size)); } + ~ImageDecoder(); Size size() const { return m_plugin->size(); } int width() const { return size().width(); } @@ -29,7 +29,7 @@ public: RefPtr bitmap() const { return m_plugin->bitmap(); } private: - ImageLoader(const u8*, size_t); + ImageDecoder(const u8*, size_t); - mutable OwnPtr m_plugin; + mutable OwnPtr m_plugin; }; diff --git a/Libraries/LibDraw/ImageLoader.cpp b/Libraries/LibDraw/ImageLoader.cpp deleted file mode 100644 index 2cfdc0ce11..0000000000 --- a/Libraries/LibDraw/ImageLoader.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#include -#include - -ImageLoader::ImageLoader(const u8* data, size_t size) -{ - m_plugin = make(data, size); -} - -ImageLoader::~ImageLoader() -{ -} diff --git a/Libraries/LibDraw/Makefile b/Libraries/LibDraw/Makefile index e866614ec4..60badb6ed3 100644 --- a/Libraries/LibDraw/Makefile +++ b/Libraries/LibDraw/Makefile @@ -8,7 +8,7 @@ OBJS = \ GraphicsBitmap.o \ Painter.o \ PNGLoader.o \ - ImageLoader.o \ + ImageDecoder.o \ Rect.o \ StylePainter.o \ Emoji.o diff --git a/Libraries/LibDraw/PNGLoader.cpp b/Libraries/LibDraw/PNGLoader.cpp index c592bdb3a9..0112292e20 100644 --- a/Libraries/LibDraw/PNGLoader.cpp +++ b/Libraries/LibDraw/PNGLoader.cpp @@ -661,18 +661,18 @@ static bool process_chunk(Streamer& streamer, PNGLoadingContext& context, bool d return true; } -PNGImageLoaderPlugin::PNGImageLoaderPlugin(const u8* data, size_t size) +PNGImageDecoderPlugin::PNGImageDecoderPlugin(const u8* data, size_t size) { m_context = make(); m_context->data = data; m_context->data_size = size; } -PNGImageLoaderPlugin::~PNGImageLoaderPlugin() +PNGImageDecoderPlugin::~PNGImageDecoderPlugin() { } -Size PNGImageLoaderPlugin::size() +Size PNGImageDecoderPlugin::size() { if (m_context->state == PNGLoadingContext::State::Error) return {}; @@ -686,7 +686,7 @@ Size PNGImageLoaderPlugin::size() return { m_context->width, m_context->height }; } -RefPtr PNGImageLoaderPlugin::bitmap() +RefPtr PNGImageDecoderPlugin::bitmap() { if (m_context->state == PNGLoadingContext::State::Error) return nullptr; diff --git a/Libraries/LibDraw/PNGLoader.h b/Libraries/LibDraw/PNGLoader.h index baf33f10b6..c72dafe350 100644 --- a/Libraries/LibDraw/PNGLoader.h +++ b/Libraries/LibDraw/PNGLoader.h @@ -1,17 +1,17 @@ #pragma once #include -#include +#include RefPtr load_png(const StringView& path); RefPtr load_png_from_memory(const u8*, size_t); struct PNGLoadingContext; -class PNGImageLoaderPlugin final : public ImageLoaderPlugin { +class PNGImageDecoderPlugin final : public ImageDecoderPlugin { public: - virtual ~PNGImageLoaderPlugin() override; - PNGImageLoaderPlugin(const u8*, size_t); + virtual ~PNGImageDecoderPlugin() override; + PNGImageDecoderPlugin(const u8*, size_t); virtual Size size() override; virtual RefPtr bitmap() override; diff --git a/Libraries/LibHTML/DOM/HTMLImageElement.cpp b/Libraries/LibHTML/DOM/HTMLImageElement.cpp index 5cf0c92381..507bb69c17 100644 --- a/Libraries/LibHTML/DOM/HTMLImageElement.cpp +++ b/Libraries/LibHTML/DOM/HTMLImageElement.cpp @@ -34,7 +34,7 @@ void HTMLImageElement::load_image(const String& src) } m_image_data = data; - m_image_loader = ImageLoader::create(m_image_data.data(), m_image_data.size()); + m_image_loader = ImageDecoder::create(m_image_data.data(), m_image_data.size()); document().update_layout(); }); } diff --git a/Libraries/LibHTML/DOM/HTMLImageElement.h b/Libraries/LibHTML/DOM/HTMLImageElement.h index 04d265ed11..cd7adea17f 100644 --- a/Libraries/LibHTML/DOM/HTMLImageElement.h +++ b/Libraries/LibHTML/DOM/HTMLImageElement.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include class HTMLImageElement : public HTMLElement { @@ -17,14 +17,14 @@ public: int preferred_height() const; const GraphicsBitmap* bitmap() const; - const ImageLoader* image_loader() const { return m_image_loader; } + const ImageDecoder* image_loader() const { return m_image_loader; } private: void load_image(const String& src); virtual RefPtr create_layout_node(const StyleProperties* parent_style) const override; - RefPtr m_image_loader; + RefPtr m_image_loader; mutable RefPtr m_bitmap; ByteBuffer m_image_data; };