14 files changed, 160 insertions, 242 deletions
diff --git a/include/cru/platform/graphics/direct2d/Base.h b/include/cru/platform/graphics/direct2d/Base.h
index 55942e53..f42d6193 100644
--- a/include/cru/platform/graphics/direct2d/Base.h
+++ b/include/cru/platform/graphics/direct2d/Base.h
@@ -1,5 +1,7 @@
 #pragma once
-#include "cru/platform/win/WinPreConfig.h"
+
+#include <cru/base/platform/win/Base.h>
+#include <cru/platform/graphics/Base.h>
 
 #include <d2d1_2.h>
 #include <d3d11.h>
@@ -16,3 +18,138 @@
 #else
 #define CRU_WIN_GRAPHICS_DIRECT_API
 #endif
+
+namespace cru::platform::graphics::direct2d {
+using platform::win::HResultError;
+using platform::win::ThrowIfFailed;
+
+inline D2D1_MATRIX_3X2_F Convert(const platform::Matrix& matrix) {
+  D2D1_MATRIX_3X2_F m;
+  m._11 = matrix.m11;
+  m._12 = matrix.m12;
+  m._21 = matrix.m21;
+  m._22 = matrix.m22;
+  m._31 = matrix.m31;
+  m._32 = matrix.m32;
+  return m;
+}
+
+inline D2D1_COLOR_F Convert(const Color& color) {
+  return D2D1::ColorF(color.red / 255.0f, color.green / 255.0f,
+                      color.blue / 255.0f, color.alpha / 255.0f);
+}
+
+inline D2D1_POINT_2F Convert(const Point& point) {
+  return D2D1::Point2F(point.x, point.y);
+}
+
+inline D2D1_RECT_F Convert(const Rect& rect) {
+  return D2D1::RectF(rect.left, rect.top, rect.left + rect.width,
+                     rect.top + rect.height);
+}
+
+inline D2D1_ROUNDED_RECT Convert(const RoundedRect& rounded_rect) {
+  return D2D1::RoundedRect(Convert(rounded_rect.rect), rounded_rect.radius_x,
+                           rounded_rect.radius_y);
+}
+
+inline D2D1_ELLIPSE Convert(const Ellipse& ellipse) {
+  return D2D1::Ellipse(Convert(ellipse.center), ellipse.radius_x,
+                       ellipse.radius_y);
+}
+
+inline platform::Matrix Convert(const D2D1_MATRIX_3X2_F& matrix) {
+  return platform::Matrix{matrix._11, matrix._12, matrix._21,
+                          matrix._22, matrix._31, matrix._32};
+}
+
+inline Color Convert(const D2D1_COLOR_F& color) {
+  auto floor = [](float n) { return static_cast<std::uint8_t>(n + 0.5f); };
+  return Color{floor(color.r * 255.0f), floor(color.g * 255.0f),
+               floor(color.b * 255.0f), floor(color.a * 255.0f)};
+}
+
+inline Point Convert(const D2D1_POINT_2F& point) {
+  return Point(point.x, point.y);
+}
+
+inline Rect Convert(const D2D1_RECT_F& rect) {
+  return Rect(rect.left, rect.top, rect.right - rect.left,
+              rect.bottom - rect.top);
+}
+
+inline RoundedRect Convert(const D2D1_ROUNDED_RECT& rounded_rect) {
+  return RoundedRect(Convert(rounded_rect.rect), rounded_rect.radiusX,
+                     rounded_rect.radiusY);
+}
+
+inline Ellipse Convert(const D2D1_ELLIPSE& ellipse) {
+  return Ellipse(Convert(ellipse.point), ellipse.radiusX, ellipse.radiusY);
+}
+
+inline bool operator==(const D2D1_POINT_2F& left, const D2D1_POINT_2F& right) {
+  return left.x == right.x && left.y == right.y;
+}
+
+inline bool operator!=(const D2D1_POINT_2F& left, const D2D1_POINT_2F& right) {
+  return !(left == right);
+}
+
+inline bool operator==(const D2D1_RECT_F& left, const D2D1_RECT_F& right) {
+  return left.left == right.left && left.top == right.top &&
+         left.right == right.right && left.bottom == right.bottom;
+}
+
+inline bool operator!=(const D2D1_RECT_F& left, const D2D1_RECT_F& right) {
+  return !(left == right);
+}
+
+inline bool operator==(const D2D1_ROUNDED_RECT& left,
+                       const D2D1_ROUNDED_RECT& right) {
+  return left.rect == right.rect && left.radiusX == right.radiusX &&
+         left.radiusY == right.radiusY;
+}
+
+inline bool operator!=(const D2D1_ROUNDED_RECT& left,
+                       const D2D1_ROUNDED_RECT& right) {
+  return !(left == right);
+}
+
+inline bool operator==(const D2D1_ELLIPSE& left, const D2D1_ELLIPSE& right) {
+  return left.point == right.point && left.radiusX == right.radiusX &&
+         left.radiusY == right.radiusY;
+}
+
+inline bool operator!=(const D2D1_ELLIPSE& left, const D2D1_ELLIPSE& right) {
+  return !(left == right);
+}
+
+class DirectGraphicsFactory;
+
+class CRU_WIN_GRAPHICS_DIRECT_API DirectGraphicsResource
+    : public Object,
+      public virtual IGraphicsResource {
+ public:
+  constexpr static auto kPlatformId = "Windows Direct";
+
+ protected:
+  // Param factory can't be null.
+  explicit DirectGraphicsResource(DirectGraphicsFactory* factory);
+
+ public:
+  std::string GetPlatformId() const override;
+
+  IGraphicsFactory* GetGraphicsFactory() final;
+
+ public:
+  DirectGraphicsFactory* GetDirectFactory() const { return factory_; }
+
+ private:
+  DirectGraphicsFactory* factory_;
+};
+
+template <typename TInterface>
+struct CRU_WIN_GRAPHICS_DIRECT_API IComResource : virtual Interface {
+  virtual TInterface* GetComInterface() const = 0;
+};
+}  // namespace cru::platform::graphics::direct2d
diff --git a/include/cru/platform/graphics/direct2d/Brush.h b/include/cru/platform/graphics/direct2d/Brush.h
index 98f9018c..331a9bc0 100644
--- a/include/cru/platform/graphics/direct2d/Brush.h
+++ b/include/cru/platform/graphics/direct2d/Brush.h
@@ -1,8 +1,7 @@
 #pragma once
-#include "ComResource.h"
-#include "Resource.h"
+#include "Base.h"
 
-#include "cru/platform/graphics/Brush.h"
+#include <cru/platform/graphics/Brush.h>
 
 namespace cru::platform::graphics::direct2d {
 struct CRU_WIN_GRAPHICS_DIRECT_API ID2DBrush : virtual IBrush {
@@ -17,12 +16,6 @@ class CRU_WIN_GRAPHICS_DIRECT_API D2DSolidColorBrush
  public:
   explicit D2DSolidColorBrush(DirectGraphicsFactory* factory);
 
-  CRU_DELETE_COPY(D2DSolidColorBrush)
-  CRU_DELETE_MOVE(D2DSolidColorBrush)
-
-  ~D2DSolidColorBrush() override = default;
-
- public:
   Color GetColor() override { return color_; }
   void SetColor(const Color& color) override;
 
diff --git a/include/cru/platform/graphics/direct2d/ComResource.h b/include/cru/platform/graphics/direct2d/ComResource.h
deleted file mode 100644
index d274ae16..00000000
--- a/include/cru/platform/graphics/direct2d/ComResource.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-#include "Base.h"
-
-#include "cru/base/Base.h"
-
-namespace cru::platform::graphics::direct2d {
-template <typename TInterface>
-struct CRU_WIN_GRAPHICS_DIRECT_API IComResource : virtual Interface {
-  virtual TInterface* GetComInterface() const = 0;
-};
-}  // namespace cru::platform::graphics::direct2d
diff --git a/include/cru/platform/graphics/direct2d/ConvertUtil.h b/include/cru/platform/graphics/direct2d/ConvertUtil.h
deleted file mode 100644
index 66fa37f8..00000000
--- a/include/cru/platform/graphics/direct2d/ConvertUtil.h
+++ /dev/null
@@ -1,107 +0,0 @@
-#pragma once
-#include "Base.h"
-
-#include "cru/platform/graphics/Base.h"
-
-namespace cru::platform::graphics::direct2d {
-inline D2D1_MATRIX_3X2_F Convert(const platform::Matrix& matrix) {
-  D2D1_MATRIX_3X2_F m;
-  m._11 = matrix.m11;
-  m._12 = matrix.m12;
-  m._21 = matrix.m21;
-  m._22 = matrix.m22;
-  m._31 = matrix.m31;
-  m._32 = matrix.m32;
-  return m;
-}
-
-inline D2D1_COLOR_F Convert(const Color& color) {
-  return D2D1::ColorF(color.red / 255.0f, color.green / 255.0f,
-                      color.blue / 255.0f, color.alpha / 255.0f);
-}
-
-inline D2D1_POINT_2F Convert(const Point& point) {
-  return D2D1::Point2F(point.x, point.y);
-}
-
-inline D2D1_RECT_F Convert(const Rect& rect) {
-  return D2D1::RectF(rect.left, rect.top, rect.left + rect.width,
-                     rect.top + rect.height);
-}
-
-inline D2D1_ROUNDED_RECT Convert(const RoundedRect& rounded_rect) {
-  return D2D1::RoundedRect(Convert(rounded_rect.rect), rounded_rect.radius_x,
-                           rounded_rect.radius_y);
-}
-
-inline D2D1_ELLIPSE Convert(const Ellipse& ellipse) {
-  return D2D1::Ellipse(Convert(ellipse.center), ellipse.radius_x,
-                       ellipse.radius_y);
-}
-
-inline platform::Matrix Convert(const D2D1_MATRIX_3X2_F& matrix) {
-  return platform::Matrix{matrix._11, matrix._12, matrix._21,
-                          matrix._22, matrix._31, matrix._32};
-}
-
-inline Color Convert(const D2D1_COLOR_F& color) {
-  auto floor = [](float n) { return static_cast<std::uint8_t>(n + 0.5f); };
-  return Color{floor(color.r * 255.0f), floor(color.g * 255.0f),
-               floor(color.b * 255.0f), floor(color.a * 255.0f)};
-}
-
-inline Point Convert(const D2D1_POINT_2F& point) {
-  return Point(point.x, point.y);
-}
-
-inline Rect Convert(const D2D1_RECT_F& rect) {
-  return Rect(rect.left, rect.top, rect.right - rect.left,
-              rect.bottom - rect.top);
-}
-
-inline RoundedRect Convert(const D2D1_ROUNDED_RECT& rounded_rect) {
-  return RoundedRect(Convert(rounded_rect.rect), rounded_rect.radiusX,
-                     rounded_rect.radiusY);
-}
-
-inline Ellipse Convert(const D2D1_ELLIPSE& ellipse) {
-  return Ellipse(Convert(ellipse.point), ellipse.radiusX, ellipse.radiusY);
-}
-
-inline bool operator==(const D2D1_POINT_2F& left, const D2D1_POINT_2F& right) {
-  return left.x == right.x && left.y == right.y;
-}
-
-inline bool operator!=(const D2D1_POINT_2F& left, const D2D1_POINT_2F& right) {
-  return !(left == right);
-}
-
-inline bool operator==(const D2D1_RECT_F& left, const D2D1_RECT_F& right) {
-  return left.left == right.left && left.top == right.top &&
-         left.right == right.right && left.bottom == right.bottom;
-}
-
-inline bool operator!=(const D2D1_RECT_F& left, const D2D1_RECT_F& right) {
-  return !(left == right);
-}
-
-inline bool operator==(const D2D1_ROUNDED_RECT& left,
-                       const D2D1_ROUNDED_RECT& right) {
-  return left.rect == right.rect && left.radiusX == right.radiusX &&
-         left.radiusY == right.radiusY;
-}
-
-inline bool operator!=(const D2D1_ROUNDED_RECT& left,
-                       const D2D1_ROUNDED_RECT& right) {
-  return !(left == right);
-}
-
-inline bool operator==(const D2D1_ELLIPSE& left, const D2D1_ELLIPSE& right) {
-  return left.point == right.point && left.radiusX == right.radiusX &&
-         left.radiusY == right.radiusY;
-}
-
-inline bool operator!=(const D2D1_ELLIPSE& left, const D2D1_ELLIPSE& right) {
-  return !(left == right);
-}
-}  // namespace cru::platform::graphics::direct2d
diff --git a/include/cru/platform/graphics/direct2d/Exception.h b/include/cru/platform/graphics/direct2d/Exception.h
deleted file mode 100644
index 9be6f10a..00000000
--- a/include/cru/platform/graphics/direct2d/Exception.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-#include "cru/platform/win/Exception.h"
-
-namespace cru::platform::graphics::direct2d {
-using platform::win::HResultError;
-using platform::win::ThrowIfFailed;
-}  // namespace cru::platform::graphics::direct2d
diff --git a/include/cru/platform/graphics/direct2d/Factory.h b/include/cru/platform/graphics/direct2d/Factory.h
index e96950fd..1d6cdef8 100644
--- a/include/cru/platform/graphics/direct2d/Factory.h
+++ b/include/cru/platform/graphics/direct2d/Factory.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Resource.h"
+#include "Base.h"
 
 #include "ImageFactory.h"
 
@@ -9,14 +9,10 @@
 
 namespace cru::platform::graphics::direct2d {
 class CRU_WIN_GRAPHICS_DIRECT_API DirectGraphicsFactory
-    : public DirectResource,
+    : public DirectGraphicsResource,
       public virtual IGraphicsFactory {
  public:
   DirectGraphicsFactory();
-
-  CRU_DELETE_COPY(DirectGraphicsFactory)
-  CRU_DELETE_MOVE(DirectGraphicsFactory)
-
   ~DirectGraphicsFactory() override;
 
  public:
diff --git a/include/cru/platform/graphics/direct2d/Font.h b/include/cru/platform/graphics/direct2d/Font.h
index 86576592..0e7af622 100644
--- a/include/cru/platform/graphics/direct2d/Font.h
+++ b/include/cru/platform/graphics/direct2d/Font.h
@@ -1,10 +1,7 @@
 #pragma once
-#include "ComResource.h"
-#include "Resource.h"
+#include "Base.h"
 
-#include "cru/platform/graphics/Font.h"
-
-#include <string_view>
+#include <cru/platform/graphics/Font.h>
 
 namespace cru::platform::graphics::direct2d {
 class CRU_WIN_GRAPHICS_DIRECT_API DWriteFont
@@ -15,12 +12,6 @@ class CRU_WIN_GRAPHICS_DIRECT_API DWriteFont
   DWriteFont(DirectGraphicsFactory* factory, std::string font_family,
              float font_size);
 
-  CRU_DELETE_COPY(DWriteFont)
-  CRU_DELETE_MOVE(DWriteFont)
-
-  ~DWriteFont() override = default;
-
- public:
   IDWriteTextFormat* GetComInterface() const override {
     return text_format_.Get();
   }
diff --git a/include/cru/platform/graphics/direct2d/Geometry.h b/include/cru/platform/graphics/direct2d/Geometry.h
index 64dbae84..2af275d4 100644
--- a/include/cru/platform/graphics/direct2d/Geometry.h
+++ b/include/cru/platform/graphics/direct2d/Geometry.h
@@ -1,8 +1,7 @@
 #pragma once
-#include "ComResource.h"
-#include "Resource.h"
+#include "Base.h"
 
-#include "cru/platform/graphics/Geometry.h"
+#include <cru/platform/graphics/Geometry.h>
 
 namespace cru::platform::graphics::direct2d {
 class CRU_WIN_GRAPHICS_DIRECT_API D2DGeometryBuilder
@@ -11,12 +10,6 @@ class CRU_WIN_GRAPHICS_DIRECT_API D2DGeometryBuilder
  public:
   explicit D2DGeometryBuilder(DirectGraphicsFactory* factory);
 
-  CRU_DELETE_COPY(D2DGeometryBuilder)
-  CRU_DELETE_MOVE(D2DGeometryBuilder)
-
-  ~D2DGeometryBuilder() override = default;
-
- public:
   Point GetCurrentPosition() override;
 
   void MoveTo(const Point& point) override;
diff --git a/include/cru/platform/graphics/direct2d/Image.h b/include/cru/platform/graphics/direct2d/Image.h
index 9f3f247f..89eb6738 100644
--- a/include/cru/platform/graphics/direct2d/Image.h
+++ b/include/cru/platform/graphics/direct2d/Image.h
@@ -1,6 +1,7 @@
 #pragma once
-#include "Resource.h"
-#include "cru/platform/graphics/Image.h"
+#include "Base.h"
+
+#include <cru/platform/graphics/Image.h>
 
 namespace cru::platform::graphics::direct2d {
 class CRU_WIN_GRAPHICS_DIRECT_API Direct2DImage : public DirectGraphicsResource,
@@ -9,12 +10,8 @@ class CRU_WIN_GRAPHICS_DIRECT_API Direct2DImage : public DirectGraphicsResource,
   Direct2DImage(DirectGraphicsFactory* graphics_factory,
                 Microsoft::WRL::ComPtr<ID2D1Bitmap1> d2d_bitmap);
 
-  CRU_DELETE_COPY(Direct2DImage)
-  CRU_DELETE_MOVE(Direct2DImage)
-
   ~Direct2DImage() override;
 
- public:
   float GetWidth() override;
   float GetHeight() override;
 
diff --git a/include/cru/platform/graphics/direct2d/ImageFactory.h b/include/cru/platform/graphics/direct2d/ImageFactory.h
index 87f6c0ee..b7aad021 100644
--- a/include/cru/platform/graphics/direct2d/ImageFactory.h
+++ b/include/cru/platform/graphics/direct2d/ImageFactory.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "Resource.h"
-#include "cru/platform/graphics/Image.h"
-#include "cru/platform/graphics/ImageFactory.h"
+#include "Base.h"
+
+#include <cru/platform/graphics/ImageFactory.h>
 
 namespace cru::platform::graphics::direct2d {
 class CRU_WIN_GRAPHICS_DIRECT_API WinImageFactory
@@ -11,12 +11,8 @@ class CRU_WIN_GRAPHICS_DIRECT_API WinImageFactory
  public:
   explicit WinImageFactory(DirectGraphicsFactory* graphics_factory);
 
-  CRU_DELETE_COPY(WinImageFactory)
-  CRU_DELETE_MOVE(WinImageFactory)
-
   ~WinImageFactory() override;
 
- public:
   std::unique_ptr<IImage> DecodeFromStream(io::Stream* stream) override;
 
   void EncodeToStream(IImage* image, io::Stream* stream, ImageFormat format,
diff --git a/include/cru/platform/graphics/direct2d/Painter.h b/include/cru/platform/graphics/direct2d/Painter.h
index c5d5e86a..b0998c6b 100644
--- a/include/cru/platform/graphics/direct2d/Painter.h
+++ b/include/cru/platform/graphics/direct2d/Painter.h
@@ -1,25 +1,21 @@
 #pragma once
-#include "ComResource.h"
-#include "Resource.h"
+#include "Base.h"
 
-#include "cru/base/Base.h"
-#include "cru/platform/graphics/Painter.h"
+#include <cru/platform/graphics/Painter.h>
 
 #include <vector>
 
 namespace cru::platform::graphics::direct2d {
 class CRU_WIN_GRAPHICS_DIRECT_API D2DDeviceContextPainter
-    : public DirectResource,
+    : public DirectGraphicsResource,
       public virtual IPainter,
       public virtual IComResource<ID2D1DeviceContext1> {
   CRU_DEFINE_CLASS_LOG_TAG("D2DDeviceContextPainter")
  public:
-  explicit D2DDeviceContextPainter(ID2D1DeviceContext1* device_context,
+  explicit D2DDeviceContextPainter(DirectGraphicsFactory* graphics_factory,
+                                   ID2D1DeviceContext1* device_context,
                                    bool release = false);
 
-  CRU_DELETE_COPY(D2DDeviceContextPainter)
-  CRU_DELETE_MOVE(D2DDeviceContextPainter)
-
   ~D2DDeviceContextPainter() override;
 
  public:
diff --git a/include/cru/platform/graphics/direct2d/Resource.h b/include/cru/platform/graphics/direct2d/Resource.h
deleted file mode 100644
index b8dd42ab..00000000
--- a/include/cru/platform/graphics/direct2d/Resource.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#pragma once
-#include "Base.h"
-
-#include "cru/platform/graphics/Base.h"
-
-#include <string_view>
-
-namespace cru::platform::graphics::direct2d {
-class DirectGraphicsFactory;
-
-class CRU_WIN_GRAPHICS_DIRECT_API DirectResource
-    : public Object,
-      public virtual IPlatformResource {
- public:
-  static std::string kPlatformId;
-
- protected:
-  DirectResource() = default;
-
- public:
-  ~DirectResource() override = default;
-
- public:
-  std::string GetPlatformId() const final { return kPlatformId; }
-};
-
-class CRU_WIN_GRAPHICS_DIRECT_API DirectGraphicsResource
-    : public DirectResource,
-      public virtual IGraphicsResource {
- protected:
-  // Param factory can't be null.
-  explicit DirectGraphicsResource(DirectGraphicsFactory* factory);
-
- public:
-  CRU_DELETE_COPY(DirectGraphicsResource)
-  CRU_DELETE_MOVE(DirectGraphicsResource)
-
-  ~DirectGraphicsResource() override = default;
-
- public:
-  IGraphicsFactory* GetGraphicsFactory() final;
-
- public:
-  DirectGraphicsFactory* GetDirectFactory() const { return factory_; }
-
- private:
-  DirectGraphicsFactory* factory_;
-};
-}  // namespace cru::platform::graphics::direct2d
diff --git a/include/cru/platform/graphics/direct2d/TextLayout.h b/include/cru/platform/graphics/direct2d/TextLayout.h
index a41c3c6c..186c35c0 100644
--- a/include/cru/platform/graphics/direct2d/TextLayout.h
+++ b/include/cru/platform/graphics/direct2d/TextLayout.h
@@ -1,8 +1,7 @@
 #pragma once
-#include "ComResource.h"
-#include "Resource.h"
+#include "Base.h"
 
-#include "cru/platform/graphics/TextLayout.h"
+#include <cru/platform/graphics/TextLayout.h>
 
 #include <limits>
 #include <memory>
@@ -18,9 +17,6 @@ class CRU_WIN_GRAPHICS_DIRECT_API DWriteTextLayout
   DWriteTextLayout(DirectGraphicsFactory* factory, std::shared_ptr<IFont> font,
                    std::string text);
 
-  CRU_DELETE_COPY(DWriteTextLayout)
-  CRU_DELETE_MOVE(DWriteTextLayout)
-
   ~DWriteTextLayout() override;
 
  public:
diff --git a/include/cru/platform/graphics/direct2d/WindowPainter.h b/include/cru/platform/graphics/direct2d/WindowPainter.h
index 01ff3b32..0f51ab8a 100644
--- a/include/cru/platform/graphics/direct2d/WindowPainter.h
+++ b/include/cru/platform/graphics/direct2d/WindowPainter.h
@@ -6,10 +6,7 @@ namespace cru::platform::graphics::direct2d {
 class CRU_WIN_GRAPHICS_DIRECT_API D2DWindowPainter
     : public graphics::direct2d::D2DDeviceContextPainter {
  public:
-  explicit D2DWindowPainter(D2DWindowRenderTarget* window);
-
-  CRU_DELETE_COPY(D2DWindowPainter)
-  CRU_DELETE_MOVE(D2DWindowPainter)
+  explicit D2DWindowPainter(DirectGraphicsFactory* graphics_factory, D2DWindowRenderTarget* window);
 
   ~D2DWindowPainter() override;