PNGLoader: Tag the decoded bitmap with the source PNG path.

orospakr · Apr 30, 2019 · f4b190c · f4b190c
1 parent d55ff47
commit f4b190c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/SharedGraphics/GraphicsBitmap.cpp b/SharedGraphics/GraphicsBitmap.cpp
@@ -20,8 +20,8 @@ GraphicsBitmap::GraphicsBitmap(Format format, const Size& size)
  size_t size_in_bytes = size.area() * sizeof(RGBA32);
  m_data = (RGBA32*)mmap(nullptr, size_in_bytes, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, 0, 0);
  ASSERT(m_data && m_data != (void*)-1);
- set_mmap_name(m_data, size_in_bytes, String::format("GraphicsBitmap [%dx%d]", width(), height()).characters());
  m_needs_munmap = true;
+ set_mmap_name(String::format("GraphicsBitmap [%dx%d]", width(), height()).characters());
 }
 
 Retained<GraphicsBitmap> GraphicsBitmap::create_wrapper(Format format, const Size& size, RGBA32* data)
@@ -83,3 +83,9 @@ GraphicsBitmap::~GraphicsBitmap()
  m_data = nullptr;
 }
 
+void GraphicsBitmap::set_mmap_name(const String& name)
+{
+ ASSERT(m_needs_munmap);
+ size_t size_in_bytes = m_size.area() * sizeof(RGBA32);
+ ::set_mmap_name(m_data, size_in_bytes, name.characters());
+}
diff --git a/SharedGraphics/GraphicsBitmap.h b/SharedGraphics/GraphicsBitmap.h
@@ -33,6 +33,8 @@ class GraphicsBitmap : public Retainable<GraphicsBitmap> {
  bool has_alpha_channel() const { return m_format == Format::RGBA32; }
  Format format() const { return m_format; }
 
+ void set_mmap_name(const String&);
+
 private:
  GraphicsBitmap(Format, const Size&);
  GraphicsBitmap(Format, const Size&, RGBA32*);

diff --git a/SharedGraphics/PNGLoader.cpp b/SharedGraphics/PNGLoader.cpp
@@ -1,6 +1,7 @@
 #include <SharedGraphics/PNGLoader.h>
 #include <AK/NetworkOrdered.h>
 #include <AK/MappedFile.h>
+#include <AK/FileSystemPath.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -105,7 +106,10 @@ RetainPtr<GraphicsBitmap> load_png(const String& path)
  MappedFile mapped_file(path);
  if (!mapped_file.is_valid())
  return nullptr;
- return load_png_impl((const byte*)mapped_file.pointer(), mapped_file.size());
+ auto bitmap = load_png_impl((const byte*)mapped_file.pointer(), mapped_file.size());
+ if (bitmap)
+ bitmap->set_mmap_name(String::format("GraphicsBitmap [%dx%d] - Decoded PNG: %s", bitmap->width(), bitmap->height(), FileSystemPath(path).string().characters()));
+ return bitmap;
 }
 
 [[gnu::always_inline]] static inline byte paeth_predictor(int a, int b, int c)