next try on postponedActions

HtmlUnit · Feb 25, 2025 · 34ef05a · 34ef05a
1 parent 29d91b1
commit 34ef05a
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 11 deletions.
diff --git a/src/main/java/org/htmlunit/html/DomElement.java b/src/main/java/org/htmlunit/html/DomElement.java
@@ -1041,7 +1041,7 @@ public <P extends Page> P click(final boolean shiftKey, final boolean ctrlKey, f
             AbstractJavaScriptEngine.PostponedActionsBlocker blocker = null;
             final AbstractJavaScriptEngine<?> jsEngine = webClient.getJavaScriptEngine();
             if (webClient.isJavaScriptEnabled()) {
-                blocker = jsEngine.blockPostponedActions();
+                blocker = jsEngine.blockPostponedActions(page);
             }
             try {
                 if (handleFocus) {

diff --git a/src/main/java/org/htmlunit/javascript/AbstractJavaScriptEngine.java b/src/main/java/org/htmlunit/javascript/AbstractJavaScriptEngine.java
@@ -108,9 +108,10 @@ public interface AbstractJavaScriptEngine<SCRIPT> {
      * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br>
      * Indicates that no postponed action should be executed.
      *
+     * @param page only block actions for this page
      * @return {@link PostponedActionsBlocker}
      */
-    PostponedActionsBlocker blockPostponedActions();
+    PostponedActionsBlocker blockPostponedActions(Page page);
 
     /**
      * Compiles the specified JavaScript code in the context of a given scope.
@@ -159,6 +160,7 @@ Object execute(HtmlPage page,
      * Helper for blocking the execution of postponed actions for some time.
      */
     interface PostponedActionsBlocker {
+        boolean blocks(PostponedAction postponedAction);
         void release();
     }
 }
diff --git a/src/main/java/org/htmlunit/javascript/JavaScriptEngine.java b/src/main/java/org/htmlunit/javascript/JavaScriptEngine.java
@@ -945,7 +945,13 @@ private void doProcessPostponedActions() {
 
                     // verify that the page that registered this PostponedAction is still alive
                     if (action.isStillAlive()) {
-                        action.execute();
+                        if (postponedActionsBlocker_ == null
+                                || !postponedActionsBlocker_.blocks(action)) {
+                            action.execute();
+                        }
+                        else {
+                            addPostponedAction(action);
+                        }
                     }
                 }
             }
@@ -1033,13 +1039,13 @@ protected void handleJavaScriptTimeoutError(final HtmlPage page, final TimeoutEr
     * {@inheritDoc}
     */
     @Override
-    public PostponedActionsBlocker blockPostponedActions() {
+    public PostponedActionsBlocker blockPostponedActions(final Page page) {
         if (postponedActionsBlocker_ == null) {
-            postponedActionsBlocker_ = new RootPostponedActionsBlocker(this);
+            postponedActionsBlocker_ = new RootPostponedActionsBlocker(this, page);
             return postponedActionsBlocker_;
         }
 
-        return new ChildPostponedActionsBlocker();
+        return new ChildPostponedActionsBlocker(postponedActionsBlocker_);
     }
 
     /**
@@ -1048,9 +1054,7 @@ public PostponedActionsBlocker blockPostponedActions() {
      */
     @Override
     public void processPostponedActions() {
-        if (postponedActionsBlocker_ == null) {
-            doProcessPostponedActions();
-        }
+        doProcessPostponedActions();
     }
 
     /**
@@ -1396,9 +1400,16 @@ public static String evaluateProxyAutoConfig(final BrowserVersion browserVersion
      */
     private final class RootPostponedActionsBlocker implements PostponedActionsBlocker {
         private final JavaScriptEngine jsEngine_;
+        private final Page owningPage_;
 
-        private RootPostponedActionsBlocker(final JavaScriptEngine jsEngine) {
+        private RootPostponedActionsBlocker(final JavaScriptEngine jsEngine, final Page owningPage) {
             jsEngine_ = jsEngine;
+            owningPage_ = owningPage;
+        }
+
+        @Override
+        public boolean blocks(final PostponedAction postponedAction) {
+            return owningPage_ == postponedAction.getOwningPage();
         }
 
         @Override
@@ -1412,9 +1423,16 @@ public void release() {
      * {@link PostponedActionsBlocker} - noop blocker.
      */
     private final class ChildPostponedActionsBlocker implements PostponedActionsBlocker {
+        private final RootPostponedActionsBlocker root_;
 
-        private ChildPostponedActionsBlocker() {
+        private ChildPostponedActionsBlocker(final RootPostponedActionsBlocker root) {
             super();
+            root_ = root;
+        }
+
+        @Override
+        public boolean blocks(final PostponedAction postponedAction) {
+            return root_.blocks(postponedAction);
         }
 
         @Override