From 374e4ad8a9a1e9e889290253192d13eef5c66eba Mon Sep 17 00:00:00 2001
From: SoftFever <softfeverever@gmail.com>
Date: Tue, 19 May 2026 14:31:15 +0800
Subject: [PATCH] Follow up update for PR #13724: improve GC and shorten
 comments

---
 src/slic3r/GUI/PrinterWebView.cpp | 32 +++++++++++--------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/slic3r/GUI/PrinterWebView.cpp b/src/slic3r/GUI/PrinterWebView.cpp
index c4c5cbcc5f..6c20e98ce6 100644
--- a/src/slic3r/GUI/PrinterWebView.cpp
+++ b/src/slic3r/GUI/PrinterWebView.cpp
@@ -24,26 +24,10 @@ namespace Slic3r {
 namespace GUI {
 
 #ifdef __linux__
-// Workaround for crash in WebKitGTK when loading Fluidd < v1.37.0 or Mainsail < v2.16.1.
-// Their bundled vue-resize component detects container resizes by inserting
-//   <object aria-hidden="true" tabindex="-1" type="text/html" data="about:blank">
-// inside a <div class="resize-observer">. The very insertion of that <object> into the DOM
-// corrupts the heap in WebKitGTK's AcceleratedBackingStore and segfaults.
-//
-// This hook patches Node.prototype.appendChild/insertBefore and *only* swaps the child
-// when BOTH conditions hold:
-//   1. The parent has class "resize-observer" (vue-resize's wrapper div), AND
-//   2. The child is an <object> with vue-resize's exact attribute signature.
-// Any other appendChild/insertBefore call passes through untouched, so PDF/plugin/embed
-// <object> uses elsewhere on the page are not affected.
-//
-// The swap replaces the <object> with a hidden <div> shim that exposes a synthetic
-// contentDocument.defaultView (an EventTarget), and bridges a ResizeObserver on the
-// parent to fire 'resize' events on that fake view -- which is exactly what vue-resize's
-// addResizeHandlers listens to. The synthetic 'load' event fires after insertion so
-// vue-resize wires up its handlers normally.
-//
-// See: https://github.com/OrcaSlicer/OrcaSlicer/issues/7210
+// Workaround for #7210: WebKitGTK crashes on vue-resize's hidden <object> probe used by
+// older Fluidd/Mainsail pages. Swap that <object> for a <div> shim at appendChild time
+// and bridge resize events through a fake contentDocument.defaultView so vue-resize keeps
+// working. Workaround proposed by @VittC.
 static void inject_vue_resize_workaround(wxWebView *webView)
 {
     webView->AddUserScript(
@@ -64,6 +48,12 @@ static void inject_vue_resize_workaround(wxWebView *webView)
         "    shim.setAttribute('tabindex', '-1');"
         "    shim.style.display = 'none';"
         "    var fakeWin = document.createElement('div');"
+        "    var ro = null;"
+        "    var origRemoveEL = fakeWin.removeEventListener.bind(fakeWin);"
+        "    fakeWin.removeEventListener = function(type, fn, opts) {"
+        "      origRemoveEL(type, fn, opts);"
+        "      if (type === 'resize' && ro) { ro.disconnect(); ro = null; }"
+        "    };"
         "    Object.defineProperty(shim, 'contentDocument', {"
         "      configurable: true,"
         "      get: function() { return { defaultView: fakeWin }; }"
@@ -75,7 +65,7 @@ static void inject_vue_resize_workaround(wxWebView *webView)
         "    if (typeof orig.onload === 'function') { shim.onload = orig.onload; }"
         "    queueMicrotask(function() {"
         "      if (parentForRO && typeof ResizeObserver !== 'undefined') {"
-        "        var ro = new ResizeObserver(function() {"
+        "        ro = new ResizeObserver(function() {"
         "          fakeWin.dispatchEvent(new Event('resize'));"
         "        });"
         "        ro.observe(parentForRO);"