Merge branch 'master' into feature/headless

Voltstro · Voltstro · commit f5052ec55aa5 · 2025-02-23T15:06:18.000+10:00
diff --git a/src/ThirdParty/CefGlue b/src/ThirdParty/CefGlue
@@ -1 +1 @@
-Subproject commit 82b5b5e34a7b2b6dadf638c1ef835b231ef4b5a0
+Subproject commit 26390789852e7316b7e9decfb7fa2f1eaa4714ef
diff --git a/src/UnityWebBrowser.Engine.Cef/Shared/Browser/UwbCefLifespanHandler.cs b/src/UnityWebBrowser.Engine.Cef/Shared/Browser/UwbCefLifespanHandler.cs
@@ -46,7 +46,7 @@ protected override void OnAfterCreated(CefBrowser browser)
         AfterCreated?.Invoke(browser);
     }
 
-    protected override bool OnBeforePopup(CefBrowser browser, CefFrame frame, string targetUrl,
+    protected override bool OnBeforePopup(CefBrowser browser, CefFrame frame, int popupId, string targetUrl,
         string targetFrameName,
         CefWindowOpenDisposition targetDisposition, bool userGesture, CefPopupFeatures popupFeatures,
         CefWindowInfo windowInfo, ref CefClient client, CefBrowserSettings settings,
diff --git a/src/UnityWebBrowser.Engine.Cef/version.json b/src/UnityWebBrowser.Engine.Cef/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "2.2.5+130116",
+  "version": "2.2.5+13342",
   "publicReleaseRefSpec": [
     "^refs/heads/master$"
   ],

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ protected override void OnAfterCreated(CefBrowser browser)`
`46`	`46`	`AfterCreated?.Invoke(browser);`
`47`	`47`	`}`
`48`	`48`
`49`		`- protected override bool OnBeforePopup(CefBrowser browser, CefFrame frame, string targetUrl,`
	`49`	`+ protected override bool OnBeforePopup(CefBrowser browser, CefFrame frame, int popupId, string targetUrl,`
`50`	`50`	`string targetFrameName,`
`51`	`51`	`CefWindowOpenDisposition targetDisposition, bool userGesture, CefPopupFeatures popupFeatures,`
`52`	`52`	`CefWindowInfo windowInfo, ref CefClient client, CefBrowserSettings settings,`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",`
`3`		`- "version": "2.2.5+130116",`
	`3`	`+ "version": "2.2.5+13342",`
`4`	`4`	`"publicReleaseRefSpec": [`
`5`	`5`	`"^refs/heads/master$"`
`6`	`6`	`],`