Cleaning browser closing

luwrain · Jul 23, 2020 · b73a78a · b73a78a
1 parent 6a7b563
commit b73a78a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/src/main/java/org/luwrain/interaction/javafx/JavaFxInteraction.java b/src/main/java/org/luwrain/interaction/javafx/JavaFxInteraction.java
@@ -298,15 +298,17 @@ private void setCurrentBrowser(Browser newCurrentBrowser, boolean visibility)
  currentBrowser.setVisibility(visibility);
  }
 
-public boolean closeBrowser(Browser browser)
+ public void closeBrowser(Browser browser)
  {
  NullCheck.notNull(browser, "browser");
- final int pos = browsers.indexOf(browser);
- if (pos < 0)
- return false;
-browsers.remove(this);
-//FIXME:choosing another current browser
-return true;
+ Utils.runInFxThreadSync(()->{
+ final int pos = browsers.indexOf(browser);
+ if (pos < 0)
+ return;
+ browsers.remove(this);
+ app.remove(browser.webView);
+ //FIXME:choosing another current browser
+ });
  }
 
  void registerCanvas(ResizableCanvas canvas)

diff --git a/src/main/java/org/luwrain/interaction/javafx/browser/Base.java b/src/main/java/org/luwrain/interaction/javafx/browser/Base.java
@@ -114,7 +114,7 @@ private void runInjection()
  }
  }
 
-protected void rescanDom()
+protected void update()
  {
  InvalidThreadException.checkThread("BrowserBase.rescanDom()"); 
  try {

diff --git a/src/main/java/org/luwrain/interaction/javafx/browser/Browser.java b/src/main/java/org/luwrain/interaction/javafx/browser/Browser.java
@@ -38,19 +38,19 @@ public Browser(JavaFxInteraction interaction, BrowserEvents events) throws IOExc
  this.interaction = interaction;
  }
 
- @Override public void rescanDom()
+ @Override public void update()
  {
- Utils.runInFxThreadSync(()->super.rescanDom());
+ Utils.runInFxThreadSync(()->super.update());
  }
 
  @Override public void close()
  {
- Utils.runInFxThreadSync(()->interaction.closeBrowser(this));
+ interaction.closeBrowser(this);
  }
 
- @Override public void setVisibility(boolean enable)
+ @Override public void setVisibility(boolean visible)
  {
- if(enable)
+ if(visible)
  {
  interaction.enableGraphicalMode();
  Utils.runInFxThreadSync(()->{
@@ -132,7 +132,7 @@ public Browser(JavaFxInteraction interaction, BrowserEvents events) throws IOExc
  return new IteratorImpl(this);
  }
 
- @Override public int numElements()
+ @Override public int getElementCount()
  {
  if (domScanRes == null)
  return 0;