Move: Make NativeHandler private.

This ensures that users call `newNativeHandler()` rather than constructing it directly.
cloudflare · Feb 9, 2024 · 1d8ede4 · 1d8ede4
1 parent 4a29548
commit 1d8ede4
Showing 1 changed file with 29 additions and 32 deletions.
diff --git a/src/workerd/api/basics.h b/src/workerd/api/basics.h
@@ -231,36 +231,6 @@ class CustomEvent: public Event {
 // An implementation of the Web Platform Standard EventTarget API
 class EventTarget: public jsg::Object {
 public:
-
-  // RAII-style listener that can be attached to an EventTarget.
-  class NativeHandler {
-  public:
-    using Signature = void(jsg::Ref<Event>);
-    NativeHandler(jsg::Lock& js, jsg::Ref<EventTarget> target, kj::String type,
-        jsg::Function<Signature> func, bool once = false);
-    ~NativeHandler() noexcept(false);
-    KJ_DISALLOW_COPY_AND_MOVE(NativeHandler);
-
-    void operator()(jsg::Lock&js, jsg::Ref<Event> event);
-
-    uint hashCode() const;
-
-    void visitForGc(jsg::GcVisitor& visitor);
-  private:
-    void detach();
-
-    kj::String type;
-    struct State {
-      jsg::Ref<EventTarget> target;
-      jsg::Function<Signature> func;
-    };
-
-    kj::Maybe<State> state;
-    bool once;
-
-    friend class EventTarget;
-  };
-
   ~EventTarget() noexcept(false);
 
   size_t getHandlerCount(kj::StringPtr type) const;
@@ -349,6 +319,35 @@ class EventTarget: public jsg::Object {
   void visitForMemoryInfo(jsg::MemoryTracker& tracker) const;
 
 private:
+  // RAII-style listener that can be attached to an EventTarget.
+  class NativeHandler {
+  public:
+    using Signature = void(jsg::Ref<Event>);
+    NativeHandler(jsg::Lock& js, jsg::Ref<EventTarget> target, kj::String type,
+        jsg::Function<Signature> func, bool once = false);
+    ~NativeHandler() noexcept(false);
+    KJ_DISALLOW_COPY_AND_MOVE(NativeHandler);
+
+    void operator()(jsg::Lock&js, jsg::Ref<Event> event);
+
+    uint hashCode() const;
+
+    void visitForGc(jsg::GcVisitor& visitor);
+  private:
+    void detach();
+
+    kj::String type;
+    struct State {
+      jsg::Ref<EventTarget> target;
+      jsg::Function<Signature> func;
+    };
+
+    kj::Maybe<State> state;
+    bool once;
+
+    friend class EventTarget;
+  };
+
   void addNativeListener(jsg::Lock& js, NativeHandler& handler);
   bool removeNativeListener(NativeHandler& handler);
 
@@ -603,8 +602,6 @@ class Scheduler final: public jsg::Object {
 private:
 };
 
-KJ_DECLARE_NON_POLYMORPHIC(workerd::api::EventTarget::NativeHandler);
-
 #define EW_BASICS_ISOLATE_TYPES                \
     api::Event,                                \
     api::Event::Init,                          \