Merge branch 'master' into master-266

akoch-yatta · web-flow · commit 49e0f950ec4c · 2025-04-02T13:52:39.000+02:00
diff --git a/binaries/pom.xml b/binaries/pom.xml
@@ -51,7 +51,7 @@
 					<dependency>
 						<groupId>org.apache.maven.surefire</groupId>
 						<artifactId>surefire-junit-platform</artifactId>
-						<version>3.2.5</version>
+						<version>${surefire.version}</version>
 					</dependency>
 				</dependencies>
 				<executions>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/Edge.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/Edge.java
@@ -405,13 +405,14 @@ private ICoreWebView2_13 initializeWebView_13(ICoreWebView2 webView) {
 	}
 
 	private WebViewWrapper getWebViewWrapper(boolean waitForPendingWebviewTasksToFinish) {
+		WebViewWrapper webViewWrapper = getWebViewWrapper();
 		if(waitForPendingWebviewTasksToFinish) {
 			processOSMessagesUntil(lastWebViewTask::isDone, exception -> {
 				lastWebViewTask.completeExceptionally(exception);
 				throw exception;
 			}, browser.getDisplay());
 		}
-		return webViewWrapperFuture.join();
+		return webViewWrapper;
 	}
 
 	private WebViewWrapper getWebViewWrapper() {

Original file line number	Diff line number	Diff line change
`@@ -405,13 +405,14 @@ private ICoreWebView2_13 initializeWebView_13(ICoreWebView2 webView) {`
`405`	`405`	`}`
`406`	`406`
`407`	`407`	`private WebViewWrapper getWebViewWrapper(boolean waitForPendingWebviewTasksToFinish) {`
	`408`	`+ WebViewWrapper webViewWrapper = getWebViewWrapper();`
`408`	`409`	`if(waitForPendingWebviewTasksToFinish) {`
`409`	`410`	`processOSMessagesUntil(lastWebViewTask::isDone, exception -> {`
`410`	`411`	`lastWebViewTask.completeExceptionally(exception);`
`411`	`412`	`throw exception;`
`412`	`413`	`}, browser.getDisplay());`
`413`	`414`	`}`
`414`		`- return webViewWrapperFuture.join();`
	`415`	`+ return webViewWrapper;`
`415`	`416`	`}`
`416`	`417`
`417`	`418`	`private WebViewWrapper getWebViewWrapper() {`