From 5b296718d8b250ab976129097f03a7577ce9020d Mon Sep 17 00:00:00 2001
From: Andreas Kling <awesomekling@gmail.com>
Date: Wed, 3 Apr 2019 14:32:45 +0200
Subject: [PATCH] GraphicsBitmap: Use MappedFile.

---
 SharedGraphics/GraphicsBitmap.cpp | 36 +++++++++++--------------------
 SharedGraphics/GraphicsBitmap.h   |  4 +++-
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/SharedGraphics/GraphicsBitmap.cpp b/SharedGraphics/GraphicsBitmap.cpp
index b48cdf853a..6e8c3e5a11 100644
--- a/SharedGraphics/GraphicsBitmap.cpp
+++ b/SharedGraphics/GraphicsBitmap.cpp
@@ -1,5 +1,6 @@
 #include <SharedGraphics/GraphicsBitmap.h>
 #include <SharedGraphics/PNGLoader.h>
+#include <AK/MappedFile.h>
 #include <sys/mman.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -20,7 +21,6 @@ GraphicsBitmap::GraphicsBitmap(Format format, const Size& size)
     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_mmaped = true;
 }
 
 Retained<GraphicsBitmap> GraphicsBitmap::create_wrapper(Format format, const Size& size, RGBA32* data)
@@ -35,25 +35,10 @@ RetainPtr<GraphicsBitmap> GraphicsBitmap::load_from_file(const String& path)
 
 RetainPtr<GraphicsBitmap> GraphicsBitmap::load_from_file(Format format, const String& path, const Size& size)
 {
-    int fd = open(path.characters(), O_RDONLY, 0644);
-    if (fd < 0) {
-        dbgprintf("open(%s) got fd=%d, failed: %s\n", path.characters(), fd, strerror(errno));
-        perror("open");
+    MappedFile mapped_file(path);
+    if (!mapped_file.is_valid())
         return nullptr;
-    }
-
-    auto* mapped_data = (RGBA32*)mmap(nullptr, size.area() * 4, PROT_READ, MAP_SHARED, fd, 0);
-    if (mapped_data == MAP_FAILED) {
-        int rc = close(fd);
-        ASSERT(rc == 0);
-        return nullptr;
-    }
-
-    int rc = close(fd);
-    ASSERT(rc == 0);
-    auto bitmap = create_wrapper(format, size, mapped_data);
-    bitmap->m_mmaped = true;
-    return bitmap;
+    return adopt(*new GraphicsBitmap(format, size, move(mapped_file)));
 }
 
 GraphicsBitmap::GraphicsBitmap(Format format, const Size& size, RGBA32* data)
@@ -64,6 +49,15 @@ GraphicsBitmap::GraphicsBitmap(Format format, const Size& size, RGBA32* data)
 {
 }
 
+GraphicsBitmap::GraphicsBitmap(Format format, const Size& size, MappedFile&& mapped_file)
+    : m_size(size)
+    , m_data((RGBA32*)mapped_file.pointer())
+    , m_pitch(size.width() * sizeof(RGBA32))
+    , m_format(format)
+    , m_mapped_file(move(mapped_file))
+{
+}
+
 Retained<GraphicsBitmap> GraphicsBitmap::create_with_shared_buffer(Format format, Retained<SharedBuffer>&& shared_buffer, const Size& size)
 {
     return adopt(*new GraphicsBitmap(format, move(shared_buffer), size));
@@ -80,10 +74,6 @@ GraphicsBitmap::GraphicsBitmap(Format format, Retained<SharedBuffer>&& shared_bu
 
 GraphicsBitmap::~GraphicsBitmap()
 {
-    if (m_mmaped) {
-        int rc = munmap(m_data, m_size.area() * 4);
-        ASSERT(rc == 0);
-    }
     m_data = nullptr;
 }
 
diff --git a/SharedGraphics/GraphicsBitmap.h b/SharedGraphics/GraphicsBitmap.h
index e48584df69..4900e7a60c 100644
--- a/SharedGraphics/GraphicsBitmap.h
+++ b/SharedGraphics/GraphicsBitmap.h
@@ -6,6 +6,7 @@
 #include <AK/Retainable.h>
 #include <AK/RetainPtr.h>
 #include <AK/AKString.h>
+#include <AK/MappedFile.h>
 #include <SharedBuffer.h>
 
 class GraphicsBitmap : public Retainable<GraphicsBitmap> {
@@ -35,13 +36,14 @@ public:
 private:
     GraphicsBitmap(Format, const Size&);
     GraphicsBitmap(Format, const Size&, RGBA32*);
+    GraphicsBitmap(Format, const Size&, MappedFile&&);
     GraphicsBitmap(Format, Retained<SharedBuffer>&&, const Size&);
 
     Size m_size;
     RGBA32* m_data { nullptr };
     size_t m_pitch { 0 };
     Format m_format { Format::Invalid };
-    bool m_mmaped { false };
+    MappedFile m_mapped_file;
     RetainPtr<SharedBuffer> m_shared_buffer;
 };