From b593b0c8be143da5fab9566313fd98fb0131188b Mon Sep 17 00:00:00 2001 From: Vladislav Ertel Date: Fri, 11 Dec 2020 21:00:47 +0000 Subject: [PATCH] Fix JBCefBrowser dispose GitOrigin-RevId: f6e756d777be1164c86bb5fa454f6fb6514171f7 --- .../platform-api/src/com/intellij/ui/jcef/JBCefBrowser.java | 2 ++ .../platform-api/src/com/intellij/ui/jcef/JBCefBrowserBase.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/platform-api/src/com/intellij/ui/jcef/JBCefBrowser.java b/platform/platform-api/src/com/intellij/ui/jcef/JBCefBrowser.java index d79b16866524..732061d12947 100644 --- a/platform/platform-api/src/com/intellij/ui/jcef/JBCefBrowser.java +++ b/platform/platform-api/src/com/intellij/ui/jcef/JBCefBrowser.java @@ -71,6 +71,8 @@ public class JBCefBrowser extends JBCefBrowserBase { @NotNull private final CefKeyboardHandler myKeyboardHandler; @NotNull private static final List> ourOnBrowserMoveResizeCallbacks = Collections.synchronizedList(new ArrayList<>(1)); + + @NotNull private final DisposeHelper myDisposeHelper = new DisposeHelper(); private final boolean myIsDefaultClient; private JDialog myDevtoolsFrame = null; protected CefContextMenuHandler myDefaultContextMenuHandler; diff --git a/platform/platform-api/src/com/intellij/ui/jcef/JBCefBrowserBase.java b/platform/platform-api/src/com/intellij/ui/jcef/JBCefBrowserBase.java index fb18420d810f..49698e569e5f 100644 --- a/platform/platform-api/src/com/intellij/ui/jcef/JBCefBrowserBase.java +++ b/platform/platform-api/src/com/intellij/ui/jcef/JBCefBrowserBase.java @@ -20,7 +20,7 @@ public abstract class JBCefBrowserBase implements JBCefDisposable { protected static final String BLANK_URI = "about:blank"; @SuppressWarnings("SpellCheckingInspection") protected static final String JBCEFBROWSER_INSTANCE_PROP = "JBCefBrowser.instance"; - @NotNull protected final DisposeHelper myDisposeHelper = new DisposeHelper(); + @NotNull private final DisposeHelper myDisposeHelper = new DisposeHelper(); @Nullable private volatile LoadDeferrer myLoadDeferrer; /**