cairo: Remove JSClass macros from Cairo context

Remove the usage of the GJS_DEFINE_PRIV_FROM_JS and GJS_DEFINE_PROTO
families of macros from the Cairo context wrapper type. Use CWrapper
instead, for more type safety and less boilerplate.

Also requires adding a debug topic for Cairo.

2 files changed, 4 insertions, 0 deletions

diff --git a/util/log.cpp b/util/log.cpp
index 9ecb866d..728d4c50 100644
--- a/util/log.cpp
+++ b/util/log.cpp
@@ -166,6 +166,9 @@ _Pragma("GCC diagnostic pop")
     case GJS_DEBUG_NATIVE:
         prefix = "JS NATIVE";
         break;
+    case GJS_DEBUG_CAIRO:
+        prefix = "JS CAIRO";
+        break;
     case GJS_DEBUG_KEEP_ALIVE:
         prefix = "JS KP ALV";
         break;
diff --git a/util/log.h b/util/log.h
index b487d898..9dd1f43f 100644
--- a/util/log.h
+++ b/util/log.h
@@ -18,6 +18,7 @@ typedef enum {
     GJS_DEBUG_CONTEXT,
     GJS_DEBUG_IMPORTER,
     GJS_DEBUG_NATIVE,
+    GJS_DEBUG_CAIRO,
     GJS_DEBUG_KEEP_ALIVE,
     GJS_DEBUG_GREPO,
     GJS_DEBUG_GNAMESPACE,