fix: make style relies on element.

openkraken · Nov 24, 2021 · 89228e7 · 89228e7
1 parent 71020d2
commit 89228e7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/bridge/bindings/qjs/dom/element.cc b/bridge/bindings/qjs/dom/element.cc
@@ -593,10 +593,7 @@ JSClassID ElementInstance::classID() {
   return Element::classId();
 }
 
-ElementInstance::~ElementInstance() {
-  // Should reset weak reference between style and element.
-  m_style->ownerEventTarget = nullptr;
-}
+ElementInstance::~ElementInstance() {}
 
 JSValue ElementInstance::internalGetTextContent() {
   JSValue array = JS_NewArray(m_ctx);

diff --git a/bridge/bindings/qjs/dom/style_declaration.cc b/bridge/bindings/qjs/dom/style_declaration.cc
@@ -111,6 +111,10 @@ JSValue CSSStyleDeclaration::getPropertyValue(QjsContext* ctx, JSValue this_val,
   return returnValue;
 }
 
+StyleDeclarationInstance::StyleDeclarationInstance(CSSStyleDeclaration* cssStyleDeclaration, EventTargetInstance* ownerEventTarget)
+    : Instance(cssStyleDeclaration, "CSSStyleDeclaration", &m_exoticMethods, CSSStyleDeclaration::kCSSStyleDeclarationClassId, finalize), ownerEventTarget(ownerEventTarget) {
+  JS_DupValue(m_ctx, ownerEventTarget->instanceObject);
+}
 StyleDeclarationInstance::~StyleDeclarationInstance() {}
 
 bool StyleDeclarationInstance::internalSetProperty(std::string& name, JSValue value) {
@@ -214,4 +218,10 @@ JSClassExoticMethods StyleDeclarationInstance::m_exoticMethods{
     nullptr, nullptr, nullptr, nullptr, nullptr, getProperty, setProperty,
 };
 
+void StyleDeclarationInstance::gcMark(JSRuntime* rt, JSValue val, JS_MarkFunc* mark_func) {
+  Instance::gcMark(rt, val, mark_func);
+  // We should tel gc style relies on element
+  JS_MarkValue(rt, ownerEventTarget->instanceObject, mark_func);
+}
+
 }  // namespace kraken::binding::qjs
diff --git a/bridge/bindings/qjs/dom/style_declaration.h b/bridge/bindings/qjs/dom/style_declaration.h
@@ -48,15 +48,16 @@ class CSSStyleDeclaration : public HostClass {
 class StyleDeclarationInstance : public Instance {
  public:
   StyleDeclarationInstance() = delete;
-  explicit StyleDeclarationInstance(CSSStyleDeclaration* cssStyleDeclaration, EventTargetInstance* ownerEventTarget)
-      : Instance(cssStyleDeclaration, "CSSStyleDeclaration", &m_exoticMethods, CSSStyleDeclaration::kCSSStyleDeclarationClassId, finalize), ownerEventTarget(ownerEventTarget){};
+  explicit StyleDeclarationInstance(CSSStyleDeclaration* cssStyleDeclaration, EventTargetInstance* ownerEventTarget);
   ~StyleDeclarationInstance();
   bool internalSetProperty(std::string& name, JSValue value);
   void internalRemoveProperty(std::string& name);
   JSValue internalGetPropertyValue(std::string& name);
   std::string toString();
   void copyWith(StyleDeclarationInstance* instance);
 
+  void gcMark(JSRuntime* rt, JSValue val, JS_MarkFunc* mark_func) override;
+
   const EventTargetInstance* ownerEventTarget;
 
  private: