Update as CefSharp.Puppeteer was renamed to CefSharp.Dom

amaitland · amaitland · commit fcc68c33ef35 · 2022-08-15T14:58:42.000+10:00
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "CefSharp.Puppeteer"]
-	path = CefSharp.Puppeteer
-	url = https://github.com/cefsharp/Puppeteer.git
+[submodule "CefSharp.Dom"]
+	path = CefSharp.Dom
+	url = https://github.com/cefsharp/CefSharp.Dom.git
diff --git a/CefSharp.Dom b/CefSharp.Dom
@@ -0,0 +1 @@
+Subproject commit 97f39597a889c61b3177e70dd1aef832f2c8065b
diff --git a/CefSharp.OutOfProcess.Core/CefSharp.OutOfProcess.Core.csproj b/CefSharp.OutOfProcess.Core/CefSharp.OutOfProcess.Core.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="StreamJsonRpc" Version="2.11.35" />
     <ProjectReference Include="..\CefSharp.OutOfProcess.Interface\CefSharp.OutOfProcess.Interface.csproj" />
 
-    <ProjectReference Include="..\CefSharp.Puppeteer\lib\PuppeteerSharp\CefSharp.DevTools.OutOfProcess.csproj" />
+    <ProjectReference Include="..\CefSharp.Dom\lib\PuppeteerSharp\CefSharp.Dom.OutOfProcess.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/CefSharp.OutOfProcess.Core/IChromiumWebBrowser.cs b/CefSharp.OutOfProcess.Core/IChromiumWebBrowser.cs
@@ -1,4 +1,4 @@
-﻿using CefSharp.Puppeteer;
+﻿using CefSharp.Dom;
 using System;
 using System.Threading.Tasks;
 
diff --git a/CefSharp.OutOfProcess.Core/OutOfProcessConnectionTransport.cs b/CefSharp.OutOfProcess.Core/OutOfProcessConnectionTransport.cs
@@ -1,4 +1,4 @@
-﻿using CefSharp.Puppeteer.Transport;
+﻿using CefSharp.Dom.Transport;
 using System;
 using System.Threading.Tasks;
 
@@ -11,6 +11,7 @@ public class OutOfProcessConnectionTransport : IConnectionTransport
         public OutOfProcessHost OutOfProcessHost { get; }
 
         public event EventHandler<MessageReceivedEventArgs> MessageReceived;
+        public event EventHandler<MessageErrorEventArgs> MessageError;
 
         public OutOfProcessConnectionTransport(int browserId, OutOfProcessHost outOfProcessHost)
         {
diff --git a/CefSharp.OutOfProcess.WinForms.Example/BrowserTabUserControl.cs b/CefSharp.OutOfProcess.WinForms.Example/BrowserTabUserControl.cs
@@ -39,7 +39,7 @@ public BrowserTabUserControl(OutOfProcessHost outOfProcessHost, string url)
             outputLabel.Text = version;
         }
 
-        private async void OnBrowserNetworkRequestFailed(object sender, Puppeteer.RequestEventArgs args)
+        private async void OnBrowserNetworkRequestFailed(object sender, Dom.RequestEventArgs args)
         {
             var request = args.Request;
 
@@ -66,7 +66,7 @@ protected override void Dispose(bool disposing)
             base.Dispose(disposing);
         }
 
-        private void OnBrowserConsoleMessage(object sender, Puppeteer.ConsoleEventArgs args)
+        private void OnBrowserConsoleMessage(object sender, Dom.ConsoleEventArgs args)
         {
             DisplayOutput(string.Format("Line: {0}, Source: {1}, Message: {2}", args.Message.Location.LineNumber, args.Message.Location.URL, args.Message.Text));
         }
diff --git a/CefSharp.OutOfProcess.WinForms/CefSharp.OutOfProcess.WinForms.csproj b/CefSharp.OutOfProcess.WinForms/CefSharp.OutOfProcess.WinForms.csproj
@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\CefSharp.OutOfProcess.Core\CefSharp.OutOfProcess.Core.csproj" />
-    <ProjectReference Include="..\CefSharp.Puppeteer\lib\PuppeteerSharp\CefSharp.DevTools.OutOfProcess.csproj" />
+    <ProjectReference Include="..\CefSharp.Dom\lib\PuppeteerSharp\CefSharp.Dom.OutOfProcess.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/CefSharp.OutOfProcess.WinForms/ChromiumWebBrowser.cs b/CefSharp.OutOfProcess.WinForms/ChromiumWebBrowser.cs
@@ -3,7 +3,7 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using CefSharp.OutOfProcess.Internal;
-using CefSharp.Puppeteer;
+using CefSharp.Dom;
 using PInvoke;
 
 namespace CefSharp.OutOfProcess.WinForms
@@ -33,7 +33,7 @@ public class ChromiumWebBrowser : Control, IChromiumWebBrowserInternal
         /// <inheritdoc/>
         public event EventHandler<PageErrorEventArgs> RuntimeExceptionThrown;
         /// <inheritdoc/>
-        public event EventHandler<Puppeteer.PopupEventArgs> Popup;
+        public event EventHandler<Dom.PopupEventArgs> Popup;
         /// <inheritdoc/>
         public event EventHandler<RequestEventArgs> NetworkRequest;
         /// <inheritdoc/>
@@ -133,7 +133,7 @@ protected override void OnHandleCreated(EventArgs e)
             _devToolsContextConnectionTransport = new OutOfProcessConnectionTransport(_id, _host);
 
             var connection = DevToolsConnection.Attach(_devToolsContextConnectionTransport);
-            _devToolsContext = Puppeteer.DevToolsContext.CreateForOutOfProcess(connection);
+            _devToolsContext = Dom.DevToolsContext.CreateForOutOfProcess(connection);
         }
 
         /// <inheritdoc/>
diff --git a/CefSharp.OutOfProcess.Wpf.HwndHost/CefSharp.OutOfProcess.Wpf.HwndHost.csproj b/CefSharp.OutOfProcess.Wpf.HwndHost/CefSharp.OutOfProcess.Wpf.HwndHost.csproj
@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\CefSharp.OutOfProcess.Core\CefSharp.OutOfProcess.Core.csproj" />
-    <ProjectReference Include="..\CefSharp.Puppeteer\lib\PuppeteerSharp\CefSharp.DevTools.OutOfProcess.csproj" />
+    <ProjectReference Include="..\CefSharp.Dom\lib\PuppeteerSharp\CefSharp.Dom.OutOfProcess.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/CefSharp.OutOfProcess.Wpf.HwndHost/ChromiumWebBrowser.cs b/CefSharp.OutOfProcess.Wpf.HwndHost/ChromiumWebBrowser.cs
@@ -5,7 +5,7 @@
 using CefSharp.OutOfProcess.Internal;
 using CefSharp.OutOfProcess.WinForms;
 using CefSharp.OutOfProcess.Wpf.HwndHost.Internals;
-using CefSharp.Puppeteer;
+using CefSharp.Dom;
 using PInvoke;
 using System;
 using System.Runtime.CompilerServices;
@@ -16,6 +16,7 @@
 using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Threading;
+using Window = System.Windows.Window;
 
 namespace CefSharp.OutOfProcess.Wpf.HwndHost
 {
@@ -165,7 +166,7 @@ public bool IsDisposed
         /// <inheritdoc/>
         public event EventHandler<PageErrorEventArgs> RuntimeExceptionThrown;
         /// <inheritdoc/>
-        public event EventHandler<Puppeteer.PopupEventArgs> Popup;
+        public event EventHandler<Dom.PopupEventArgs> Popup;
         /// <inheritdoc/>
         public event EventHandler<RequestEventArgs> NetworkRequest;
         /// <inheritdoc/>
@@ -496,7 +497,7 @@ protected override HandleRef BuildWindowCore(HandleRef hwndParent)
             _devToolsContextConnectionTransport = new OutOfProcessConnectionTransport(_id, _host);
 
             var connection = DevToolsConnection.Attach(_devToolsContextConnectionTransport);
-            _devToolsContext = Puppeteer.DevToolsContext.CreateForOutOfProcess(connection);
+            _devToolsContext = Dom.DevToolsContext.CreateForOutOfProcess(connection);
 
             return new HandleRef(null, _hwndHost);
         }
diff --git a/CefSharp.OutOfProcess.sln b/CefSharp.OutOfProcess.sln
@@ -11,14 +11,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CefSharp.OutOfProcess.WinFo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CefSharp.OutOfProcess.Core", "CefSharp.OutOfProcess.Core\CefSharp.OutOfProcess.Core.csproj", "{6ED4E6BF-F43A-429C-87FD-E66203EEC348}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CefSharp.DevTools.OutOfProcess", "CefSharp.Puppeteer\lib\PuppeteerSharp\CefSharp.DevTools.OutOfProcess.csproj", "{821ED4FE-5661-45D8-9523-44BDFB9B5DB6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CefSharp.OutOfProcess.Interface", "CefSharp.OutOfProcess.Interface\CefSharp.OutOfProcess.Interface.csproj", "{D466B2AE-284B-430B-B707-F5D387724965}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CefSharp.OutOfProcess.Interface", "CefSharp.OutOfProcess.Interface\CefSharp.OutOfProcess.Interface.csproj", "{D466B2AE-284B-430B-B707-F5D387724965}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CefSharp.OutOfProcess.Wpf.HwndHost", "CefSharp.OutOfProcess.Wpf.HwndHost\CefSharp.OutOfProcess.Wpf.HwndHost.csproj", "{85605A77-9882-4595-96A1-089244BCCE24}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CefSharp.OutOfProcess.Wpf.HwndHost", "CefSharp.OutOfProcess.Wpf.HwndHost\CefSharp.OutOfProcess.Wpf.HwndHost.csproj", "{85605A77-9882-4595-96A1-089244BCCE24}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CefSharp.OutOfProcess.Wpf.HwndHost.Example", "CefSharp.OutOfProcess.Wpf.HwndHost.Example\CefSharp.OutOfProcess.Wpf.HwndHost.Example.csproj", "{329D005F-3E63-4D0B-A86F-15CDD9F9AF2E}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CefSharp.Dom.OutOfProcess", "CefSharp.Dom\lib\PuppeteerSharp\CefSharp.Dom.OutOfProcess.csproj", "{7D39CC02-FB02-4F03-B329-E5DB567EC354}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -41,10 +41,6 @@ Global
 		{6ED4E6BF-F43A-429C-87FD-E66203EEC348}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6ED4E6BF-F43A-429C-87FD-E66203EEC348}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6ED4E6BF-F43A-429C-87FD-E66203EEC348}.Release|Any CPU.Build.0 = Release|Any CPU
-		{821ED4FE-5661-45D8-9523-44BDFB9B5DB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{821ED4FE-5661-45D8-9523-44BDFB9B5DB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{821ED4FE-5661-45D8-9523-44BDFB9B5DB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{821ED4FE-5661-45D8-9523-44BDFB9B5DB6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D466B2AE-284B-430B-B707-F5D387724965}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D466B2AE-284B-430B-B707-F5D387724965}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D466B2AE-284B-430B-B707-F5D387724965}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -57,6 +53,10 @@ Global
 		{329D005F-3E63-4D0B-A86F-15CDD9F9AF2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{329D005F-3E63-4D0B-A86F-15CDD9F9AF2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{329D005F-3E63-4D0B-A86F-15CDD9F9AF2E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7D39CC02-FB02-4F03-B329-E5DB567EC354}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D39CC02-FB02-4F03-B329-E5DB567EC354}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D39CC02-FB02-4F03-B329-E5DB567EC354}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7D39CC02-FB02-4F03-B329-E5DB567EC354}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/CefSharp.Puppeteer b/CefSharp.Puppeteer

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using CefSharp.Puppeteer;`
	`1`	`+using CefSharp.Dom;`
`2`	`2`	`using System;`
`3`	`3`	`using System.Threading.Tasks;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public BrowserTabUserControl(OutOfProcessHost outOfProcessHost, string url)`
`39`	`39`	`outputLabel.Text = version;`
`40`	`40`	`}`
`41`	`41`
`42`		`- private async void OnBrowserNetworkRequestFailed(object sender, Puppeteer.RequestEventArgs args)`
	`42`	`+ private async void OnBrowserNetworkRequestFailed(object sender, Dom.RequestEventArgs args)`
`43`	`43`	`{`
`44`	`44`	`var request = args.Request;`
`45`	`45`
`@@ -66,7 +66,7 @@ protected override void Dispose(bool disposing)`
`66`	`66`	`base.Dispose(disposing);`
`67`	`67`	`}`
`68`	`68`
`69`		`- private void OnBrowserConsoleMessage(object sender, Puppeteer.ConsoleEventArgs args)`
	`69`	`+ private void OnBrowserConsoleMessage(object sender, Dom.ConsoleEventArgs args)`
`70`	`70`	`{`
`71`	`71`	`DisplayOutput(string.Format("Line: {0}, Source: {1}, Message: {2}", args.Message.Location.LineNumber, args.Message.Location.URL, args.Message.Text));`
`72`	`72`	`}`