MORPH
SIGN IN SIGN UP
cefsharp / CefSharp UNCLAIMED

.NET (WPF and Windows Forms) bindings for the Chromium Embedded Framework

0 0 0 C#
Normal View History Raw
Maintenance - Fixed formatting, file encoding, and copyright year (#2504) * Applied formatting * Fixed file encoding + Updated copyright year * Updated License * Fixed more file encoding * Copyright notice now shows the year the file was created
2018-09-10 02:41:13 +02:00
// Copyright © 2010 The CefSharp Authors. All rights reserved.
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
//
// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
Reorder usings - remove redundant paths and group cef imports at the top
2015-06-05 15:46:11 +10:00
#include "Stdafx.h"
RequestContext.h - Split method implementation out into RequestContext.cpp Also fix up some other includes that were broken as a result. Still a lot more code cleanup to do.
2019-01-10 07:07:28 +10:00
#include "ClientAdapter.h"
* Move unmanged objects into finalizer and call finalizer from Dispose. * Remove DisposableResources from ManagedCefBrowserAdapter * Improve disposing of CefRequestWrapper * Have callbacks dispose themselves. * Allow the Application exit handler shutdown CEF from the Winforms example application.
2015-06-13 10:32:15 -04:00
Fix up some of the vc++ include mess that we had going Cleanup using namespace statements as well
2015-09-29 15:14:18 +10:00
#include "include\cef_client.h"
#include "include\wrapper\cef_stream_resource_handler.h"
RequestContext.h - Split method implementation out into RequestContext.cpp Also fix up some other includes that were broken as a result. Still a lot more code cleanup to do.
2019-01-10 07:07:28 +10:00
#include "CefAuthCallbackWrapper.h"
#include "CefBeforeDownloadCallbackWrapper.h"
#include "CefCertificateCallbackWrapper.h"
Reorder usings - remove redundant paths and group cef imports at the top
2015-06-05 15:46:11 +10:00
#include "CefContextMenuParamsWrapper.h"
Rename callback wrappers to bring them inline with the new ones
2015-06-05 15:44:25 +10:00
#include "CefDownloadItemCallbackWrapper.h"
Refactor CefSharp.Core into CefSharp.Core.Runtime (#3311) * Net Core - Rename CefSharp.Core.dll to CefSharp.Core.Runtime.dll Partial rename, only Net Core, folder not renamed * Net Core - Rename CefSharp.Core.RefAssembly to CefSharp.Core.netcore Remove GenApi * Core - Rename CefDragDataWrapper to DragData Move into CefSharp.Core namespace * WinForms/WPF/OffScreen - Migrate from GitLink command line to Nuget package * Net Core - Refactor to have CefSharp.Core.dll contain only public Api * Net Core - Remove CefSharp.Core.RefAssembly * Net Core - Change CefSharp.Core.netcore output folder * Net Core - Restructure nuget packages * Net Core - Add Cefsharp.Core.Runtime.RefAssembly * Net Core - Hide CLI/C++ classes from intellisense Make sure users don't attempt to load them directly * Rename CefSharp.Core to CefSharp.Core.Runtime * Core - Restructure Net 4.5.2 packages to use CefSharp.Core.dll anycpu variant Attempt to load CefSharp.Core.Runtime at runtime rather than having to use msbuild to copy the correct version * Rename CefSharp.Core.netcore to CefSharp.Core * WPF/WinForms/OffScreen - Change from x86/64 to AnyCPU As they are all managed assemblies they can target AnyCPU. Includes CefSharp.dll * Convert RequestContextBuilder from C++ to C# Now part of the CefSharp.Core PublicApi * Update version number to 87.1.11 * Migrate more of the public Api to C# * Net Core - Basic restructure complete * Net Core - ModuleInitializer (Doesn't work yet) * Remove direct references to BrowserSettings * Net Core - ModuleInitializer load CefShar.Core.Runtime.dl * Net Core - Load libcef.dll via CLR Module initializer If no RID is specified then we can load libcef.dll using the module initializer * Add version to CefSharp.Core * Remove dependency on CefSharp.Core.Runtime Rewrite common targets * AnyCPU app.config transform Improve AnyCPU support * Improve Net Core 3 support Only delete CefSharp.Core.Runtime.dll when AnyCPU * Nuget - Add CefSharp.Core.Runtime reference when TargetFramework = NetCore * Fix Typos Based on #3306 * Net Core - Rename CefSharp.Core.Runtime RefAssembly source file * Net Full - Generate CefSharp.Core.Runtime Ref Assembly For now the powershell build script generates the .cs file based on a x86 release build.ps1 It's not possible to directly install GenApi as it requires a Sdk style project * Net Core - Old packages copy files to required folders * Test - Install newer .Net Compiler and set Lang Version to 7.3 * Net Core - Exclude Net 452 Runtime generated reference source * Core - Add Refactoring TODO * Ref Assembly - Generate source as part of build - Move ref assembly source generate into GenerateRefAssemblySource.ps1 - Call before project build Runs locally, see if Appveyor has a problem with the powershell script execution * Core - Add more factory methods to create instances of managed wrappers * Net Core - Make Initialzier properties internal Not quite sure what the public API should look like as yet, so making internal for now.
2020-12-16 10:47:34 +10:00
#include "DragData.h"
Rename callback wrappers to bring them inline with the new ones
2015-06-05 15:44:25 +10:00
#include "CefFileDialogCallbackWrapper.h"
RequestContext.h - Split method implementation out into RequestContext.cpp Also fix up some other includes that were broken as a result. Still a lot more code cleanup to do.
2019-01-10 07:07:28 +10:00
#include "CefFrameWrapper.h"
Reorder usings - remove redundant paths and group cef imports at the top
2015-06-05 15:46:11 +10:00
#include "CefJSDialogCallbackWrapper.h"
RequestContext.h - Split method implementation out into RequestContext.cpp Also fix up some other includes that were broken as a result. Still a lot more code cleanup to do.
2019-01-10 07:07:28 +10:00
#include "CefMenuModelWrapper.h"
Core - Rename CefSharp.Internals.CefRequestWrapper to CefSharp.Request - Made public - Added public constructor Related issue #1721
2019-11-23 14:27:27 +10:00
#include "Request.h"
Initial version 75 upgrade and NetworkService changes Compiles, that's about it at this point, there are major CEF breaking changes, and lots to be addressed. Browser Process (main process) - Removed IResourceHandlerFactory as it no longer fits with the structure that CEF provides - New IResourceRequestHandler interface added, not plumbed in yet - CefSettings - Add RootCachePath and ApplicationClientIdForFileScanning BrowserSubprocess (render process) - SendProcessMessage was moved from CefBrowser to CefFrame - OnBrowserCreated added extraInfo param The BrowserSubprocess changes for this upgrade should be complete
2019-06-11 12:29:57 +10:00
#include "CefResourceRequestHandlerAdapter.h"
Reorder usings - remove redundant paths and group cef imports at the top
2015-06-05 15:46:11 +10:00
#include "CefRequestCallbackWrapper.h"
Add IContextMenuHandler.RunContextMenu
2015-10-12 08:03:50 +10:00
#include "CefRunContextMenuCallbackWrapper.h"
Core - Add support PermissonHandler https://bitbucket.org/chromiumembedded/cef/issues/3352/add-cefpermissionhandler-callback-for-the
2022-07-09 13:54:17 +10:00
#include "CefPermissionPromptCallbackWrapper.h"
RequestContext.h - Split method implementation out into RequestContext.cpp Also fix up some other includes that were broken as a result. Still a lot more code cleanup to do.
2019-01-10 07:07:28 +10:00
#include "CefSslInfoWrapper.h"
Core - Consistent C++ naming - Following the adapter/wrapper naming scheme - Moved classes to internals that aren't public facing Resolves #1005
2020-04-06 06:50:32 +10:00
#include "CefBrowserWrapper.h"
Core - Add support PermissonHandler https://bitbucket.org/chromiumembedded/cef/issues/3352/add-cefpermissionhandler-callback-for-the
2022-07-09 13:54:17 +10:00
#include "CefMediaAccessCallbackWrapper.h"
RequestContext.h - Split method implementation out into RequestContext.cpp Also fix up some other includes that were broken as a result. Still a lot more code cleanup to do.
2019-01-10 07:07:28 +10:00
#include "ManagedCefBrowserAdapter.h"
#include "Messaging\Messages.h"
#include "PopupFeatures.h"
For now simplify message handing - remove delegates Will look at implementing a managed class to handle/route messages later
2015-06-29 15:08:53 +10:00
#include "Serialization\Primitives.h"
#include "Serialization\V8Serialization.h"
normal bound objects transfered with cef ipc as well
2015-08-06 10:25:33 +02:00
#include "Serialization\JsObjectsSerialization.h"
added message to transmit async bound jsrootobject to render process
2015-07-13 16:35:22 +02:00
#include "Serialization\ObjectsSerialization.h"
RequestContext.h - Split method implementation out into RequestContext.cpp Also fix up some other includes that were broken as a result. Still a lot more code cleanup to do.
2019-01-10 07:07:28 +10:00
#include "TypeConversion.h"
#include "WindowInfo.h"
For now simplify message handing - remove delegates Will look at implementing a managed class to handle/route messages later
2015-06-29 15:08:53 +10:00
using namespace CefSharp::Internals::Messaging;
using namespace CefSharp::Internals::Serialization;
Add IRequestHandler.OnSelectClientCertificate (#1878) * wip create hooks for onSelectClientCertificate * create interface and wrapper for callback * get certificate from CefCertificateList, convert to X509Certificate2, add them to X509CertificateCollection and return this to ClientAdapter * code review changes. Certificate selection in wrapper requires recreation of certificate in iteration * added certificate dialog selection to WinFormsRequestHandler. Used VS untabify to remove all the tabs and replaced it with spaces * missed updating a summary on ISelectClientCertificateCallback * code review changes
2016-12-12 15:48:15 -08:00
using namespace System::Security::Cryptography::X509Certificates;
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
namespace CefSharp
{
namespace Internals
{
Keep a WeakReference to IBrowserAdapter instead of IBrowser and lookup the browser by it's Id for callbacks
2015-09-24 21:00:53 +10:00
IBrowser^ ClientAdapter::GetBrowserWrapper(int browserId)
Async JSB now working in popups Still have the issue of callbacks not working as expect, for some reason it can't find the context
2015-09-24 20:08:15 +10:00
{
Fix #1357 In GetBrowserWrapper check if _cefBrowser has a valid pointer Add ManagedCefBrowserAdapter IsDisposed check in JavascriptCallbackProxy::GetBrowser Add CanExecute to check if underlying resources are still available
2015-10-26 12:04:40 +10:00
if (_cefBrowser.get())
Async JSB now working in popups Still have the issue of callbacks not working as expect, for some reason it can't find the context
2015-09-24 20:08:15 +10:00
{
Fix #1357 In GetBrowserWrapper check if _cefBrowser has a valid pointer Add ManagedCefBrowserAdapter IsDisposed check in JavascriptCallbackProxy::GetBrowser Add CanExecute to check if underlying resources are still available
2015-10-26 12:04:40 +10:00
if (_cefBrowser->GetIdentifier() == browserId)
{
Store a reference to IBrowser in ClientAdapter rather than trying to access it through the BrowserAdapter
2016-01-12 14:11:49 +10:00
return _browser;
Fix #1357 In GetBrowserWrapper check if _cefBrowser has a valid pointer Add ManagedCefBrowserAdapter IsDisposed check in JavascriptCallbackProxy::GetBrowser Add CanExecute to check if underlying resources are still available
2015-10-26 12:04:40 +10:00
}
Async JSB now working in popups Still have the issue of callbacks not working as expect, for some reason it can't find the context
2015-09-24 20:08:15 +10:00
Core - IJavascriptCallback need additional null check in ClientAdapter::GetBrowserWrapper IJavascriptCallbacks that are finalized after the browser has been Disposed but before the IBrowserAdapter.IsDisposed is set might end up calling ClientAdapter::GetBrowserWrapper which attempts to access _popupBrowsers which has been set to null already.
2021-05-10 14:55:54 +10:00
//IJavascriptCallbacks that are finalized after the browser has been Disposed
//but before the IBrowserAdapter.IsDisposed is set might end up here
//attempting to access _popupBrowsers which has been set to null already.
auto popupBrowsers = _popupBrowsers;
if (Object::ReferenceEquals(popupBrowsers, nullptr))
{
return nullptr;
}
Store a reference to IBrowser in ClientAdapter rather than trying to access it through the BrowserAdapter
2016-01-12 14:11:49 +10:00
IBrowser^ popupBrowser;
Core - IJavascriptCallback need additional null check in ClientAdapter::GetBrowserWrapper IJavascriptCallbacks that are finalized after the browser has been Disposed but before the IBrowserAdapter.IsDisposed is set might end up calling ClientAdapter::GetBrowserWrapper which attempts to access _popupBrowsers which has been set to null already.
2021-05-10 14:55:54 +10:00
if (popupBrowsers->TryGetValue(browserId, popupBrowser))
Fix #1357 In GetBrowserWrapper check if _cefBrowser has a valid pointer Add ManagedCefBrowserAdapter IsDisposed check in JavascriptCallbackProxy::GetBrowser Add CanExecute to check if underlying resources are still available
2015-10-26 12:04:40 +10:00
{
Store a reference to IBrowser in ClientAdapter rather than trying to access it through the BrowserAdapter
2016-01-12 14:11:49 +10:00
return popupBrowser;
Fix #1357 In GetBrowserWrapper check if _cefBrowser has a valid pointer Add ManagedCefBrowserAdapter IsDisposed check in JavascriptCallbackProxy::GetBrowser Add CanExecute to check if underlying resources are still available
2015-10-26 12:04:40 +10:00
}
Async JSB now working in popups Still have the issue of callbacks not working as expect, for some reason it can't find the context
2015-09-24 20:08:15 +10:00
}
Keep a WeakReference to IBrowserAdapter instead of IBrowser and lookup the browser by it's Id for callbacks
2015-09-24 21:00:53 +10:00
return nullptr;
Async JSB now working in popups Still have the issue of callbacks not working as expect, for some reason it can't find the context
2015-09-24 20:08:15 +10:00
}
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
IBrowser^ ClientAdapter::GetBrowserWrapper(int browserId, bool isPopup)
Reduce the amount of code required to get the cached popup instance
2015-06-11 12:24:32 +10:00
{
Core - ClientAdapter improve HasParent checks (#4443) * Core - Improve ClientAdapter::GetBrowserWrapper logic Simplify the logic - For non popup return immediately (most common scenario) - Check for IBrowser instance for matching popup - Check for HasParent and return the browser Instance - Return nullptr if no matching IBrowser wrapper found * Core - ClientAdapter::OnFrameCreated called before OnAfterCreated - The very first call to ClientAdapter::OnFrameCreated happens before OnAfterCreated leaving us with a IBrowser instance that's null Create an IBrowser instance that's scoped to the method call * Core - ClientAdapter improve HasParent checks - HasParent check has now been replaced with IsHostedBrowser which has additional check to make sure the internal IWebBrowser.Set* methods are only called for a IBrowser instance that's directly associated with a ChromiumWebBrowser instance This resolves issues with DevTools being opened for a popup hosted in a ChromiumWebBrowser instance. Related discussion https://github.com/cefsharp/CefSharp/discussions/4438
2023-04-01 18:58:27 +10:00
if (!isPopup)
{
return _browser;
}
IBrowser^ popupBrowser;
if (_popupBrowsers->TryGetValue(browserId, popupBrowser))
{
return popupBrowser;
}
// For popups that were hosted using a ChromiumWebBrowser instance
Quick fix to make sure the correct IBrowser instance is used
2015-07-28 18:23:53 +10:00
if (_browserControl->HasParent)
{
Store a reference to IBrowser in ClientAdapter rather than trying to access it through the BrowserAdapter
2016-01-12 14:11:49 +10:00
return _browser;
Quick fix to make sure the correct IBrowser instance is used
2015-07-28 18:23:53 +10:00
}
Core - ClientAdapter improve HasParent checks (#4443) * Core - Improve ClientAdapter::GetBrowserWrapper logic Simplify the logic - For non popup return immediately (most common scenario) - Check for IBrowser instance for matching popup - Check for HasParent and return the browser Instance - Return nullptr if no matching IBrowser wrapper found * Core - ClientAdapter::OnFrameCreated called before OnAfterCreated - The very first call to ClientAdapter::OnFrameCreated happens before OnAfterCreated leaving us with a IBrowser instance that's null Create an IBrowser instance that's scoped to the method call * Core - ClientAdapter improve HasParent checks - HasParent check has now been replaced with IsHostedBrowser which has additional check to make sure the internal IWebBrowser.Set* methods are only called for a IBrowser instance that's directly associated with a ChromiumWebBrowser instance This resolves issues with DevTools being opened for a popup hosted in a ChromiumWebBrowser instance. Related discussion https://github.com/cefsharp/CefSharp/discussions/4438
2023-04-01 18:58:27 +10:00
return nullptr;
}
// Is a main browser if isPopuo == false or the IBrowser instance is directly associated
// with the ChromiumWebBrowser instance. Should be true in cases
// where ChromiumWebBrowser is instanciated directly or
// when a popup is hosted in a ChromiumWebBrowser instance
// For popups hosted in ChromiumWebBrowser instances it's important
// that DevTools popups return false;
bool ClientAdapter::IsMainBrowser(bool isPopup, int browserId)
{
// Main browser is always true
if (!isPopup)
Reduce the amount of code required to get the cached popup instance
2015-06-11 12:24:32 +10:00
{
Core - ClientAdapter improve HasParent checks (#4443) * Core - Improve ClientAdapter::GetBrowserWrapper logic Simplify the logic - For non popup return immediately (most common scenario) - Check for IBrowser instance for matching popup - Check for HasParent and return the browser Instance - Return nullptr if no matching IBrowser wrapper found * Core - ClientAdapter::OnFrameCreated called before OnAfterCreated - The very first call to ClientAdapter::OnFrameCreated happens before OnAfterCreated leaving us with a IBrowser instance that's null Create an IBrowser instance that's scoped to the method call * Core - ClientAdapter improve HasParent checks - HasParent check has now been replaced with IsHostedBrowser which has additional check to make sure the internal IWebBrowser.Set* methods are only called for a IBrowser instance that's directly associated with a ChromiumWebBrowser instance This resolves issues with DevTools being opened for a popup hosted in a ChromiumWebBrowser instance. Related discussion https://github.com/cefsharp/CefSharp/discussions/4438
2023-04-01 18:58:27 +10:00
return true;
}
Few more tweaks to simplify getting the browser instance. Still need to move the wrapper out from ManagedCefBrowserAdapter and into ClientAdapter for the main CefBrowserWrapper
2015-06-11 13:33:35 +10:00
Core - ClientAdapter improve HasParent checks (#4443) * Core - Improve ClientAdapter::GetBrowserWrapper logic Simplify the logic - For non popup return immediately (most common scenario) - Check for IBrowser instance for matching popup - Check for HasParent and return the browser Instance - Return nullptr if no matching IBrowser wrapper found * Core - ClientAdapter::OnFrameCreated called before OnAfterCreated - The very first call to ClientAdapter::OnFrameCreated happens before OnAfterCreated leaving us with a IBrowser instance that's null Create an IBrowser instance that's scoped to the method call * Core - ClientAdapter improve HasParent checks - HasParent check has now been replaced with IsHostedBrowser which has additional check to make sure the internal IWebBrowser.Set* methods are only called for a IBrowser instance that's directly associated with a ChromiumWebBrowser instance This resolves issues with DevTools being opened for a popup hosted in a ChromiumWebBrowser instance. Related discussion https://github.com/cefsharp/CefSharp/discussions/4438
2023-04-01 18:58:27 +10:00
// If popup and HasParent == false then always false
if (!_browserControl->HasParent)
{
return false;
Few more tweaks to simplify getting the browser instance. Still need to move the wrapper out from ManagedCefBrowserAdapter and into ClientAdapter for the main CefBrowserWrapper
2015-06-11 13:33:35 +10:00
}
Reduce the amount of code required to get the cached popup instance
2015-06-11 12:24:32 +10:00
Core - ClientAdapter improve HasParent checks (#4443) * Core - Improve ClientAdapter::GetBrowserWrapper logic Simplify the logic - For non popup return immediately (most common scenario) - Check for IBrowser instance for matching popup - Check for HasParent and return the browser Instance - Return nullptr if no matching IBrowser wrapper found * Core - ClientAdapter::OnFrameCreated called before OnAfterCreated - The very first call to ClientAdapter::OnFrameCreated happens before OnAfterCreated leaving us with a IBrowser instance that's null Create an IBrowser instance that's scoped to the method call * Core - ClientAdapter improve HasParent checks - HasParent check has now been replaced with IsHostedBrowser which has additional check to make sure the internal IWebBrowser.Set* methods are only called for a IBrowser instance that's directly associated with a ChromiumWebBrowser instance This resolves issues with DevTools being opened for a popup hosted in a ChromiumWebBrowser instance. Related discussion https://github.com/cefsharp/CefSharp/discussions/4438
2023-04-01 18:58:27 +10:00
// This method is called from OnAfterCreated before _cefBrowser is set
// If the _cefBrowser reference is null then this should be a ChromiumWebBrowser
// hosted as a popup
if (!_cefBrowser.get())
{
return true;
}
// For popups hosted in ChromiumWebBrowser instance directly (non DevTools popup)
// then return true;
if (_cefBrowser->GetIdentifier() == browserId)
{
return true;
}
return false;
Reduce the amount of code required to get the cached popup instance
2015-06-11 12:24:32 +10:00
}
Close open popups (if any) when ManagedCefBrowserAdapter is disposed
2014-12-19 16:30:59 +10:00
void ClientAdapter::CloseAllPopups(bool forceClose)
{
More work on wrapping CefBrowser/CefFrame.
2015-05-17 17:41:44 -04:00
if (_popupBrowsers->Count > 0)
Close open popups (if any) when ManagedCefBrowserAdapter is disposed
2014-12-19 16:30:59 +10:00
{
More work on wrapping CefBrowser/CefFrame.
2015-05-17 17:41:44 -04:00
for each (IBrowser^ browser in _popupBrowsers->Values)
Close open popups (if any) when ManagedCefBrowserAdapter is disposed
2014-12-19 16:30:59 +10:00
{
Simplify CloseAllPopups - can now use the IBrowserHost interface rather than casting
2015-06-01 11:19:06 +10:00
browser->GetHost()->CloseBrowser(forceClose);
Use GetBrowserWrapper everywhere except popup creation/closing for all of ClientAdapter.cpp. This means that none of the callbacks need to own disposing the IBrowser^ instance.
2015-06-17 18:14:07 -04:00
// NOTE: We don't dispose the IBrowsers here
// because ->CloseBrowser() will invoke
// ->OnBeforeClose() for the browser.
// OnBeforeClose() disposes the IBrowser there.
Close open popups (if any) when ManagedCefBrowserAdapter is disposed
2014-12-19 16:30:59 +10:00
}
}
}
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
bool ClientAdapter::OnBeforePopup(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, const CefString& target_url,
Upgraded to use local 3.2357.1274 NuGet packages and fixed breaking changes
2015-07-21 15:16:25 +10:00
const CefString& target_frame_name, CefLifeSpanHandler::WindowOpenDisposition target_disposition, bool user_gesture,
const CefPopupFeatures& popupFeatures, CefWindowInfo& windowInfo,
Initial version 75 upgrade and NetworkService changes Compiles, that's about it at this point, there are major CEF breaking changes, and lots to be addressed. Browser Process (main process) - Removed IResourceHandlerFactory as it no longer fits with the structure that CEF provides - New IResourceRequestHandler interface added, not plumbed in yet - CefSettings - Add RootCachePath and ApplicationClientIdForFileScanning BrowserSubprocess (render process) - SendProcessMessage was moved from CefBrowser to CefFrame - OnBrowserCreated added extraInfo param The BrowserSubprocess changes for this upgrade should be complete
2019-06-11 12:29:57 +10:00
CefRefPtr<CefClient>& client, CefBrowserSettings& settings, CefRefPtr<CefDictionaryValue>& extraInfo, bool* no_javascript_access)
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
{
Start making the wrapper/callback naming consistent Change to using auto where possible
2015-06-11 11:21:55 +10:00
auto handler = _browserControl->LifeSpanHandler;
Maintenance - Fixed formatting, file encoding, and copyright year (#2504) * Applied formatting * Fixed file encoding + Updated copyright year * Updated License * Fixed more file encoding * Copyright notice now shows the year the file was created
2018-09-10 02:41:13 +02:00
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
if (handler == nullptr)
{
return false;
}
Merge branch 'cef/2272'
2015-07-28 17:17:12 +10:00
IWebBrowser^ newBrowser = nullptr;
Start making the wrapper/callback naming consistent Change to using auto where possible
2015-06-11 11:21:55 +10:00
bool createdWrapper = false;
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Start making the wrapper/callback naming consistent Change to using auto where possible
2015-06-11 11:21:55 +10:00
Remove IBrowserAdapter from Frame and Browser wrappers - now directly cast CefClient to ClientAdapter so can execute js
2015-06-29 14:03:10 +10:00
CefFrameWrapper frameWrapper(frame);
Add PopupFeatures and BrowserSettings to OnBeforePopup Update WinForms popup example - comment out experimental feature Had to add interfaces to allow for wrapping of the structures (BrowserSettings and PopupFeatures) Resolves #1586
2016-03-07 18:33:53 +10:00
PopupFeatures popupFeaturesWrapper(&popupFeatures);
BrowserSettings browserSettingsWrapper(&settings);
Rename CefWindowInfoWrapper.h to WindowInfo.h as it's not a public class that can be instantiated for use with ShowDevTools
2015-08-13 15:11:37 +10:00
WindowInfo windowInfoWrapper(&windowInfo);
Add CefWindowInfoWrapper
2015-07-01 13:53:17 +10:00
Use GetBrowserWrapper everywhere except popup creation/closing for all of ClientAdapter.cpp. This means that none of the callbacks need to own disposing the IBrowser^ instance.
2015-06-17 18:14:07 -04:00
auto result = handler->OnBeforePopup(
_browserControl, browserWrapper,
The changes continue...
2015-06-08 22:48:29 -04:00
%frameWrapper, StringUtils::ToClr(target_url),
Add targetFrameName param to OnBeforePopup
2015-07-07 12:28:29 +10:00
StringUtils::ToClr(target_frame_name),
Add target_disposition and user_gesture params to ILifeSpanHandler.OnBeforePopup
2015-07-28 11:14:06 +10:00
(CefSharp::WindowOpenDisposition)target_disposition,
Add PopupFeatures and BrowserSettings to OnBeforePopup Update WinForms popup example - comment out experimental feature Had to add interfaces to allow for wrapping of the structures (BrowserSettings and PopupFeatures) Resolves #1586
2016-03-07 18:33:53 +10:00
user_gesture, %popupFeaturesWrapper,
%windowInfoWrapper, %browserSettingsWrapper, *no_javascript_access, newBrowser);
Testing changes to OnPopup
2015-05-05 17:31:46 +01:00
Merge branch 'cef/2272' of https://github.com/jamespearce2006/CefSharp into cef/2272
2015-07-28 15:59:30 +10:00
if (newBrowser != nullptr)
Cleanup code formatting
2015-05-07 23:40:56 +01:00
{
OnBeforePopup - throw exception if newBrowser == _browserControl (should never be)
2017-03-10 11:59:05 +10:00
//newBrowser should never be set to _browserControl (I've seen user code where someone attepted to do this).
//So throw exception to make that perfectly clear.
if (Object::ReferenceEquals(_browserControl, newBrowser))
{
throw gcnew Exception("newBrowser should be a new instance of ChromiumWebBrowser or null.");
}
ClientAdapter::OnBeforePopup - throw exception if return true and newBrowser != null Hopefully this reduces the number of support requests
2018-09-15 19:46:54 +10:00
//newBrowser is not null and result is true, whilst the documentation clearly states returning true will
//cancel popup creation people keep expecting that newBrowser will do something which it won't
if (result == true)
{
throw gcnew Exception("returning true cancels popup creation, if you return true newBrowser should be set to null."
+ "Previously no exception was thrown in this instance, this exception has been added to reduce the number of"
+ " support requests from people returning true and setting newBrowser and expecting popups to work.");
}
Add IWebBrowserInternal.HasParent property so we know when there is a parent - OnAfterCreated is handled different for popup with a parent
2015-07-28 16:51:51 +10:00
auto newBrowserInternal = dynamic_cast<IWebBrowserInternal^>(newBrowser);
Testing changes to OnPopup
2015-05-05 17:31:46 +01:00
Simplify XAML example
2015-05-08 11:14:29 +01:00
if (newBrowserInternal != nullptr)
Cleanup code formatting
2015-05-07 23:40:56 +01:00
{
Remove CefWindowInfo from ClientAdapter::OnBeforePopup they will now need to be made in client code (This is now possible as IWindowInfo exposes all the relevant pieces). This will allow for a little more flexibility, specially on the WinForms front, it should be possible to create the control and then show the window later
2016-05-19 11:54:32 +10:00
//This should already be set using the SetAsPopup extension, just making doubly sure
Add IWebBrowserInternal.HasParent property so we know when there is a parent - OnAfterCreated is handled different for popup with a parent
2015-07-28 16:51:51 +10:00
newBrowserInternal->HasParent = true;
auto browserAdapter = dynamic_cast<ManagedCefBrowserAdapter^>(newBrowserInternal->BrowserAdapter);
Simplify XAML example
2015-05-08 11:14:29 +01:00
if (browserAdapter != nullptr)
{
client = browserAdapter->GetClientAdapter().get();
}
}
Cleanup code formatting
2015-05-07 23:40:56 +01:00
}
Testing changes to OnPopup
2015-05-05 17:31:46 +01:00
More work on wrapping CefBrowser/CefFrame.
2015-05-17 17:41:44 -04:00
return result;
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
}
void ClientAdapter::OnAfterCreated(CefRefPtr<CefBrowser> browser)
{
Core - BrowserRefCount add some basic logging Logs some basic information so we can see what type of ChromiumWebBrowser hasn't been closed within as part of the xUnit tests. * Meant for internal use and might be subject to change.
2022-05-31 15:43:34 +10:00
BrowserRefCounter::Instance->Increment(_browserControl->GetType());
Core - Add Cef.WaitForBrowsersToClose helper function - Add BrowserRefCounter to increment/decrement CefBrowser instance creation - Add Cef.WaitForBrowsersToClose to dispose of all browser instances and call WaitForBrowsersToClose Before calling CefShutdown it's important that CEF has finished closing/disposing of all the CefBrowser instances. If you call CefShutdown before this has finished then you can get the error "Check failed: !IsCefShutdown(). Object reference incorrectly held at CefShutdown". This is more a problem when using MultiThreadedMessageLoop where CEF close/dispose happens on a different thread. Calling ChromiumWebBrowser.Dispose will start to free the resources, CEF internally executes code on it's own thread. #3047
2020-02-12 16:32:33 +10:00
Core - Consistent C++ naming - Following the adapter/wrapper naming scheme - Moved classes to internals that aren't public facing Resolves #1005
2020-04-06 06:50:32 +10:00
auto browserWrapper = gcnew CefBrowserWrapper(browser);
Instead of passing in the BrowserId on OnAfterBrowserCreated pass in the IBrowser
2016-01-12 13:33:35 +10:00
Core - ClientAdapter improve HasParent checks (#4443) * Core - Improve ClientAdapter::GetBrowserWrapper logic Simplify the logic - For non popup return immediately (most common scenario) - Check for IBrowser instance for matching popup - Check for HasParent and return the browser Instance - Return nullptr if no matching IBrowser wrapper found * Core - ClientAdapter::OnFrameCreated called before OnAfterCreated - The very first call to ClientAdapter::OnFrameCreated happens before OnAfterCreated leaving us with a IBrowser instance that's null Create an IBrowser instance that's scoped to the method call * Core - ClientAdapter improve HasParent checks - HasParent check has now been replaced with IsHostedBrowser which has additional check to make sure the internal IWebBrowser.Set* methods are only called for a IBrowser instance that's directly associated with a ChromiumWebBrowser instance This resolves issues with DevTools being opened for a popup hosted in a ChromiumWebBrowser instance. Related discussion https://github.com/cefsharp/CefSharp/discussions/4438
2023-04-01 18:58:27 +10:00
if (IsMainBrowser(browser->IsPopup(), browser->GetIdentifier()))
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
{
_browserHwnd = browser->GetHost()->GetWindowHandle();
_cefBrowser = browser;
Store a reference to IBrowser in ClientAdapter rather than trying to access it through the BrowserAdapter
2016-01-12 14:11:49 +10:00
_browser = browserWrapper;
Maintenance - Fixed formatting, file encoding, and copyright year (#2504) * Applied formatting * Fixed file encoding + Updated copyright year * Updated License * Fixed more file encoding * Copyright notice now shows the year the file was created
2018-09-10 02:41:13 +02:00
Change to Object::ReferenceEquals for gcroot nullptr comparison - seemed a little nicer than a static_cast Use direct cast of CefErrorCode
2015-07-07 15:20:27 +10:00
if (!Object::ReferenceEquals(_browserAdapter, nullptr))
Fixed the creation of the Javascript proxy client to happen at the right time, i.e. when a new browser is created. That should be massively more efficient in terms of speed than connecting to the service on every JS call. :)
2014-04-04 20:32:15 +02:00
{
Instead of passing in the BrowserId on OnAfterBrowserCreated pass in the IBrowser
2016-01-12 13:33:35 +10:00
_browserAdapter->OnAfterBrowserCreated(browserWrapper);
Fixed the creation of the Javascript proxy client to happen at the right time, i.e. when a new browser is created. That should be massively more efficient in terms of speed than connecting to the service on every JS call. :)
2014-04-04 20:32:15 +02:00
}
OnAfterCreated and OnBeforeClose are now simplified to reflect the removal of IPopupHandler
2015-08-17 11:58:52 +10:00
}
Core - ClientAdapter improve HasParent checks (#4443) * Core - Improve ClientAdapter::GetBrowserWrapper logic Simplify the logic - For non popup return immediately (most common scenario) - Check for IBrowser instance for matching popup - Check for HasParent and return the browser Instance - Return nullptr if no matching IBrowser wrapper found * Core - ClientAdapter::OnFrameCreated called before OnAfterCreated - The very first call to ClientAdapter::OnFrameCreated happens before OnAfterCreated leaving us with a IBrowser instance that's null Create an IBrowser instance that's scoped to the method call * Core - ClientAdapter improve HasParent checks - HasParent check has now been replaced with IsHostedBrowser which has additional check to make sure the internal IWebBrowser.Set* methods are only called for a IBrowser instance that's directly associated with a ChromiumWebBrowser instance This resolves issues with DevTools being opened for a popup hosted in a ChromiumWebBrowser instance. Related discussion https://github.com/cefsharp/CefSharp/discussions/4438
2023-04-01 18:58:27 +10:00
else
{
// Add to the list of popup browsers.
_popupBrowsers->Add(browser->GetIdentifier(), browserWrapper);
}
Offscreen popup support
2015-05-07 18:32:14 +01:00
OnAfterCreated and OnBeforeClose are now simplified to reflect the removal of IPopupHandler
2015-08-17 11:58:52 +10:00
auto handler = _browserControl->LifeSpanHandler;
Offscreen popup support
2015-05-07 18:32:14 +01:00
OnAfterCreated and OnBeforeClose are now simplified to reflect the removal of IPopupHandler
2015-08-17 11:58:52 +10:00
if (handler != nullptr)
{
Core - ClientAdapter::OnAfterCreated pass in the newly created wrapper directly Minor code cleanup
2020-02-11 11:54:52 +10:00
handler->OnAfterCreated(_browserControl, browserWrapper);
Add IBrowser param to ILifeSpanHandler.OnAfterCreated
2015-07-28 17:19:50 +10:00
}
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
}
Add DoClose to ILifeSpanHandler
2015-08-17 13:46:28 +10:00
bool ClientAdapter::DoClose(CefRefPtr<CefBrowser> browser)
{
auto handler = _browserControl->LifeSpanHandler;
if (handler != nullptr)
{
Fixed NullReferenceException in DoClose (#1980) * Fixed NullReferenceException in DoClose
2017-03-30 23:29:32 +02:00
//By this point it's possible IBrowser references have been disposed
//Rather than attempting to rework the rather complex closing logic
//It's easier to pass in a new wrapper and dispose it straight away
Core - Consistent C++ naming - Following the adapter/wrapper naming scheme - Moved classes to internals that aren't public facing Resolves #1005
2020-04-06 06:50:32 +10:00
CefBrowserWrapper browserWrapper(browser);
Maintenance - Fixed formatting, file encoding, and copyright year (#2504) * Applied formatting * Fixed file encoding + Updated copyright year * Updated License * Fixed more file encoding * Copyright notice now shows the year the file was created
2018-09-10 02:41:13 +02:00
Fixed NullReferenceException in DoClose (#1980) * Fixed NullReferenceException in DoClose
2017-03-30 23:29:32 +02:00
return handler->DoClose(_browserControl, %browserWrapper);
Add DoClose to ILifeSpanHandler
2015-08-17 13:46:28 +10:00
}
return false;
}
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
void ClientAdapter::OnBeforeClose(CefRefPtr<CefBrowser> browser)
{
Move the LifeSpanHandler.OnBeforeClose call higher in the execution order Fixes #1228
2015-08-30 20:00:37 +10:00
auto handler = _browserControl->LifeSpanHandler;
if (handler != nullptr)
{
Update ClientAdapter::OnBeforeClose to use auto dispose method and improve the comment
2017-03-06 09:10:38 +10:00
//By this point it's possible IBrowser references have been disposed
ILifeSpanHandler.OnBeforeClose the IBrowser wrapper was already disposed, so for now just create a new wrapper and dispose of it immediately after the call
2016-10-24 12:08:37 +10:00
//Rather than attempting to rework the rather complex closing logic
//It's easier to pass in a new wrapper and dispose it straight away
Core - Consistent C++ naming - Following the adapter/wrapper naming scheme - Moved classes to internals that aren't public facing Resolves #1005
2020-04-06 06:50:32 +10:00
CefBrowserWrapper browserWrapper(browser);
Move the LifeSpanHandler.OnBeforeClose call higher in the execution order Fixes #1228
2015-08-30 20:00:37 +10:00
Update ClientAdapter::OnBeforeClose to use auto dispose method and improve the comment
2017-03-06 09:10:38 +10:00
handler->OnBeforeClose(_browserControl, %browserWrapper);
Move the LifeSpanHandler.OnBeforeClose call higher in the execution order Fixes #1228
2015-08-30 20:00:37 +10:00
}
Core - ClientAdapter improve HasParent checks (#4443) * Core - Improve ClientAdapter::GetBrowserWrapper logic Simplify the logic - For non popup return immediately (most common scenario) - Check for IBrowser instance for matching popup - Check for HasParent and return the browser Instance - Return nullptr if no matching IBrowser wrapper found * Core - ClientAdapter::OnFrameCreated called before OnAfterCreated - The very first call to ClientAdapter::OnFrameCreated happens before OnAfterCreated leaving us with a IBrowser instance that's null Create an IBrowser instance that's scoped to the method call * Core - ClientAdapter improve HasParent checks - HasParent check has now been replaced with IsHostedBrowser which has additional check to make sure the internal IWebBrowser.Set* methods are only called for a IBrowser instance that's directly associated with a ChromiumWebBrowser instance This resolves issues with DevTools being opened for a popup hosted in a ChromiumWebBrowser instance. Related discussion https://github.com/cefsharp/CefSharp/discussions/4438
2023-04-01 18:58:27 +10:00
if (IsMainBrowser(browser->IsPopup(), browser->GetIdentifier()))
{
_cefBrowser = nullptr;
}
else
Close open popups (if any) when ManagedCefBrowserAdapter is disposed
2014-12-19 16:30:59 +10:00
{
// Remove from the browser popup list.
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), true);
Reduce the amount of code required to get the cached popup instance
2015-06-11 12:24:32 +10:00
_popupBrowsers->Remove(browser->GetIdentifier());
Core - Consistent C++ naming - Following the adapter/wrapper naming scheme - Moved classes to internals that aren't public facing Resolves #1005
2020-04-06 06:50:32 +10:00
// Dispose the CefBrowserWrapper
Reduce the amount of code required to get the cached popup instance
2015-06-11 12:24:32 +10:00
delete browserWrapper;
Close open popups (if any) when ManagedCefBrowserAdapter is disposed
2014-12-19 16:30:59 +10:00
}
Core - Add Cef.WaitForBrowsersToClose helper function - Add BrowserRefCounter to increment/decrement CefBrowser instance creation - Add Cef.WaitForBrowsersToClose to dispose of all browser instances and call WaitForBrowsersToClose Before calling CefShutdown it's important that CEF has finished closing/disposing of all the CefBrowser instances. If you call CefShutdown before this has finished then you can get the error "Check failed: !IsCefShutdown(). Object reference incorrectly held at CefShutdown". This is more a problem when using MultiThreadedMessageLoop where CEF close/dispose happens on a different thread. Calling ChromiumWebBrowser.Dispose will start to free the resources, CEF internally executes code on it's own thread. #3047
2020-02-12 16:32:33 +10:00
Core - BrowserRefCount add some basic logging Logs some basic information so we can see what type of ChromiumWebBrowser hasn't been closed within as part of the xUnit tests. * Meant for internal use and might be subject to change.
2022-05-31 15:43:34 +10:00
BrowserRefCounter::Instance->Decrement(_browserControl->GetType());
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
}
void ClientAdapter::OnLoadingStateChange(CefRefPtr<CefBrowser> browser, bool isLoading, bool canGoBack, bool canGoForward)
{
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Pass args directly into the IWebBrowserInternal implementation (ChromiumWebBrowser) so that extra params can be added easily Add some more TODO's - still some API cleanup work required
2015-08-13 21:33:23 +10:00
auto args = gcnew LoadingStateChangedEventArgs(browserWrapper, canGoBack, canGoForward, isLoading);
Core - ClientAdapter improve HasParent checks (#4443) * Core - Improve ClientAdapter::GetBrowserWrapper logic Simplify the logic - For non popup return immediately (most common scenario) - Check for IBrowser instance for matching popup - Check for HasParent and return the browser Instance - Return nullptr if no matching IBrowser wrapper found * Core - ClientAdapter::OnFrameCreated called before OnAfterCreated - The very first call to ClientAdapter::OnFrameCreated happens before OnAfterCreated leaving us with a IBrowser instance that's null Create an IBrowser instance that's scoped to the method call * Core - ClientAdapter improve HasParent checks - HasParent check has now been replaced with IsHostedBrowser which has additional check to make sure the internal IWebBrowser.Set* methods are only called for a IBrowser instance that's directly associated with a ChromiumWebBrowser instance This resolves issues with DevTools being opened for a popup hosted in a ChromiumWebBrowser instance. Related discussion https://github.com/cefsharp/CefSharp/discussions/4438
2023-04-01 18:58:27 +10:00
if (IsMainBrowser(browser->IsPopup(), browser->GetIdentifier()))
More work on wrapping CefBrowser/CefFrame.
2015-05-17 17:41:44 -04:00
{
Add ILoadHandler to directly expose CefLoadHandler interface Rather than have a complex set of rules where some methods were handled via IPopupHandler and others weren't It's just a basic wrapper around CEF now with the internal event handlers only being called if it's not a popup
2015-08-17 11:54:40 +10:00
_browserControl->SetLoadingStateChange(args);
More work on wrapping CefBrowser/CefFrame.
2015-05-17 17:41:44 -04:00
}
Add ILoadHandler to directly expose CefLoadHandler interface Rather than have a complex set of rules where some methods were handled via IPopupHandler and others weren't It's just a basic wrapper around CEF now with the internal event handlers only being called if it's not a popup
2015-08-17 11:54:40 +10:00
auto handler = _browserControl->LoadHandler;
if (handler != nullptr)
More work on wrapping CefBrowser/CefFrame.
2015-05-17 17:41:44 -04:00
{
Add ILoadHandler to directly expose CefLoadHandler interface Rather than have a complex set of rules where some methods were handled via IPopupHandler and others weren't It's just a basic wrapper around CEF now with the internal event handlers only being called if it's not a popup
2015-08-17 11:54:40 +10:00
handler->OnLoadingStateChange(_browserControl, args);
More work on wrapping CefBrowser/CefFrame.
2015-05-17 17:41:44 -04:00
}
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
}
void ClientAdapter::OnAddressChange(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, const CefString& address)
{
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Add IBrowser property to AddressChangedEventArgs
2015-08-13 21:55:33 +10:00
auto args = gcnew AddressChangedEventArgs(browserWrapper, StringUtils::ToClr(address));
Pass args directly into the IWebBrowserInternal implementation (ChromiumWebBrowser) so that extra params can be added easily Add some more TODO's - still some API cleanup work required
2015-08-13 21:33:23 +10:00
Core - ClientAdapter improve HasParent checks (#4443) * Core - Improve ClientAdapter::GetBrowserWrapper logic Simplify the logic - For non popup return immediately (most common scenario) - Check for IBrowser instance for matching popup - Check for HasParent and return the browser Instance - Return nullptr if no matching IBrowser wrapper found * Core - ClientAdapter::OnFrameCreated called before OnAfterCreated - The very first call to ClientAdapter::OnFrameCreated happens before OnAfterCreated leaving us with a IBrowser instance that's null Create an IBrowser instance that's scoped to the method call * Core - ClientAdapter improve HasParent checks - HasParent check has now been replaced with IsHostedBrowser which has additional check to make sure the internal IWebBrowser.Set* methods are only called for a IBrowser instance that's directly associated with a ChromiumWebBrowser instance This resolves issues with DevTools being opened for a popup hosted in a ChromiumWebBrowser instance. Related discussion https://github.com/cefsharp/CefSharp/discussions/4438
2023-04-01 18:58:27 +10:00
if (IsMainBrowser(browser->IsPopup(), browser->GetIdentifier()))
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
{
Add ILoadHandler to directly expose CefLoadHandler interface Rather than have a complex set of rules where some methods were handled via IPopupHandler and others weren't It's just a basic wrapper around CEF now with the internal event handlers only being called if it's not a popup
2015-08-17 11:54:40 +10:00
_browserControl->SetAddress(args);
Pass args directly into the IWebBrowserInternal implementation (ChromiumWebBrowser) so that extra params can be added easily Add some more TODO's - still some API cleanup work required
2015-08-13 21:33:23 +10:00
}
Add ILoadHandler to directly expose CefLoadHandler interface Rather than have a complex set of rules where some methods were handled via IPopupHandler and others weren't It's just a basic wrapper around CEF now with the internal event handlers only being called if it's not a popup
2015-08-17 11:54:40 +10:00
auto handler = _browserControl->DisplayHandler;
if (handler != nullptr)
Pass args directly into the IWebBrowserInternal implementation (ChromiumWebBrowser) so that extra params can be added easily Add some more TODO's - still some API cleanup work required
2015-08-13 21:33:23 +10:00
{
Add ILoadHandler to directly expose CefLoadHandler interface Rather than have a complex set of rules where some methods were handled via IPopupHandler and others weren't It's just a basic wrapper around CEF now with the internal event handlers only being called if it's not a popup
2015-08-17 11:54:40 +10:00
handler->OnAddressChanged(_browserControl, args);
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
}
}
Add IDisplayHandler.OnAutoResize, IBrowserHost.SetAccessibilityState, IBrowserHost.SetAutoResizeEnabled Wrappers for new methods/callback added
2017-12-21 08:53:56 +10:00
bool ClientAdapter::OnAutoResize(CefRefPtr<CefBrowser> browser, const CefSize& new_size)
{
auto handler = _browserControl->DisplayHandler;
if (handler == nullptr)
{
return false;
}
Core - Add IBrowser reference to TitleChangedEventArgs/ConsoleMessageEventArgs
2020-07-17 12:41:14 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Add IDisplayHandler.OnAutoResize, IBrowserHost.SetAccessibilityState, IBrowserHost.SetAutoResizeEnabled Wrappers for new methods/callback added
2017-12-21 08:53:56 +10:00
return handler->OnAutoResize(_browserControl, browserWrapper, CefSharp::Structs::Size(new_size.width, new_size.height));
}
Core - Move OnCursorChange from CefRenderHandler to IDisplayHandler Resolves #3275
2020-11-07 17:07:54 +10:00
bool ClientAdapter::OnCursorChange(CefRefPtr<CefBrowser> browser, CefCursorHandle cursor, cef_cursor_type_t type, const CefCursorInfo& custom_cursor_info)
{
auto handler = _browserControl->DisplayHandler;
if (handler == nullptr)
{
InternalCursorChange(browser, cursor, type, custom_cursor_info);
return false;
}
CursorInfo customCursorInfo;
//TODO: this is duplicated in RenderClientAdapter::InternalCursorChange
//Only create the struct when we actually have a custom cursor
if (type == cef_cursor_type_t::CT_CUSTOM)
{
Point hotspot = Point(custom_cursor_info.hotspot.x, custom_cursor_info.hotspot.y);
Size size = Size(custom_cursor_info.size.width, custom_cursor_info.size.height);
customCursorInfo = CursorInfo(IntPtr((void*)custom_cursor_info.buffer), hotspot, custom_cursor_info.image_scale_factor, size);
}
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
auto handled = handler->OnCursorChange(_browserControl, browserWrapper, (IntPtr)cursor, (CefSharp::Enums::CursorType)type, customCursorInfo);
if (handled)
{
return true;
}
InternalCursorChange(browser, cursor, type, custom_cursor_info);
return false;
};
void ClientAdapter::InternalCursorChange(CefRefPtr<CefBrowser> browser, CefCursorHandle cursor, cef_cursor_type_t type, const CefCursorInfo& custom_cursor_info)
{
}
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
void ClientAdapter::OnTitleChange(CefRefPtr<CefBrowser> browser, const CefString& title)
{
Core - Add IBrowser reference to TitleChangedEventArgs/ConsoleMessageEventArgs
2020-07-17 12:41:14 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
auto args = gcnew TitleChangedEventArgs(browserWrapper, StringUtils::ToClr(title));
Add ILoadHandler to directly expose CefLoadHandler interface Rather than have a complex set of rules where some methods were handled via IPopupHandler and others weren't It's just a basic wrapper around CEF now with the internal event handlers only being called if it's not a popup
2015-08-17 11:54:40 +10:00
Core - ClientAdapter improve HasParent checks (#4443) * Core - Improve ClientAdapter::GetBrowserWrapper logic Simplify the logic - For non popup return immediately (most common scenario) - Check for IBrowser instance for matching popup - Check for HasParent and return the browser Instance - Return nullptr if no matching IBrowser wrapper found * Core - ClientAdapter::OnFrameCreated called before OnAfterCreated - The very first call to ClientAdapter::OnFrameCreated happens before OnAfterCreated leaving us with a IBrowser instance that's null Create an IBrowser instance that's scoped to the method call * Core - ClientAdapter improve HasParent checks - HasParent check has now been replaced with IsHostedBrowser which has additional check to make sure the internal IWebBrowser.Set* methods are only called for a IBrowser instance that's directly associated with a ChromiumWebBrowser instance This resolves issues with DevTools being opened for a popup hosted in a ChromiumWebBrowser instance. Related discussion https://github.com/cefsharp/CefSharp/discussions/4438
2023-04-01 18:58:27 +10:00
if (IsMainBrowser(browser->IsPopup(), browser->GetIdentifier()))
When OnTitleChange and browser IsPopup then set the Window title directly
2014-12-19 14:09:17 +10:00
{
Core - ClientAdapter improve HasParent checks (#4443) * Core - Improve ClientAdapter::GetBrowserWrapper logic Simplify the logic - For non popup return immediately (most common scenario) - Check for IBrowser instance for matching popup - Check for HasParent and return the browser Instance - Return nullptr if no matching IBrowser wrapper found * Core - ClientAdapter::OnFrameCreated called before OnAfterCreated - The very first call to ClientAdapter::OnFrameCreated happens before OnAfterCreated leaving us with a IBrowser instance that's null Create an IBrowser instance that's scoped to the method call * Core - ClientAdapter improve HasParent checks - HasParent check has now been replaced with IsHostedBrowser which has additional check to make sure the internal IWebBrowser.Set* methods are only called for a IBrowser instance that's directly associated with a ChromiumWebBrowser instance This resolves issues with DevTools being opened for a popup hosted in a ChromiumWebBrowser instance. Related discussion https://github.com/cefsharp/CefSharp/discussions/4438
2023-04-01 18:58:27 +10:00
_browserControl->SetTitle(args);
When OnTitleChange and browser IsPopup then set the Window title directly
2014-12-19 14:09:17 +10:00
}
else
{
Core - ClientAdapter improve HasParent checks (#4443) * Core - Improve ClientAdapter::GetBrowserWrapper logic Simplify the logic - For non popup return immediately (most common scenario) - Check for IBrowser instance for matching popup - Check for HasParent and return the browser Instance - Return nullptr if no matching IBrowser wrapper found * Core - ClientAdapter::OnFrameCreated called before OnAfterCreated - The very first call to ClientAdapter::OnFrameCreated happens before OnAfterCreated leaving us with a IBrowser instance that's null Create an IBrowser instance that's scoped to the method call * Core - ClientAdapter improve HasParent checks - HasParent check has now been replaced with IsHostedBrowser which has additional check to make sure the internal IWebBrowser.Set* methods are only called for a IBrowser instance that's directly associated with a ChromiumWebBrowser instance This resolves issues with DevTools being opened for a popup hosted in a ChromiumWebBrowser instance. Related discussion https://github.com/cefsharp/CefSharp/discussions/4438
2023-04-01 18:58:27 +10:00
// Set the popup window title
auto hwnd = browser->GetHost()->GetWindowHandle();
SetWindowText(hwnd, std::wstring(title).c_str());
When OnTitleChange and browser IsPopup then set the Window title directly
2014-12-19 14:09:17 +10:00
}
Add ILoadHandler to directly expose CefLoadHandler interface Rather than have a complex set of rules where some methods were handled via IPopupHandler and others weren't It's just a basic wrapper around CEF now with the internal event handlers only being called if it's not a popup
2015-08-17 11:54:40 +10:00
auto handler = _browserControl->DisplayHandler;
if (handler != nullptr)
{
handler->OnTitleChanged(_browserControl, args);
}
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
}
Add OnFaviconURLChange implementation - there is no IDisplayHandler interface so added the method to IRequestHandler as that seemed the next best place.
2015-05-07 13:50:19 +10:00
void ClientAdapter::OnFaviconURLChange(CefRefPtr<CefBrowser> browser, const std::vector<CefString>& iconUrls)
{
Add ILoadHandler to directly expose CefLoadHandler interface Rather than have a complex set of rules where some methods were handled via IPopupHandler and others weren't It's just a basic wrapper around CEF now with the internal event handlers only being called if it's not a popup
2015-08-17 11:54:40 +10:00
auto handler = _browserControl->DisplayHandler;
Reduce the amount of code required to get the cached popup instance
2015-06-11 12:24:32 +10:00
OnFaviconURLChange is now only exposed on IRequestHandler
2015-08-17 10:56:40 +10:00
if (handler != nullptr)
More work on wrapping CefBrowser/CefFrame.
2015-05-17 17:41:44 -04:00
{
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Pedantic code cleanup - mostly just formatting and rearrange some if statements Fixed one minor issue with OnBeforeResourceLoad - wouldn't have been called for a popup if RequestHandler was null
2015-07-22 15:36:44 +10:00
OnFaviconURLChange is now only exposed on IRequestHandler
2015-08-17 10:56:40 +10:00
handler->OnFaviconUrlChange(_browserControl, browserWrapper, StringUtils::ToClr(iconUrls));
Add OnFaviconURLChange implementation - there is no IDisplayHandler interface so added the method to IRequestHandler as that seemed the next best place.
2015-05-07 13:50:19 +10:00
}
}
Add IDisplayHandler.OnFullscreenModeChange No sample implementation as yet
2015-09-02 11:02:28 +10:00
void ClientAdapter::OnFullscreenModeChange(CefRefPtr<CefBrowser> browser, bool fullscreen)
{
auto handler = _browserControl->DisplayHandler;
if (handler != nullptr)
{
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Add IDisplayHandler.OnFullscreenModeChange No sample implementation as yet
2015-09-02 11:02:28 +10:00
handler->OnFullscreenModeChange(_browserControl, browserWrapper, fullscreen);
}
}
IDisplayHandler - Add OnLoadingProgressChange Resolves #2686
2019-03-27 22:05:17 +10:00
void ClientAdapter::OnLoadingProgressChange(CefRefPtr<CefBrowser> browser, double progress)
{
auto handler = _browserControl->DisplayHandler;
if (handler != nullptr)
{
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
handler->OnLoadingProgressChange(_browserControl, browserWrapper, progress);
}
}
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
bool ClientAdapter::OnTooltip(CefRefPtr<CefBrowser> browser, CefString& text)
{
Add ILoadHandler to directly expose CefLoadHandler interface Rather than have a complex set of rules where some methods were handled via IPopupHandler and others weren't It's just a basic wrapper around CEF now with the internal event handlers only being called if it's not a popup
2015-08-17 11:54:40 +10:00
auto tooltip = StringUtils::ToClr(text);
bool hasChanged = tooltip != _tooltip;
Updated OnTooltipChanged to allow for modifying text (#1953) * Updated OnTooltipChanged to allow for modifying text * Updated examples
2017-05-15 02:52:02 +02:00
bool returnFlag = true;
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
Add ILoadHandler to directly expose CefLoadHandler interface Rather than have a complex set of rules where some methods were handled via IPopupHandler and others weren't It's just a basic wrapper around CEF now with the internal event handlers only being called if it's not a popup
2015-08-17 11:54:40 +10:00
//NOTE: Only called if tooltip changed otherwise called many times
CEF Issue Tracker moved to GitHub - Update some of the internal links Issue #4430
2023-03-24 10:52:58 +10:00
// also only called when using OSR, https://github.com/chromiumembedded/cef/issues/783
Updated OnTooltipChanged to allow for modifying text (#1953) * Updated OnTooltipChanged to allow for modifying text * Updated examples
2017-05-15 02:52:02 +02:00
if (hasChanged)
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
{
Updated OnTooltipChanged to allow for modifying text (#1953) * Updated OnTooltipChanged to allow for modifying text * Updated examples
2017-05-15 02:52:02 +02:00
auto handler = _browserControl->DisplayHandler;
if (handler != nullptr)
Add ILoadHandler to directly expose CefLoadHandler interface Rather than have a complex set of rules where some methods were handled via IPopupHandler and others weren't It's just a basic wrapper around CEF now with the internal event handlers only being called if it's not a popup
2015-08-17 11:54:40 +10:00
{
Updated OnTooltipChanged to allow for modifying text (#1953) * Updated OnTooltipChanged to allow for modifying text * Updated examples
2017-05-15 02:52:02 +02:00
returnFlag = handler->OnTooltipChanged(_browserControl, tooltip);
Add ILoadHandler to directly expose CefLoadHandler interface Rather than have a complex set of rules where some methods were handled via IPopupHandler and others weren't It's just a basic wrapper around CEF now with the internal event handlers only being called if it's not a popup
2015-08-17 11:54:40 +10:00
}
Core - ClientAdapter improve HasParent checks (#4443) * Core - Improve ClientAdapter::GetBrowserWrapper logic Simplify the logic - For non popup return immediately (most common scenario) - Check for IBrowser instance for matching popup - Check for HasParent and return the browser Instance - Return nullptr if no matching IBrowser wrapper found * Core - ClientAdapter::OnFrameCreated called before OnAfterCreated - The very first call to ClientAdapter::OnFrameCreated happens before OnAfterCreated leaving us with a IBrowser instance that's null Create an IBrowser instance that's scoped to the method call * Core - ClientAdapter improve HasParent checks - HasParent check has now been replaced with IsHostedBrowser which has additional check to make sure the internal IWebBrowser.Set* methods are only called for a IBrowser instance that's directly associated with a ChromiumWebBrowser instance This resolves issues with DevTools being opened for a popup hosted in a ChromiumWebBrowser instance. Related discussion https://github.com/cefsharp/CefSharp/discussions/4438
2023-04-01 18:58:27 +10:00
if (IsMainBrowser(browser->IsPopup(), browser->GetIdentifier()))
Add ILoadHandler to directly expose CefLoadHandler interface Rather than have a complex set of rules where some methods were handled via IPopupHandler and others weren't It's just a basic wrapper around CEF now with the internal event handlers only being called if it's not a popup
2015-08-17 11:54:40 +10:00
{
Updated OnTooltipChanged to allow for modifying text (#1953) * Updated OnTooltipChanged to allow for modifying text * Updated examples
2017-05-15 02:52:02 +02:00
_tooltip = tooltip;
_browserControl->SetTooltipText(_tooltip);
Add ILoadHandler to directly expose CefLoadHandler interface Rather than have a complex set of rules where some methods were handled via IPopupHandler and others weren't It's just a basic wrapper around CEF now with the internal event handlers only being called if it's not a popup
2015-08-17 11:54:40 +10:00
}
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
}
Updated OnTooltipChanged to allow for modifying text (#1953) * Updated OnTooltipChanged to allow for modifying text * Updated examples
2017-05-15 02:52:02 +02:00
return returnFlag;
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
}
OnConsoleMessage - Add LogSeverity
2018-02-05 17:30:44 +10:00
bool ClientAdapter::OnConsoleMessage(CefRefPtr<CefBrowser> browser, cef_log_severity_t level, const CefString& message, const CefString& source, int line)
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
{
Core - Add IBrowser reference to TitleChangedEventArgs/ConsoleMessageEventArgs
2020-07-17 12:41:14 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
auto args = gcnew ConsoleMessageEventArgs(browserWrapper, (LogSeverity)level, StringUtils::ToClr(message), StringUtils::ToClr(source), line);
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
Core - ClientAdapter improve HasParent checks (#4443) * Core - Improve ClientAdapter::GetBrowserWrapper logic Simplify the logic - For non popup return immediately (most common scenario) - Check for IBrowser instance for matching popup - Check for HasParent and return the browser Instance - Return nullptr if no matching IBrowser wrapper found * Core - ClientAdapter::OnFrameCreated called before OnAfterCreated - The very first call to ClientAdapter::OnFrameCreated happens before OnAfterCreated leaving us with a IBrowser instance that's null Create an IBrowser instance that's scoped to the method call * Core - ClientAdapter improve HasParent checks - HasParent check has now been replaced with IsHostedBrowser which has additional check to make sure the internal IWebBrowser.Set* methods are only called for a IBrowser instance that's directly associated with a ChromiumWebBrowser instance This resolves issues with DevTools being opened for a popup hosted in a ChromiumWebBrowser instance. Related discussion https://github.com/cefsharp/CefSharp/discussions/4438
2023-04-01 18:58:27 +10:00
if (IsMainBrowser(browser->IsPopup(), browser->GetIdentifier()))
Add ILoadHandler to directly expose CefLoadHandler interface Rather than have a complex set of rules where some methods were handled via IPopupHandler and others weren't It's just a basic wrapper around CEF now with the internal event handlers only being called if it's not a popup
2015-08-17 11:54:40 +10:00
{
_browserControl->OnConsoleMessage(args);
}
auto handler = _browserControl->DisplayHandler;
Default return value for OnConsoleMessage is false, so revert to using the default
2015-08-17 12:11:40 +10:00
if (handler == nullptr)
Add ILoadHandler to directly expose CefLoadHandler interface Rather than have a complex set of rules where some methods were handled via IPopupHandler and others weren't It's just a basic wrapper around CEF now with the internal event handlers only being called if it's not a popup
2015-08-17 11:54:40 +10:00
{
Default return value for OnConsoleMessage is false, so revert to using the default
2015-08-17 12:11:40 +10:00
return false;
Add ILoadHandler to directly expose CefLoadHandler interface Rather than have a complex set of rules where some methods were handled via IPopupHandler and others weren't It's just a basic wrapper around CEF now with the internal event handlers only being called if it's not a popup
2015-08-17 11:54:40 +10:00
}
Start making the wrapper/callback naming consistent Change to using auto where possible
2015-06-11 11:21:55 +10:00
Default return value for OnConsoleMessage is false, so revert to using the default
2015-08-17 12:11:40 +10:00
return handler->OnConsoleMessage(_browserControl, args);
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
}
Implemented OnStatusMessage and event for WPF and WinForms.
2014-08-08 14:29:12 -04:00
void ClientAdapter::OnStatusMessage(CefRefPtr<CefBrowser> browser, const CefString& value)
{
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Pass args directly into the IWebBrowserInternal implementation (ChromiumWebBrowser) so that extra params can be added easily Add some more TODO's - still some API cleanup work required
2015-08-13 21:33:23 +10:00
auto args = gcnew StatusMessageEventArgs(browserWrapper, StringUtils::ToClr(value));
Start making the wrapper/callback naming consistent Change to using auto where possible
2015-06-11 11:21:55 +10:00
Core - ClientAdapter improve HasParent checks (#4443) * Core - Improve ClientAdapter::GetBrowserWrapper logic Simplify the logic - For non popup return immediately (most common scenario) - Check for IBrowser instance for matching popup - Check for HasParent and return the browser Instance - Return nullptr if no matching IBrowser wrapper found * Core - ClientAdapter::OnFrameCreated called before OnAfterCreated - The very first call to ClientAdapter::OnFrameCreated happens before OnAfterCreated leaving us with a IBrowser instance that's null Create an IBrowser instance that's scoped to the method call * Core - ClientAdapter improve HasParent checks - HasParent check has now been replaced with IsHostedBrowser which has additional check to make sure the internal IWebBrowser.Set* methods are only called for a IBrowser instance that's directly associated with a ChromiumWebBrowser instance This resolves issues with DevTools being opened for a popup hosted in a ChromiumWebBrowser instance. Related discussion https://github.com/cefsharp/CefSharp/discussions/4438
2023-04-01 18:58:27 +10:00
if (IsMainBrowser(browser->IsPopup(), browser->GetIdentifier()))
More work on wrapping CefBrowser/CefFrame.
2015-05-17 17:41:44 -04:00
{
Add ILoadHandler to directly expose CefLoadHandler interface Rather than have a complex set of rules where some methods were handled via IPopupHandler and others weren't It's just a basic wrapper around CEF now with the internal event handlers only being called if it's not a popup
2015-08-17 11:54:40 +10:00
_browserControl->OnStatusMessage(args);
More work on wrapping CefBrowser/CefFrame.
2015-05-17 17:41:44 -04:00
}
Add ILoadHandler to directly expose CefLoadHandler interface Rather than have a complex set of rules where some methods were handled via IPopupHandler and others weren't It's just a basic wrapper around CEF now with the internal event handlers only being called if it's not a popup
2015-08-17 11:54:40 +10:00
auto handler = _browserControl->DisplayHandler;
if (handler != nullptr)
More work on wrapping CefBrowser/CefFrame.
2015-05-17 17:41:44 -04:00
{
Add ILoadHandler to directly expose CefLoadHandler interface Rather than have a complex set of rules where some methods were handled via IPopupHandler and others weren't It's just a basic wrapper around CEF now with the internal event handlers only being called if it's not a popup
2015-08-17 11:54:40 +10:00
handler->OnStatusMessage(_browserControl, args);
More work on wrapping CefBrowser/CefFrame.
2015-05-17 17:41:44 -04:00
}
Implemented OnStatusMessage and event for WPF and WinForms.
2014-08-08 14:29:12 -04:00
}
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
bool ClientAdapter::OnKeyEvent(CefRefPtr<CefBrowser> browser, const CefKeyEvent& event, CefEventHandle os_event)
{
Revert IPopupHandler implementing IKeyboardHandler All keyboard checks are simply handled through IKeyboardHandler (for both main and popup browsers)
2015-08-17 10:51:24 +10:00
auto handler = _browserControl->KeyboardHandler;
Reduce the amount of code required to get the cached popup instance
2015-06-11 12:24:32 +10:00
Simplify nesting for OnBeforeResourceLoad, OnBeforeBrowse, OnPreKeyEvent, OnKeyEvent
2015-08-17 12:07:08 +10:00
if (handler == nullptr)
Add some more methods on IPopupHandler and call them. Don't put the following handlers on IPopupHandler due to the underlying security related purpose, but add IBrowser parameters: * OnCertificateError * OnQuotaError * OnPluginCrashed * OnRenderProcessTerminated * OnProtocolExecution * OnBeforePluginLoad * GetAuthCredentials
2015-05-29 01:33:44 -04:00
{
Simplify nesting for OnBeforeResourceLoad, OnBeforeBrowse, OnPreKeyEvent, OnKeyEvent
2015-08-17 12:07:08 +10:00
return false;
Add some more methods on IPopupHandler and call them. Don't put the following handlers on IPopupHandler due to the underlying security related purpose, but add IBrowser parameters: * OnCertificateError * OnQuotaError * OnPluginCrashed * OnRenderProcessTerminated * OnProtocolExecution * OnBeforePluginLoad * GetAuthCredentials
2015-05-29 01:33:44 -04:00
}
Maintenance - Fixed formatting, file encoding, and copyright year (#2504) * Applied formatting * Fixed file encoding + Updated copyright year * Updated License * Fixed more file encoding * Copyright notice now shows the year the file was created
2018-09-10 02:41:13 +02:00
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Simplify nesting for OnBeforeResourceLoad, OnBeforeBrowse, OnPreKeyEvent, OnKeyEvent
2015-08-17 12:07:08 +10:00
return handler->OnKeyEvent(
Maintenance - Fixed formatting, file encoding, and copyright year (#2504) * Applied formatting * Fixed file encoding + Updated copyright year * Updated License * Fixed more file encoding * Copyright notice now shows the year the file was created
2018-09-10 02:41:13 +02:00
_browserControl, browserWrapper, (KeyType)event.type, event.windows_key_code,
Simplify nesting for OnBeforeResourceLoad, OnBeforeBrowse, OnPreKeyEvent, OnKeyEvent
2015-08-17 12:07:08 +10:00
event.native_key_code,
Maintenance - Fixed formatting, file encoding, and copyright year (#2504) * Applied formatting * Fixed file encoding + Updated copyright year * Updated License * Fixed more file encoding * Copyright notice now shows the year the file was created
2018-09-10 02:41:13 +02:00
(CefEventFlags)event.modifiers, event.is_system_key == 1);
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
}
Implement CefKeyboardHandler.OnPreKeyEvent
2014-06-10 16:57:45 +10:00
bool ClientAdapter::OnPreKeyEvent(CefRefPtr<CefBrowser> browser, const CefKeyEvent& event, CefEventHandle os_event, bool* is_keyboard_shortcut)
{
Revert IPopupHandler implementing IKeyboardHandler All keyboard checks are simply handled through IKeyboardHandler (for both main and popup browsers)
2015-08-17 10:51:24 +10:00
auto handler = _browserControl->KeyboardHandler;
Pedantic code cleanup - mostly just formatting and rearrange some if statements Fixed one minor issue with OnBeforeResourceLoad - wouldn't have been called for a popup if RequestHandler was null
2015-07-22 15:36:44 +10:00
Simplify nesting for OnBeforeResourceLoad, OnBeforeBrowse, OnPreKeyEvent, OnKeyEvent
2015-08-17 12:07:08 +10:00
if (handler == nullptr)
Add some more methods on IPopupHandler and call them. Don't put the following handlers on IPopupHandler due to the underlying security related purpose, but add IBrowser parameters: * OnCertificateError * OnQuotaError * OnPluginCrashed * OnRenderProcessTerminated * OnProtocolExecution * OnBeforePluginLoad * GetAuthCredentials
2015-05-29 01:33:44 -04:00
{
Simplify nesting for OnBeforeResourceLoad, OnBeforeBrowse, OnPreKeyEvent, OnKeyEvent
2015-08-17 12:07:08 +10:00
return false;
Maintenance - Fixed formatting, file encoding, and copyright year (#2504) * Applied formatting * Fixed file encoding + Updated copyright year * Updated License * Fixed more file encoding * Copyright notice now shows the year the file was created
2018-09-10 02:41:13 +02:00
}
The changes continue...
2015-06-08 22:48:29 -04:00
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Simplify nesting for OnBeforeResourceLoad, OnBeforeBrowse, OnPreKeyEvent, OnKeyEvent
2015-08-17 12:07:08 +10:00
return handler->OnPreKeyEvent(
_browserControl, browserWrapper, (KeyType)event.type, event.windows_key_code,
event.native_key_code, (CefEventFlags)event.modifiers, event.is_system_key == 1,
*is_keyboard_shortcut);
Implement CefKeyboardHandler.OnPreKeyEvent
2014-06-10 16:57:45 +10:00
}
Upgrade to 3.2743.1441 Add TransitionType to FrameLoadStartEventArgs
2016-07-16 21:24:00 +10:00
void ClientAdapter::OnLoadStart(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, TransitionType transitionType)
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
{
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Add ILoadHandler to directly expose CefLoadHandler interface Rather than have a complex set of rules where some methods were handled via IPopupHandler and others weren't It's just a basic wrapper around CEF now with the internal event handlers only being called if it's not a popup
2015-08-17 11:54:40 +10:00
CefFrameWrapper frameWrapper(frame);
Core - ClientAdapter improve HasParent checks (#4443) * Core - Improve ClientAdapter::GetBrowserWrapper logic Simplify the logic - For non popup return immediately (most common scenario) - Check for IBrowser instance for matching popup - Check for HasParent and return the browser Instance - Return nullptr if no matching IBrowser wrapper found * Core - ClientAdapter::OnFrameCreated called before OnAfterCreated - The very first call to ClientAdapter::OnFrameCreated happens before OnAfterCreated leaving us with a IBrowser instance that's null Create an IBrowser instance that's scoped to the method call * Core - ClientAdapter improve HasParent checks - HasParent check has now been replaced with IsHostedBrowser which has additional check to make sure the internal IWebBrowser.Set* methods are only called for a IBrowser instance that's directly associated with a ChromiumWebBrowser instance This resolves issues with DevTools being opened for a popup hosted in a ChromiumWebBrowser instance. Related discussion https://github.com/cefsharp/CefSharp/discussions/4438
2023-04-01 18:58:27 +10:00
if (IsMainBrowser(browser->IsPopup(), browser->GetIdentifier()))
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
{
Upgrade to 3.2743.1441 Add TransitionType to FrameLoadStartEventArgs
2016-07-16 21:24:00 +10:00
_browserControl->OnFrameLoadStart(gcnew FrameLoadStartEventArgs(browserWrapper, %frameWrapper, (CefSharp::TransitionType)transitionType));
Fix some review comments, and add frameloadstart/end/error related methods to IPopupHandler.
2015-05-20 22:59:43 -04:00
}
Add ILoadHandler to directly expose CefLoadHandler interface Rather than have a complex set of rules where some methods were handled via IPopupHandler and others weren't It's just a basic wrapper around CEF now with the internal event handlers only being called if it's not a popup
2015-08-17 11:54:40 +10:00
auto handler = _browserControl->LoadHandler;
if (handler != nullptr)
Fix some review comments, and add frameloadstart/end/error related methods to IPopupHandler.
2015-05-20 22:59:43 -04:00
{
Upgrade to 3.2743.1441 Add TransitionType to FrameLoadStartEventArgs
2016-07-16 21:24:00 +10:00
handler->OnFrameLoadStart(_browserControl, gcnew FrameLoadStartEventArgs(browserWrapper, %frameWrapper, (CefSharp::TransitionType)transitionType));
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
}
}
void ClientAdapter::OnLoadEnd(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int httpStatusCode)
{
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Add ILoadHandler to directly expose CefLoadHandler interface Rather than have a complex set of rules where some methods were handled via IPopupHandler and others weren't It's just a basic wrapper around CEF now with the internal event handlers only being called if it's not a popup
2015-08-17 11:54:40 +10:00
CefFrameWrapper frameWrapper(frame);
Pedantic code cleanup - mostly just formatting and rearrange some if statements Fixed one minor issue with OnBeforeResourceLoad - wouldn't have been called for a popup if RequestHandler was null
2015-07-22 15:36:44 +10:00
Core - ClientAdapter improve HasParent checks (#4443) * Core - Improve ClientAdapter::GetBrowserWrapper logic Simplify the logic - For non popup return immediately (most common scenario) - Check for IBrowser instance for matching popup - Check for HasParent and return the browser Instance - Return nullptr if no matching IBrowser wrapper found * Core - ClientAdapter::OnFrameCreated called before OnAfterCreated - The very first call to ClientAdapter::OnFrameCreated happens before OnAfterCreated leaving us with a IBrowser instance that's null Create an IBrowser instance that's scoped to the method call * Core - ClientAdapter improve HasParent checks - HasParent check has now been replaced with IsHostedBrowser which has additional check to make sure the internal IWebBrowser.Set* methods are only called for a IBrowser instance that's directly associated with a ChromiumWebBrowser instance This resolves issues with DevTools being opened for a popup hosted in a ChromiumWebBrowser instance. Related discussion https://github.com/cefsharp/CefSharp/discussions/4438
2023-04-01 18:58:27 +10:00
if (IsMainBrowser(browser->IsPopup(), browser->GetIdentifier()))
Fix some review comments, and add frameloadstart/end/error related methods to IPopupHandler.
2015-05-20 22:59:43 -04:00
{
Use GetBrowserWrapper everywhere except popup creation/closing for all of ClientAdapter.cpp. This means that none of the callbacks need to own disposing the IBrowser^ instance.
2015-06-17 18:14:07 -04:00
_browserControl->OnFrameLoadEnd(gcnew FrameLoadEndEventArgs(browserWrapper, %frameWrapper, httpStatusCode));
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
}
Add ILoadHandler to directly expose CefLoadHandler interface Rather than have a complex set of rules where some methods were handled via IPopupHandler and others weren't It's just a basic wrapper around CEF now with the internal event handlers only being called if it's not a popup
2015-08-17 11:54:40 +10:00
auto handler = _browserControl->LoadHandler;
if (handler != nullptr)
{
handler->OnFrameLoadEnd(_browserControl, gcnew FrameLoadEndEventArgs(browserWrapper, %frameWrapper, httpStatusCode));
}
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
}
void ClientAdapter::OnLoadError(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, ErrorCode errorCode, const CefString& errorText, const CefString& failedUrl)
{
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Add ILoadHandler to directly expose CefLoadHandler interface Rather than have a complex set of rules where some methods were handled via IPopupHandler and others weren't It's just a basic wrapper around CEF now with the internal event handlers only being called if it's not a popup
2015-08-17 11:54:40 +10:00
CefFrameWrapper frameWrapper(frame);
Pedantic code cleanup - mostly just formatting and rearrange some if statements Fixed one minor issue with OnBeforeResourceLoad - wouldn't have been called for a popup if RequestHandler was null
2015-07-22 15:36:44 +10:00
Core - ClientAdapter improve HasParent checks (#4443) * Core - Improve ClientAdapter::GetBrowserWrapper logic Simplify the logic - For non popup return immediately (most common scenario) - Check for IBrowser instance for matching popup - Check for HasParent and return the browser Instance - Return nullptr if no matching IBrowser wrapper found * Core - ClientAdapter::OnFrameCreated called before OnAfterCreated - The very first call to ClientAdapter::OnFrameCreated happens before OnAfterCreated leaving us with a IBrowser instance that's null Create an IBrowser instance that's scoped to the method call * Core - ClientAdapter improve HasParent checks - HasParent check has now been replaced with IsHostedBrowser which has additional check to make sure the internal IWebBrowser.Set* methods are only called for a IBrowser instance that's directly associated with a ChromiumWebBrowser instance This resolves issues with DevTools being opened for a popup hosted in a ChromiumWebBrowser instance. Related discussion https://github.com/cefsharp/CefSharp/discussions/4438
2023-04-01 18:58:27 +10:00
if (IsMainBrowser(browser->IsPopup(), browser->GetIdentifier()))
Fix some review comments, and add frameloadstart/end/error related methods to IPopupHandler.
2015-05-20 22:59:43 -04:00
{
Pass args directly into the IWebBrowserInternal implementation (ChromiumWebBrowser) so that extra params can be added easily Add some more TODO's - still some API cleanup work required
2015-08-13 21:33:23 +10:00
_browserControl->OnLoadError(gcnew LoadErrorEventArgs(browserWrapper, %frameWrapper,
(CefErrorCode)errorCode, StringUtils::ToClr(errorText), StringUtils::ToClr(failedUrl)));
Fix some review comments, and add frameloadstart/end/error related methods to IPopupHandler.
2015-05-20 22:59:43 -04:00
}
Add ILoadHandler to directly expose CefLoadHandler interface Rather than have a complex set of rules where some methods were handled via IPopupHandler and others weren't It's just a basic wrapper around CEF now with the internal event handlers only being called if it's not a popup
2015-08-17 11:54:40 +10:00
auto handler = _browserControl->LoadHandler;
if (handler != nullptr)
{
handler->OnLoadError(_browserControl,
gcnew LoadErrorEventArgs(browserWrapper, %frameWrapper, (CefErrorCode)errorCode, StringUtils::ToClr(errorText), StringUtils::ToClr(failedUrl)));
}
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
}
IRequestHandler.OnBeforeBrowse - Add userGesture param The userGesture value will be true if the browser navigated via explicit user gesture (e.g. clicking a link) or false if it navigated automatically (e.g. via the DomContentLoaded event).
2018-05-03 12:11:52 +10:00
bool ClientAdapter::OnBeforeBrowse(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request, bool userGesture, bool isRedirect)
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
{
Remove more methods from IPopupHandler - still two more to go
2015-08-17 11:03:30 +10:00
auto handler = _browserControl->RequestHandler;
Reduce the amount of code required to get the cached popup instance
2015-06-11 12:24:32 +10:00
Simplify nesting for OnBeforeResourceLoad, OnBeforeBrowse, OnPreKeyEvent, OnKeyEvent
2015-08-17 12:07:08 +10:00
if (handler == nullptr)
Add some more methods on IPopupHandler and call them. Don't put the following handlers on IPopupHandler due to the underlying security related purpose, but add IBrowser parameters: * OnCertificateError * OnQuotaError * OnPluginCrashed * OnRenderProcessTerminated * OnProtocolExecution * OnBeforePluginLoad * GetAuthCredentials
2015-05-29 01:33:44 -04:00
{
Simplify nesting for OnBeforeResourceLoad, OnBeforeBrowse, OnPreKeyEvent, OnKeyEvent
2015-08-17 12:07:08 +10:00
return false;
Maintenance - Fixed formatting, file encoding, and copyright year (#2504) * Applied formatting * Fixed file encoding + Updated copyright year * Updated License * Fixed more file encoding * Copyright notice now shows the year the file was created
2018-09-10 02:41:13 +02:00
}
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Simplify nesting for OnBeforeResourceLoad, OnBeforeBrowse, OnPreKeyEvent, OnKeyEvent
2015-08-17 12:07:08 +10:00
CefFrameWrapper frameWrapper(frame);
Core - Rename CefSharp.Internals.CefRequestWrapper to CefSharp.Request - Made public - Added public constructor Related issue #1721
2019-11-23 14:27:27 +10:00
Request requestWrapper(request);
Start making the wrapper/callback naming consistent Change to using auto where possible
2015-06-11 11:21:55 +10:00
IRequestHandler.OnBeforeBrowse - Add userGesture param The userGesture value will be true if the browser navigated via explicit user gesture (e.g. clicking a link) or false if it navigated automatically (e.g. via the DomContentLoaded event).
2018-05-03 12:11:52 +10:00
return handler->OnBeforeBrowse(_browserControl, browserWrapper, %frameWrapper, %requestWrapper, userGesture, isRedirect);
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
}
Add missing OnOpenURLFromTab implementation
2015-08-19 18:59:46 +10:00
bool ClientAdapter::OnOpenURLFromTab(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, const CefString& targetUrl,
CefRequestHandler::WindowOpenDisposition targetDisposition, bool userGesture)
{
auto handler = _browserControl->RequestHandler;
if (handler == nullptr)
{
return false;
}
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Add missing OnOpenURLFromTab implementation
2015-08-19 18:59:46 +10:00
CefFrameWrapper frameWrapper(frame);
return handler->OnOpenUrlFromTab(_browserControl, browserWrapper, %frameWrapper, StringUtils::ToClr(targetUrl), (CefSharp::WindowOpenDisposition)targetDisposition, userGesture);
}
Initial version 75 upgrade and NetworkService changes Compiles, that's about it at this point, there are major CEF breaking changes, and lots to be addressed. Browser Process (main process) - Removed IResourceHandlerFactory as it no longer fits with the structure that CEF provides - New IResourceRequestHandler interface added, not plumbed in yet - CefSettings - Add RootCachePath and ApplicationClientIdForFileScanning BrowserSubprocess (render process) - SendProcessMessage was moved from CefBrowser to CefFrame - OnBrowserCreated added extraInfo param The BrowserSubprocess changes for this upgrade should be complete
2019-06-11 12:29:57 +10:00
CefRefPtr<CefResourceRequestHandler> ClientAdapter::GetResourceRequestHandler(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request, bool isNavigation, bool isDownload, const CefString& requestInitiator, bool& disableDefaultHandling)
Feature: Expose OnCertificateError to allow host application to decide whether or not it should continue
2014-11-25 15:51:55 -05:00
{
Start making the wrapper/callback naming consistent Change to using auto where possible
2015-06-11 11:21:55 +10:00
auto handler = _browserControl->RequestHandler;
ClientAdapter::GetResourceRequestHandler - LoadHtml and (Un)RegisterResource would only work if RequestHandler not null - Revised login so RequestHandler not required
2019-08-23 11:59:28 +10:00
auto resourceRequestHandlerFactory = _browserControl->ResourceRequestHandlerFactory;
Pedantic code cleanup - mostly just formatting and rearrange some if statements Fixed one minor issue with OnBeforeResourceLoad - wouldn't have been called for a popup if RequestHandler was null
2015-07-22 15:36:44 +10:00
ClientAdapter::GetResourceRequestHandler - LoadHtml and (Un)RegisterResource would only work if RequestHandler not null - Revised login so RequestHandler not required
2019-08-23 11:59:28 +10:00
//No handler and no factory, we'll just return null
if (handler == nullptr && resourceRequestHandlerFactory == nullptr)
Feature: Expose OnCertificateError to allow host application to decide whether or not it should continue
2014-11-25 15:51:55 -05:00
{
C++/CLI - Replace NULL with nullptr Issue #3636
2021-07-31 15:35:38 +10:00
return nullptr;
Feature: Expose OnCertificateError to allow host application to decide whether or not it should continue
2014-11-25 15:51:55 -05:00
}
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Initial version 75 upgrade and NetworkService changes Compiles, that's about it at this point, there are major CEF breaking changes, and lots to be addressed. Browser Process (main process) - Removed IResourceHandlerFactory as it no longer fits with the structure that CEF provides - New IResourceRequestHandler interface added, not plumbed in yet - CefSettings - Add RootCachePath and ApplicationClientIdForFileScanning BrowserSubprocess (render process) - SendProcessMessage was moved from CefBrowser to CefFrame - OnBrowserCreated added extraInfo param The BrowserSubprocess changes for this upgrade should be complete
2019-06-11 12:29:57 +10:00
CefFrameWrapper frameWrapper(frame);
Core - Rename CefSharp.Internals.CefRequestWrapper to CefSharp.Request - Made public - Added public constructor Related issue #1721
2019-11-23 14:27:27 +10:00
Request requestWrapper(request);
Reduce the amount of code required to get the cached popup instance
2015-06-11 12:24:32 +10:00
ClientAdapter::GetResourceRequestHandler - LoadHtml and (Un)RegisterResource would only work if RequestHandler not null - Revised login so RequestHandler not required
2019-08-23 11:59:28 +10:00
if (handler != nullptr)
Add Cef.GetBlockingCookieManager, IRequestHandler.CanGetCookies and IRequestHandler.CanSetCookie RequestEventHandler example implementation is incomplete
2018-03-28 14:28:38 +10:00
{
ClientAdapter::GetResourceRequestHandler - LoadHtml and (Un)RegisterResource would only work if RequestHandler not null - Revised login so RequestHandler not required
2019-08-23 11:59:28 +10:00
auto resourceRequestHandler = handler->GetResourceRequestHandler(_browserControl, browserWrapper, %frameWrapper,
%requestWrapper, isNavigation, isDownload, StringUtils::ToClr(requestInitiator), disableDefaultHandling);
Add Cef.GetBlockingCookieManager, IRequestHandler.CanGetCookies and IRequestHandler.CanSetCookie RequestEventHandler example implementation is incomplete
2018-03-28 14:28:38 +10:00
ClientAdapter::GetResourceRequestHandler - LoadHtml and (Un)RegisterResource would only work if RequestHandler not null - Revised login so RequestHandler not required
2019-08-23 11:59:28 +10:00
if (resourceRequestHandler != nullptr)
{
return new CefResourceRequestHandlerAdapter(_browserControl, resourceRequestHandler);
}
}
Add Cef.GetBlockingCookieManager, IRequestHandler.CanGetCookies and IRequestHandler.CanSetCookie RequestEventHandler example implementation is incomplete
2018-03-28 14:28:38 +10:00
ClientAdapter - Add ResourceRequestHandlerFactory->HasHandlers check to GetResourceRequestHandler
2019-06-24 20:07:51 +10:00
if (resourceRequestHandlerFactory != nullptr && resourceRequestHandlerFactory->HasHandlers)
Initial version 75 upgrade and NetworkService changes Compiles, that's about it at this point, there are major CEF breaking changes, and lots to be addressed. Browser Process (main process) - Removed IResourceHandlerFactory as it no longer fits with the structure that CEF provides - New IResourceRequestHandler interface added, not plumbed in yet - CefSettings - Add RootCachePath and ApplicationClientIdForFileScanning BrowserSubprocess (render process) - SendProcessMessage was moved from CefBrowser to CefFrame - OnBrowserCreated added extraInfo param The BrowserSubprocess changes for this upgrade should be complete
2019-06-11 12:29:57 +10:00
{
auto factoryHandler = resourceRequestHandlerFactory->GetResourceRequestHandler(_browserControl, browserWrapper, %frameWrapper,
%requestWrapper, isNavigation, isDownload, StringUtils::ToClr(requestInitiator), disableDefaultHandling);
if (factoryHandler != nullptr)
{
return new CefResourceRequestHandlerAdapter(_browserControl, factoryHandler);
}
}
C++/CLI - Replace NULL with nullptr Issue #3636
2021-07-31 15:35:38 +10:00
return nullptr;
Add Cef.GetBlockingCookieManager, IRequestHandler.CanGetCookies and IRequestHandler.CanSetCookie RequestEventHandler example implementation is incomplete
2018-03-28 14:28:38 +10:00
}
Upgrade to CEF 95.7.10+g00d4ad5+chromium-95.0.4638.54 / Chromium 95.0.4638.54 Remove CefBrowserSettings.universal_access_from_file_urls and CefBrowserSettings.file_access_from_file_urls. https://bitbucket.org/chromiumembedded/cef/commits/ff33d7f72144 Remove CefBrowserSettings.application_cache https://bitbucket.org/chromiumembedded/cef/commits/370a7749e950ef6784c29a666d07a0b67148dd5f Remove ignore_certificate_errors setting https://bitbucket.org/chromiumembedded/cef/commits/aabe4ce466766f8bd9907e7fa30546a3afada214 RequestContextSettings.IgnoreCertificateErrors was removed, the CefSettings.IgnoreCertificateErrors property now set the command line arg Use CefRect for CefWindowInfo bounds https://bitbucket.org/chromiumembedded/cef/commits/8587cc4e4bbc187aa989152e521318818b3f41d3 Additional overload has been added to pass in a Rect directly to SetAsChild Rename SendFocusEvent to SetFocus https://bitbucket.org/chromiumembedded/cef/commits/49a4611e28d7bbc221cff816d7c4a96c55ba2721 SendFocusEvent will now call SetFocus internally, the project internally has been updated to use SetFocus for WPF Replace CefRequestCallback with CefCallback https://bitbucket.org/chromiumembedded/cef/commits/3e7f1bb529442a6c7674262d9219df57964e9524 No changes to the API for this, I've kept the same interface and just mapped internally Resolves #3857, #3667, #3668
2021-10-22 13:16:45 +10:00
bool ClientAdapter::OnCertificateError(CefRefPtr<CefBrowser> browser, cef_errorcode_t cert_error, const CefString& request_url, CefRefPtr<CefSSLInfo> ssl_info, CefRefPtr<CefCallback> callback)
Add Cef.GetBlockingCookieManager, IRequestHandler.CanGetCookies and IRequestHandler.CanSetCookie RequestEventHandler example implementation is incomplete
2018-03-28 14:28:38 +10:00
{
auto handler = _browserControl->RequestHandler;
if (handler == nullptr)
{
Initial version 75 upgrade and NetworkService changes Compiles, that's about it at this point, there are major CEF breaking changes, and lots to be addressed. Browser Process (main process) - Removed IResourceHandlerFactory as it no longer fits with the structure that CEF provides - New IResourceRequestHandler interface added, not plumbed in yet - CefSettings - Add RootCachePath and ApplicationClientIdForFileScanning BrowserSubprocess (render process) - SendProcessMessage was moved from CefBrowser to CefFrame - OnBrowserCreated added extraInfo param The BrowserSubprocess changes for this upgrade should be complete
2019-06-11 12:29:57 +10:00
return false;
Add Cef.GetBlockingCookieManager, IRequestHandler.CanGetCookies and IRequestHandler.CanSetCookie RequestEventHandler example implementation is incomplete
2018-03-28 14:28:38 +10:00
}
Initial version 75 upgrade and NetworkService changes Compiles, that's about it at this point, there are major CEF breaking changes, and lots to be addressed. Browser Process (main process) - Removed IResourceHandlerFactory as it no longer fits with the structure that CEF provides - New IResourceRequestHandler interface added, not plumbed in yet - CefSettings - Add RootCachePath and ApplicationClientIdForFileScanning BrowserSubprocess (render process) - SendProcessMessage was moved from CefBrowser to CefFrame - OnBrowserCreated added extraInfo param The BrowserSubprocess changes for this upgrade should be complete
2019-06-11 12:29:57 +10:00
// If callback is empty the error cannot be recovered from and the request will be canceled automatically.
// Still notify the user of the certificate error just don't provide a callback.
C++/CLI - Replace NULL with nullptr Issue #3636
2021-07-31 15:35:38 +10:00
auto requestCallback = callback == nullptr ? nullptr : gcnew CefRequestCallbackWrapper(callback);
Add Cef.GetBlockingCookieManager, IRequestHandler.CanGetCookies and IRequestHandler.CanSetCookie RequestEventHandler example implementation is incomplete
2018-03-28 14:28:38 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Initial version 75 upgrade and NetworkService changes Compiles, that's about it at this point, there are major CEF breaking changes, and lots to be addressed. Browser Process (main process) - Removed IResourceHandlerFactory as it no longer fits with the structure that CEF provides - New IResourceRequestHandler interface added, not plumbed in yet - CefSettings - Add RootCachePath and ApplicationClientIdForFileScanning BrowserSubprocess (render process) - SendProcessMessage was moved from CefBrowser to CefFrame - OnBrowserCreated added extraInfo param The BrowserSubprocess changes for this upgrade should be complete
2019-06-11 12:29:57 +10:00
auto sslInfoWrapper = gcnew CefSslInfoWrapper(ssl_info);
Add Cef.GetBlockingCookieManager, IRequestHandler.CanGetCookies and IRequestHandler.CanSetCookie RequestEventHandler example implementation is incomplete
2018-03-28 14:28:38 +10:00
Initial version 75 upgrade and NetworkService changes Compiles, that's about it at this point, there are major CEF breaking changes, and lots to be addressed. Browser Process (main process) - Removed IResourceHandlerFactory as it no longer fits with the structure that CEF provides - New IResourceRequestHandler interface added, not plumbed in yet - CefSettings - Add RootCachePath and ApplicationClientIdForFileScanning BrowserSubprocess (render process) - SendProcessMessage was moved from CefBrowser to CefFrame - OnBrowserCreated added extraInfo param The BrowserSubprocess changes for this upgrade should be complete
2019-06-11 12:29:57 +10:00
return handler->OnCertificateError(_browserControl, browserWrapper, (CefErrorCode)cert_error, StringUtils::ToClr(request_url), sslInfoWrapper, requestCallback);
Add Cef.GetBlockingCookieManager, IRequestHandler.CanGetCookies and IRequestHandler.CanSetCookie RequestEventHandler example implementation is incomplete
2018-03-28 14:28:38 +10:00
}
Add OnOpenUrlFromTab and OnRenderViewReady
2015-08-17 13:59:48 +10:00
void ClientAdapter::OnRenderViewReady(CefRefPtr<CefBrowser> browser)
{
auto handler = _browserControl->RequestHandler;
if (handler != nullptr)
{
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Add OnOpenUrlFromTab and OnRenderViewReady
2015-08-17 13:59:48 +10:00
handler->OnRenderViewReady(_browserControl, browserWrapper);
}
}
Add OnRenderProcessTerminated - Resolves issue #207
2014-06-12 14:16:39 +10:00
void ClientAdapter::OnRenderProcessTerminated(CefRefPtr<CefBrowser> browser, TerminationStatus status)
{
Start making the wrapper/callback naming consistent Change to using auto where possible
2015-06-11 11:21:55 +10:00
auto handler = _browserControl->RequestHandler;
Add OnRenderProcessTerminated - Resolves issue #207
2014-06-12 14:16:39 +10:00
if (handler != nullptr)
{
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Reduce the amount of code required to get the cached popup instance
2015-06-11 12:24:32 +10:00
handler->OnRenderProcessTerminated(_browserControl, browserWrapper, (CefTerminationStatus)status);
Use GetBrowserWrapper everywhere except popup creation/closing for all of ClientAdapter.cpp. This means that none of the callbacks need to own disposing the IBrowser^ instance.
2015-06-17 18:14:07 -04:00
}
Add OnRenderProcessTerminated - Resolves issue #207
2014-06-12 14:16:39 +10:00
}
Core - Add IRequestHandler.OnDocumentAvailableInMainFrame Resolves #3157
2020-06-26 14:06:17 +10:00
void ClientAdapter::OnDocumentAvailableInMainFrame(CefRefPtr<CefBrowser> browser)
{
auto handler = _browserControl->RequestHandler;
if (handler != nullptr)
{
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
handler->OnDocumentAvailableInMainFrame(_browserControl, browserWrapper);
}
}
IRequestHandler.GetAuthCredentials - Replace frame param with sourceUrl https://bitbucket.org/chromiumembedded/cef/commits/5e9ca096e0bbdbd6661df5d882082e3324237993
2019-07-18 20:25:39 +10:00
bool ClientAdapter::GetAuthCredentials(CefRefPtr<CefBrowser> browser, const CefString& originUrl, bool isProxy,
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
const CefString& host, int port, const CefString& realm, const CefString& scheme, CefRefPtr<CefAuthCallback> callback)
{
Expanded proxy support, made it easier to set proxy settings (#2007) - Added a ProxyOptions class - Added a CefSharpSettings.Proxy property - Made ClientAdapter::GetAuthCredentials take care of the authentication for the proxy
2017-04-12 02:43:11 +02:00
if (isProxy && CefSharpSettings::Proxy != nullptr && CefSharpSettings::Proxy->IP == StringUtils::ToClr(host) && CefSharpSettings::Proxy->HasUsernameAndPassword())
{
callback->Continue(StringUtils::ToNative(CefSharpSettings::Proxy->Username), StringUtils::ToNative(CefSharpSettings::Proxy->Password));
return true;
}
Start making the wrapper/callback naming consistent Change to using auto where possible
2015-06-11 11:21:55 +10:00
auto handler = _browserControl->RequestHandler;
Pedantic code cleanup - mostly just formatting and rearrange some if statements Fixed one minor issue with OnBeforeResourceLoad - wouldn't have been called for a popup if RequestHandler was null
2015-07-22 15:36:44 +10:00
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
if (handler == nullptr)
{
return false;
}
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
IRequestHandler.GetAuthCredentials - Replace frame param with sourceUrl https://bitbucket.org/chromiumembedded/cef/commits/5e9ca096e0bbdbd6661df5d882082e3324237993
2019-07-18 20:25:39 +10:00
auto callbackWrapper = gcnew CefAuthCallbackWrapper(callback);
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
Merge branch 'MorePopupHandlerWork' of https://github.com/rassilon/CefSharp
2015-06-11 09:45:55 +10:00
return handler->GetAuthCredentials(
IRequestHandler.GetAuthCredentials - Replace frame param with sourceUrl https://bitbucket.org/chromiumembedded/cef/commits/5e9ca096e0bbdbd6661df5d882082e3324237993
2019-07-18 20:25:39 +10:00
_browserControl, browserWrapper, StringUtils::ToClr(originUrl), isProxy,
Maintenance - Fixed formatting, file encoding, and copyright year (#2504) * Applied formatting * Fixed file encoding + Updated copyright year * Updated License * Fixed more file encoding * Copyright notice now shows the year the file was created
2018-09-10 02:41:13 +02:00
StringUtils::ToClr(host), port, StringUtils::ToClr(realm),
Merge branch 'MorePopupHandlerWork' of https://github.com/rassilon/CefSharp
2015-06-11 09:45:55 +10:00
StringUtils::ToClr(scheme), callbackWrapper);
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
}
Add IRequestHandler.OnSelectClientCertificate (#1878) * wip create hooks for onSelectClientCertificate * create interface and wrapper for callback * get certificate from CefCertificateList, convert to X509Certificate2, add them to X509CertificateCollection and return this to ClientAdapter * code review changes. Certificate selection in wrapper requires recreation of certificate in iteration * added certificate dialog selection to WinFormsRequestHandler. Used VS untabify to remove all the tabs and replaced it with spaces * missed updating a summary on ISelectClientCertificateCallback * code review changes
2016-12-12 15:48:15 -08:00
bool ClientAdapter::OnSelectClientCertificate(CefRefPtr<CefBrowser> browser, bool isProxy, const CefString& host,
Maintenance - Fixed formatting, file encoding, and copyright year (#2504) * Applied formatting * Fixed file encoding + Updated copyright year * Updated License * Fixed more file encoding * Copyright notice now shows the year the file was created
2018-09-10 02:41:13 +02:00
int port, const CefRequestHandler::X509CertificateList& certificates, CefRefPtr<CefSelectClientCertificateCallback> callback)
{
Add IRequestHandler.OnSelectClientCertificate (#1878) * wip create hooks for onSelectClientCertificate * create interface and wrapper for callback * get certificate from CefCertificateList, convert to X509Certificate2, add them to X509CertificateCollection and return this to ClientAdapter * code review changes. Certificate selection in wrapper requires recreation of certificate in iteration * added certificate dialog selection to WinFormsRequestHandler. Used VS untabify to remove all the tabs and replaced it with spaces * missed updating a summary on ISelectClientCertificateCallback * code review changes
2016-12-12 15:48:15 -08:00
auto handler = _browserControl->RequestHandler;
if (handler == nullptr)
{
return false;
}
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
auto list = gcnew X509Certificate2Collection();
Core - OnSelectClientCertificate copy certificate vector - Attempt to fix AccessViolationException by making a copy of the vector Issue #2948
2022-12-20 11:18:03 +10:00
// Create a copy of the vector in an attempt to fix #2948
CefRequestHandler::X509CertificateList certs;
Add IRequestHandler.OnSelectClientCertificate (#1878) * wip create hooks for onSelectClientCertificate * create interface and wrapper for callback * get certificate from CefCertificateList, convert to X509Certificate2, add them to X509CertificateCollection and return this to ClientAdapter * code review changes. Certificate selection in wrapper requires recreation of certificate in iteration * added certificate dialog selection to WinFormsRequestHandler. Used VS untabify to remove all the tabs and replaced it with spaces * missed updating a summary on ISelectClientCertificateCallback * code review changes
2016-12-12 15:48:15 -08:00
std::vector<CefRefPtr<CefX509Certificate> >::const_iterator it =
certificates.begin();
Maintenance - Fixed formatting, file encoding, and copyright year (#2504) * Applied formatting * Fixed file encoding + Updated copyright year * Updated License * Fixed more file encoding * Copyright notice now shows the year the file was created
2018-09-10 02:41:13 +02:00
for (; it != certificates.end(); ++it)
Add IRequestHandler.OnSelectClientCertificate (#1878) * wip create hooks for onSelectClientCertificate * create interface and wrapper for callback * get certificate from CefCertificateList, convert to X509Certificate2, add them to X509CertificateCollection and return this to ClientAdapter * code review changes. Certificate selection in wrapper requires recreation of certificate in iteration * added certificate dialog selection to WinFormsRequestHandler. Used VS untabify to remove all the tabs and replaced it with spaces * missed updating a summary on ISelectClientCertificateCallback * code review changes
2016-12-12 15:48:15 -08:00
{
auto bytes((*it)->GetDEREncoded());
auto byteSize = bytes->GetSize();
auto bufferByte = gcnew cli::array<Byte>(byteSize);
pin_ptr<Byte> src = &bufferByte[0]; // pin pointer to first element in arr
bytes->GetData(static_cast<void*>(src), byteSize, 0);
Maintenance - Fixed formatting, file encoding, and copyright year (#2504) * Applied formatting * Fixed file encoding + Updated copyright year * Updated License * Fixed more file encoding * Copyright notice now shows the year the file was created
2018-09-10 02:41:13 +02:00
auto cert = gcnew X509Certificate2(bufferByte);
Add IRequestHandler.OnSelectClientCertificate (#1878) * wip create hooks for onSelectClientCertificate * create interface and wrapper for callback * get certificate from CefCertificateList, convert to X509Certificate2, add them to X509CertificateCollection and return this to ClientAdapter * code review changes. Certificate selection in wrapper requires recreation of certificate in iteration * added certificate dialog selection to WinFormsRequestHandler. Used VS untabify to remove all the tabs and replaced it with spaces * missed updating a summary on ISelectClientCertificateCallback * code review changes
2016-12-12 15:48:15 -08:00
list->Add(cert);
Core - OnSelectClientCertificate copy certificate vector - Attempt to fix AccessViolationException by making a copy of the vector Issue #2948
2022-12-20 11:18:03 +10:00
certs.push_back(*it);
Add IRequestHandler.OnSelectClientCertificate (#1878) * wip create hooks for onSelectClientCertificate * create interface and wrapper for callback * get certificate from CefCertificateList, convert to X509Certificate2, add them to X509CertificateCollection and return this to ClientAdapter * code review changes. Certificate selection in wrapper requires recreation of certificate in iteration * added certificate dialog selection to WinFormsRequestHandler. Used VS untabify to remove all the tabs and replaced it with spaces * missed updating a summary on ISelectClientCertificateCallback * code review changes
2016-12-12 15:48:15 -08:00
}
Core - OnSelectClientCertificate copy certificate vector - Attempt to fix AccessViolationException by making a copy of the vector Issue #2948
2022-12-20 11:18:03 +10:00
auto callbackWrapper = gcnew CefCertificateCallbackWrapper(callback, certs);
Add IRequestHandler.OnSelectClientCertificate (#1878) * wip create hooks for onSelectClientCertificate * create interface and wrapper for callback * get certificate from CefCertificateList, convert to X509Certificate2, add them to X509CertificateCollection and return this to ClientAdapter * code review changes. Certificate selection in wrapper requires recreation of certificate in iteration * added certificate dialog selection to WinFormsRequestHandler. Used VS untabify to remove all the tabs and replaced it with spaces * missed updating a summary on ISelectClientCertificateCallback * code review changes
2016-12-12 15:48:15 -08:00
return handler->OnSelectClientCertificate(
_browserControl, browserWrapper, isProxy,
StringUtils::ToClr(host), port, list, callbackWrapper);
}
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
void ClientAdapter::OnBeforeContextMenu(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame,
CefRefPtr<CefContextMenuParams> params, CefRefPtr<CefMenuModel> model)
{
Start making the wrapper/callback naming consistent Change to using auto where possible
2015-06-11 11:21:55 +10:00
auto handler = _browserControl->MenuHandler;
Maintenance - Fixed formatting, file encoding, and copyright year (#2504) * Applied formatting * Fixed file encoding + Updated copyright year * Updated License * Fixed more file encoding * Copyright notice now shows the year the file was created
2018-09-10 02:41:13 +02:00
Add IMenuModel Refactor to reflect actual underlying Cef Model (Remove return bool)
2015-08-17 13:33:27 +10:00
if (handler != nullptr)
Remove old code comment
2014-11-05 12:10:04 +10:00
{
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Add IMenuModel Refactor to reflect actual underlying Cef Model (Remove return bool)
2015-08-17 13:33:27 +10:00
CefFrameWrapper frameWrapper(frame);
CefContextMenuParamsWrapper contextMenuParamsWrapper(params);
CefMenuModelWrapper menuModelWrapper(model);
Maintenance - Fixed formatting, file encoding, and copyright year (#2504) * Applied formatting * Fixed file encoding + Updated copyright year * Updated License * Fixed more file encoding * Copyright notice now shows the year the file was created
2018-09-10 02:41:13 +02:00
Add IMenuModel Refactor to reflect actual underlying Cef Model (Remove return bool)
2015-08-17 13:33:27 +10:00
handler->OnBeforeContextMenu(_browserControl, browserWrapper, %frameWrapper, %contextMenuParamsWrapper, %menuModelWrapper);
Maintenance - Fixed formatting, file encoding, and copyright year (#2504) * Applied formatting * Fixed file encoding + Updated copyright year * Updated License * Fixed more file encoding * Copyright notice now shows the year the file was created
2018-09-10 02:41:13 +02:00
}
Add OnContextMenuCommand and OnContextMenuDismissed handlers
2015-08-17 13:40:56 +10:00
}
bool ClientAdapter::OnContextMenuCommand(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame,
Maintenance - Fixed formatting, file encoding, and copyright year (#2504) * Applied formatting * Fixed file encoding + Updated copyright year * Updated License * Fixed more file encoding * Copyright notice now shows the year the file was created
2018-09-10 02:41:13 +02:00
CefRefPtr<CefContextMenuParams> params, int commandId, EventFlags eventFlags)
Add OnContextMenuCommand and OnContextMenuDismissed handlers
2015-08-17 13:40:56 +10:00
{
auto handler = _browserControl->MenuHandler;
Maintenance - Fixed formatting, file encoding, and copyright year (#2504) * Applied formatting * Fixed file encoding + Updated copyright year * Updated License * Fixed more file encoding * Copyright notice now shows the year the file was created
2018-09-10 02:41:13 +02:00
Add OnContextMenuCommand and OnContextMenuDismissed handlers
2015-08-17 13:40:56 +10:00
if (handler != nullptr)
{
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Add OnContextMenuCommand and OnContextMenuDismissed handlers
2015-08-17 13:40:56 +10:00
CefFrameWrapper frameWrapper(frame);
CefContextMenuParamsWrapper contextMenuParamsWrapper(params);
Maintenance - Fixed formatting, file encoding, and copyright year (#2504) * Applied formatting * Fixed file encoding + Updated copyright year * Updated License * Fixed more file encoding * Copyright notice now shows the year the file was created
2018-09-10 02:41:13 +02:00
Add OnContextMenuCommand and OnContextMenuDismissed handlers
2015-08-17 13:40:56 +10:00
return handler->OnContextMenuCommand(_browserControl, browserWrapper, %frameWrapper, %contextMenuParamsWrapper,
Strongly type commandId Add example of using custom menu id numbers
2015-08-31 11:36:49 +10:00
(CefMenuCommand)commandId, (CefEventFlags)eventFlags);
Add OnContextMenuCommand and OnContextMenuDismissed handlers
2015-08-17 13:40:56 +10:00
}
Add missing return
2015-09-01 21:56:17 +10:00
return false;
Add OnContextMenuCommand and OnContextMenuDismissed handlers
2015-08-17 13:40:56 +10:00
}
Maintenance - Fixed formatting, file encoding, and copyright year (#2504) * Applied formatting * Fixed file encoding + Updated copyright year * Updated License * Fixed more file encoding * Copyright notice now shows the year the file was created
2018-09-10 02:41:13 +02:00
Add OnContextMenuCommand and OnContextMenuDismissed handlers
2015-08-17 13:40:56 +10:00
void ClientAdapter::OnContextMenuDismissed(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame)
{
auto handler = _browserControl->MenuHandler;
Maintenance - Fixed formatting, file encoding, and copyright year (#2504) * Applied formatting * Fixed file encoding + Updated copyright year * Updated License * Fixed more file encoding * Copyright notice now shows the year the file was created
2018-09-10 02:41:13 +02:00
Add OnContextMenuCommand and OnContextMenuDismissed handlers
2015-08-17 13:40:56 +10:00
if (handler != nullptr)
{
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Add OnContextMenuCommand and OnContextMenuDismissed handlers
2015-08-17 13:40:56 +10:00
CefFrameWrapper frameWrapper(frame);
Maintenance - Fixed formatting, file encoding, and copyright year (#2504) * Applied formatting * Fixed file encoding + Updated copyright year * Updated License * Fixed more file encoding * Copyright notice now shows the year the file was created
2018-09-10 02:41:13 +02:00
Add OnContextMenuCommand and OnContextMenuDismissed handlers
2015-08-17 13:40:56 +10:00
handler->OnContextMenuDismissed(_browserControl, browserWrapper, %frameWrapper);
}
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
}
Add IContextMenuHandler.RunContextMenu
2015-10-12 08:03:50 +10:00
bool ClientAdapter::RunContextMenu(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefContextMenuParams> params, CefRefPtr<CefMenuModel> model, CefRefPtr<CefRunContextMenuCallback> callback)
{
auto handler = _browserControl->MenuHandler;
if (handler == nullptr)
{
return false;
}
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Add IContextMenuHandler.RunContextMenu
2015-10-12 08:03:50 +10:00
CefFrameWrapper frameWrapper(frame);
CefContextMenuParamsWrapper contextMenuParamsWrapper(params);
CefMenuModelWrapper menuModelWrapper(model);
auto callbackWrapper = gcnew CefRunContextMenuCallbackWrapper(callback);
return handler->RunContextMenu(_browserControl, browserWrapper, %frameWrapper, %contextMenuParamsWrapper, %menuModelWrapper, callbackWrapper);
}
Add OnGotFocus and OnSetFocus Add CefFocusSource enum for mapping from cef_focus_source_t enum
2014-04-29 11:51:56 +10:00
void ClientAdapter::OnGotFocus(CefRefPtr<CefBrowser> browser)
{
Start making the wrapper/callback naming consistent Change to using auto where possible
2015-06-11 11:21:55 +10:00
auto handler = _browserControl->FocusHandler;
Added IFocusHandler and WinForms example.
2014-11-25 22:29:35 +11:00
if (handler == nullptr)
Untabify
2014-11-25 22:33:12 +11:00
{
return;
}
Added IFocusHandler and WinForms example.
2014-11-25 22:29:35 +11:00
IDownloadHandler - Add IWebBrowser param to methods Resolves #2470
2018-07-24 12:38:45 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
IFocusHandler - Add IWebBrowser and IBrowser Params IFocusHandler methods are now called for popups, use browser.IsPopup to differentiate DefaultFocusHandler has been updated accordingly Resolves #2468
2018-07-24 12:26:04 +10:00
IDownloadHandler - Add IWebBrowser param to methods Resolves #2470
2018-07-24 12:38:45 +10:00
handler->OnGotFocus(_browserControl, browserWrapper);
Add OnGotFocus and OnSetFocus Add CefFocusSource enum for mapping from cef_focus_source_t enum
2014-04-29 11:51:56 +10:00
}
Added IFocusHandler and WinForms example.
2014-11-25 22:29:35 +11:00
bool ClientAdapter::OnSetFocus(CefRefPtr<CefBrowser> browser, FocusSource source)
Add OnGotFocus and OnSetFocus Add CefFocusSource enum for mapping from cef_focus_source_t enum
2014-04-29 11:51:56 +10:00
{
Start making the wrapper/callback naming consistent Change to using auto where possible
2015-06-11 11:21:55 +10:00
auto handler = _browserControl->FocusHandler;
Move Focus methods from IWebBrowserInternal to IWinFormsWebBrowser and only call them in the context of the WinForms ChromiumWebBrowser
2014-07-09 11:37:10 +10:00
Added IFocusHandler and WinForms example.
2014-11-25 22:29:35 +11:00
if (handler == nullptr)
Untabify
2014-11-25 22:33:12 +11:00
{
// Allow the focus to be set by default.
return false;
}
Added IFocusHandler and WinForms example.
2014-11-25 22:29:35 +11:00
Untabify ClientAdapter.cpp
2018-08-07 20:30:03 +10:00
//For DevTools (which is hosted as a popup) OnSetFocus is called before OnAfterCreated so we don't
// have a reference to the standard popup IBrowser wrapper, so we just pass a
// short term reference.
Core - Consistent C++ naming - Following the adapter/wrapper naming scheme - Moved classes to internals that aren't public facing Resolves #1005
2020-04-06 06:50:32 +10:00
CefBrowserWrapper browserWrapper(browser);
IFocusHandler - Add IWebBrowser and IBrowser Params IFocusHandler methods are now called for popups, use browser.IsPopup to differentiate DefaultFocusHandler has been updated accordingly Resolves #2468
2018-07-24 12:26:04 +10:00
ClientAdapter::OnSetFocus - When DevTools is opened, OnSetFocus is called before OnAfterCreated The causes GetBrowserWrapper to return null when DevTools is opened, for now we'll just create the wrapper and pass it directly (wrapper is disposed when it goes out of scope).
2018-08-07 19:10:58 +10:00
return handler->OnSetFocus(_browserControl, %browserWrapper, (CefFocusSource)source);
Add OnGotFocus and OnSetFocus Add CefFocusSource enum for mapping from cef_focus_source_t enum
2014-04-29 11:51:56 +10:00
}
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
void ClientAdapter::OnTakeFocus(CefRefPtr<CefBrowser> browser, bool next)
{
Start making the wrapper/callback naming consistent Change to using auto where possible
2015-06-11 11:21:55 +10:00
auto handler = _browserControl->FocusHandler;
Added IFocusHandler and WinForms example.
2014-11-25 22:29:35 +11:00
if (handler == nullptr)
Untabify
2014-11-25 22:33:12 +11:00
{
return;
}
Added IFocusHandler and WinForms example.
2014-11-25 22:29:35 +11:00
IDownloadHandler - Add IWebBrowser param to methods Resolves #2470
2018-07-24 12:38:45 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
IFocusHandler - Add IWebBrowser and IBrowser Params IFocusHandler methods are now called for popups, use browser.IsPopup to differentiate DefaultFocusHandler has been updated accordingly Resolves #2468
2018-07-24 12:26:04 +10:00
IDownloadHandler - Add IWebBrowser param to methods Resolves #2470
2018-07-24 12:38:45 +10:00
handler->OnTakeFocus(_browserControl, browserWrapper, next);
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
}
NPAPI Plugin methods removed from API cef_runnable.h has been removed Update IJsDialogHandler.OnJSDialog - acceptLang removed from API
2016-05-30 07:57:48 +10:00
bool ClientAdapter::OnJSDialog(CefRefPtr<CefBrowser> browser, const CefString& origin_url,
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
JSDialogType dialog_type, const CefString& message_text, const CefString& default_prompt_text,
CefRefPtr<CefJSDialogCallback> callback, bool& suppress_message)
{
Rewrite OnJSDialog so now matches the `Cef API`, whilst I understand that the ideal of having the types split into different methods was nice from a user point of view, I think we kept functionality from users that was exposed. So the callback wrapper has been added so can now be executed async. SuppressMessage is now possible. Fixes #999
2015-05-07 12:53:36 +10:00
auto handler = _browserControl->JsDialogHandler;
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
if (handler == nullptr)
{
return false;
}
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Rename callback wrappers to bring them inline with the new ones
2015-06-05 15:44:25 +10:00
auto callbackWrapper = gcnew CefJSDialogCallbackWrapper(callback);
Use GetBrowserWrapper everywhere except popup creation/closing for all of ClientAdapter.cpp. This means that none of the callbacks need to own disposing the IBrowser^ instance.
2015-06-17 18:14:07 -04:00
return handler->OnJSDialog(_browserControl, browserWrapper,
Maintenance - Fixed formatting, file encoding, and copyright year (#2504) * Applied formatting * Fixed file encoding + Updated copyright year * Updated License * Fixed more file encoding * Copyright notice now shows the year the file was created
2018-09-10 02:41:13 +02:00
StringUtils::ToClr(origin_url), (CefJsDialogType)dialog_type,
StringUtils::ToClr(message_text), StringUtils::ToClr(default_prompt_text), callbackWrapper, suppress_message);
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
}
Added support for overriding file browse dialogs by implementing the cef DialogHandler
2014-04-29 13:31:39 +01:00
Simple Fix to OnBefore Unload Added is_Reloaded
2014-12-25 21:54:09 -06:00
bool ClientAdapter::OnBeforeUnloadDialog(CefRefPtr<CefBrowser> browser, const CefString& message_text, bool is_reload, CefRefPtr<CefJSDialogCallback> callback)
Extend IJsDialogHandler To Include OnBeforeUnload Dialog Messages Extended IJsDialogHandler to catch on exit Javascript Dialog messages.
2014-12-25 14:07:42 -06:00
{
Start making the wrapper/callback naming consistent Change to using auto where possible
2015-06-11 11:21:55 +10:00
auto handler = _browserControl->JsDialogHandler;
Extend IJsDialogHandler To Include OnBeforeUnload Dialog Messages Extended IJsDialogHandler to catch on exit Javascript Dialog messages.
2014-12-25 14:07:42 -06:00
if (handler == nullptr)
{
return false;
}
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Rename callback wrappers to bring them inline with the new ones
2015-06-05 15:44:25 +10:00
auto callbackWrapper = gcnew CefJSDialogCallbackWrapper(callback);
Extend IJsDialogHandler To Include OnBeforeUnload Dialog Messages Extended IJsDialogHandler to catch on exit Javascript Dialog messages.
2014-12-25 14:07:42 -06:00
IJsDialogHandler - Rename OnJSBeforeUnload to OnBeforeUnloadDialog Also fix xml doc Resolves #2523
2018-09-25 20:56:31 +10:00
return handler->OnBeforeUnloadDialog(_browserControl, browserWrapper, StringUtils::ToClr(message_text), is_reload, callbackWrapper);
Extend IJsDialogHandler To Include OnBeforeUnload Dialog Messages Extended IJsDialogHandler to catch on exit Javascript Dialog messages.
2014-12-25 14:07:42 -06:00
}
Add OnResetDialogState and OnDialogClosed to IJsDialogHandler
2015-08-17 13:16:45 +10:00
void ClientAdapter::OnResetDialogState(CefRefPtr<CefBrowser> browser)
{
auto handler = _browserControl->JsDialogHandler;
if (handler != nullptr)
{
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Add OnResetDialogState and OnDialogClosed to IJsDialogHandler
2015-08-17 13:16:45 +10:00
handler->OnResetDialogState(_browserControl, browserWrapper);
}
}
void ClientAdapter::OnDialogClosed(CefRefPtr<CefBrowser> browser)
{
auto handler = _browserControl->JsDialogHandler;
if (handler != nullptr)
{
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Add OnResetDialogState and OnDialogClosed to IJsDialogHandler
2015-08-17 13:16:45 +10:00
handler->OnDialogClosed(_browserControl, browserWrapper);
}
}
Fix formatting, indentation (spaces not tabs) and column wrapping.
2014-06-02 15:21:47 +10:00
bool ClientAdapter::OnFileDialog(CefRefPtr<CefBrowser> browser, FileDialogMode mode, const CefString& title,
Update IDialogHandler.OnFileDialog method declaration CEF is now using Chrome file dialogs on all platforms and runtimes, this brings a number of fixes and also some API changes. - The selectedAcceptFilter filter arg has now been removed - The CefFileDialogFlags enum has been removed as CEF no longer supports these options This is a breaking change. Issue #4110
2022-05-17 19:51:08 +10:00
const CefString& default_file_path, const std::vector<CefString>& accept_filters,
Maintenance - Fixed formatting, file encoding, and copyright year (#2504) * Applied formatting * Fixed file encoding + Updated copyright year * Updated License * Fixed more file encoding * Copyright notice now shows the year the file was created
2018-09-10 02:41:13 +02:00
CefRefPtr<CefFileDialogCallback> callback)
Fix formatting, indentation (spaces not tabs) and column wrapping.
2014-06-02 15:21:47 +10:00
{
Start making the wrapper/callback naming consistent Change to using auto where possible
2015-06-11 11:21:55 +10:00
auto handler = _browserControl->DialogHandler;
Fix formatting, indentation (spaces not tabs) and column wrapping.
2014-06-02 15:21:47 +10:00
if (handler == nullptr)
{
return false;
}
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Add CefFileDialogCallbackWrapper
2015-06-01 16:27:42 +10:00
auto callbackWrapper = gcnew CefFileDialogCallbackWrapper(callback);
Fix formatting, indentation (spaces not tabs) and column wrapping.
2014-06-02 15:21:47 +10:00
Split CefFileDialogMode into CefFileDialogMode and CefFileDialogFlags
2018-02-18 22:12:59 +01:00
return handler->OnFileDialog(
_browserControl,
browserWrapper,
Update IDialogHandler.OnFileDialog method declaration CEF is now using Chrome file dialogs on all platforms and runtimes, this brings a number of fixes and also some API changes. - The selectedAcceptFilter filter arg has now been removed - The CefFileDialogFlags enum has been removed as CEF no longer supports these options This is a breaking change. Issue #4110
2022-05-17 19:51:08 +10:00
(CefFileDialogMode)mode,
Split CefFileDialogMode into CefFileDialogMode and CefFileDialogFlags
2018-02-18 22:12:59 +01:00
StringUtils::ToClr(title),
StringUtils::ToClr(default_file_path),
StringUtils::ToClr(accept_filters),
callbackWrapper);
Fix formatting, indentation (spaces not tabs) and column wrapping.
2014-06-02 15:21:47 +10:00
}
Implement Drag Handler Trying to learn how to Implement a feature for Dragging Objects into CefSharp
2014-11-28 08:42:20 -06:00
Spacing Corrections Spacing corrections
2014-11-28 11:32:27 -06:00
bool ClientAdapter::OnDragEnter(CefRefPtr<CefBrowser> browser, CefRefPtr<CefDragData> dragData, DragOperationsMask mask)
{
Start making the wrapper/callback naming consistent Change to using auto where possible
2015-06-11 11:21:55 +10:00
auto handler = _browserControl->DragHandler;
Spacing Corrections Spacing corrections
2014-11-28 11:32:27 -06:00
if (handler == nullptr)
{
Re-add params to IDragHandler Re-add DragOperationsMask
2014-11-30 08:35:31 +10:00
return false;
Spacing Corrections Spacing corrections
2014-11-28 11:32:27 -06:00
}
Refactor CefSharp.Core into CefSharp.Core.Runtime (#3311) * Net Core - Rename CefSharp.Core.dll to CefSharp.Core.Runtime.dll Partial rename, only Net Core, folder not renamed * Net Core - Rename CefSharp.Core.RefAssembly to CefSharp.Core.netcore Remove GenApi * Core - Rename CefDragDataWrapper to DragData Move into CefSharp.Core namespace * WinForms/WPF/OffScreen - Migrate from GitLink command line to Nuget package * Net Core - Refactor to have CefSharp.Core.dll contain only public Api * Net Core - Remove CefSharp.Core.RefAssembly * Net Core - Change CefSharp.Core.netcore output folder * Net Core - Restructure nuget packages * Net Core - Add Cefsharp.Core.Runtime.RefAssembly * Net Core - Hide CLI/C++ classes from intellisense Make sure users don't attempt to load them directly * Rename CefSharp.Core to CefSharp.Core.Runtime * Core - Restructure Net 4.5.2 packages to use CefSharp.Core.dll anycpu variant Attempt to load CefSharp.Core.Runtime at runtime rather than having to use msbuild to copy the correct version * Rename CefSharp.Core.netcore to CefSharp.Core * WPF/WinForms/OffScreen - Change from x86/64 to AnyCPU As they are all managed assemblies they can target AnyCPU. Includes CefSharp.dll * Convert RequestContextBuilder from C++ to C# Now part of the CefSharp.Core PublicApi * Update version number to 87.1.11 * Migrate more of the public Api to C# * Net Core - Basic restructure complete * Net Core - ModuleInitializer (Doesn't work yet) * Remove direct references to BrowserSettings * Net Core - ModuleInitializer load CefShar.Core.Runtime.dl * Net Core - Load libcef.dll via CLR Module initializer If no RID is specified then we can load libcef.dll using the module initializer * Add version to CefSharp.Core * Remove dependency on CefSharp.Core.Runtime Rewrite common targets * AnyCPU app.config transform Improve AnyCPU support * Improve Net Core 3 support Only delete CefSharp.Core.Runtime.dll when AnyCPU * Nuget - Add CefSharp.Core.Runtime reference when TargetFramework = NetCore * Fix Typos Based on #3306 * Net Core - Rename CefSharp.Core.Runtime RefAssembly source file * Net Full - Generate CefSharp.Core.Runtime Ref Assembly For now the powershell build script generates the .cs file based on a x86 release build.ps1 It's not possible to directly install GenApi as it requires a Sdk style project * Net Core - Old packages copy files to required folders * Test - Install newer .Net Compiler and set Lang Version to 7.3 * Net Core - Exclude Net 452 Runtime generated reference source * Core - Add Refactoring TODO * Ref Assembly - Generate source as part of build - Move ref assembly source generate into GenerateRefAssemblySource.ps1 - Call before project build Runs locally, see if Appveyor has a problem with the powershell script execution * Core - Add more factory methods to create instances of managed wrappers * Net Core - Make Initialzier properties internal Not quite sure what the public API should look like as yet, so making internal for now.
2020-12-16 10:47:34 +10:00
DragData dragDataWrapper(dragData);
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
First attempt at implementing CefDragDataWrapper which provides a clr wrapper around CefDragData
2014-12-08 22:08:38 +10:00
WPF/OffScreen - Code cleanup and minor refactor IRenderWebBrowser - Method naming now matches CEF, xmldoc updated to be more accurate CefSharp.Wpf.ChromiumWebBrowser and CefSharp.OffScreen.ChromiumWebBrowser both updated as a result of IRenderWebBrowser changes Should be minimal public API changes, should only require changes for those that are implementing their own rendering, who will have a major rewrite on their hands regardless of this.
2018-04-20 13:33:08 +10:00
return handler->OnDragEnter(_browserControl, browserWrapper, %dragDataWrapper, (CefSharp::Enums::DragOperationsMask)mask);
Spacing Corrections Spacing corrections
2014-11-28 11:32:27 -06:00
}
Implement CefGeolocationHandler::OnRequestGeolocationPermission delegating the request to a CefSharp.IGeolocationHandler implementation. This allows CefSharp to permit geolocation requests.
2015-01-26 14:16:46 -08:00
Initial version 75 upgrade and NetworkService changes Compiles, that's about it at this point, there are major CEF breaking changes, and lots to be addressed. Browser Process (main process) - Removed IResourceHandlerFactory as it no longer fits with the structure that CEF provides - New IResourceRequestHandler interface added, not plumbed in yet - CefSettings - Add RootCachePath and ApplicationClientIdForFileScanning BrowserSubprocess (render process) - SendProcessMessage was moved from CefBrowser to CefFrame - OnBrowserCreated added extraInfo param The BrowserSubprocess changes for this upgrade should be complete
2019-06-11 12:29:57 +10:00
void ClientAdapter::OnDraggableRegionsChanged(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, const std::vector<CefDraggableRegion>& regions)
Add `IDragHandler.OnDraggableRegionsChanged`
2015-10-12 07:16:33 +10:00
{
auto handler = _browserControl->DragHandler;
if (handler != nullptr)
{
auto regionsList = TypeConversion::FromNative(regions);
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Initial version 75 upgrade and NetworkService changes Compiles, that's about it at this point, there are major CEF breaking changes, and lots to be addressed. Browser Process (main process) - Removed IResourceHandlerFactory as it no longer fits with the structure that CEF provides - New IResourceRequestHandler interface added, not plumbed in yet - CefSettings - Add RootCachePath and ApplicationClientIdForFileScanning BrowserSubprocess (render process) - SendProcessMessage was moved from CefBrowser to CefFrame - OnBrowserCreated added extraInfo param The BrowserSubprocess changes for this upgrade should be complete
2019-06-11 12:29:57 +10:00
CefFrameWrapper frameWrapper(frame);
Add `IDragHandler.OnDraggableRegionsChanged`
2015-10-12 07:16:33 +10:00
Initial version 75 upgrade and NetworkService changes Compiles, that's about it at this point, there are major CEF breaking changes, and lots to be addressed. Browser Process (main process) - Removed IResourceHandlerFactory as it no longer fits with the structure that CEF provides - New IResourceRequestHandler interface added, not plumbed in yet - CefSettings - Add RootCachePath and ApplicationClientIdForFileScanning BrowserSubprocess (render process) - SendProcessMessage was moved from CefBrowser to CefFrame - OnBrowserCreated added extraInfo param The BrowserSubprocess changes for this upgrade should be complete
2019-06-11 12:29:57 +10:00
return handler->OnDraggableRegionsChanged(_browserControl, browserWrapper, %frameWrapper, regionsList);
Add `IDragHandler.OnDraggableRegionsChanged`
2015-10-12 07:16:33 +10:00
}
}
Core - Add IDownloadHandler.CanDownload - Add IDownloadHandler.CanDownload - Add to Fluent implementation - Update examples https://bitbucket.org/chromiumembedded/cef/commits/6d7a6801871cd4fcceb174dfa99a5b46da6253c1 Resolves #4090
2022-05-05 12:37:44 +10:00
bool ClientAdapter::CanDownload(CefRefPtr<CefBrowser> browser, const CefString& url, const CefString& request_method)
{
auto handler = _browserControl->DownloadHandler;
if (handler == nullptr)
{
return true;
}
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
return handler->CanDownload(_browserControl, browserWrapper, StringUtils::ToClr(url), StringUtils::ToClr(request_method));
}
Merge DownloadAdapter code into ClientAdapter - now consistent with other handler code Resolves the issue of passing in the browserAdapter instance
2015-06-01 10:49:14 +10:00
void ClientAdapter::OnBeforeDownload(CefRefPtr<CefBrowser> browser, CefRefPtr<CefDownloadItem> download_item,
const CefString& suggested_name, CefRefPtr<CefBeforeDownloadCallback> callback)
{
auto handler = _browserControl->DownloadHandler;
Maintenance - Fixed formatting, file encoding, and copyright year (#2504) * Applied formatting * Fixed file encoding + Updated copyright year * Updated License * Fixed more file encoding * Copyright notice now shows the year the file was created
2018-09-10 02:41:13 +02:00
if (handler != nullptr)
Merge DownloadAdapter code into ClientAdapter - now consistent with other handler code Resolves the issue of passing in the browserAdapter instance
2015-06-01 10:49:14 +10:00
{
auto downloadItem = TypeConversion::FromNative(download_item);
downloadItem->SuggestedFileName = StringUtils::ToClr(suggested_name);
Add CefBeforeDownloadCallbackWrapper
2015-06-01 11:48:12 +10:00
auto callbackWrapper = gcnew CefBeforeDownloadCallbackWrapper(callback);
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Add CefBeforeDownloadCallbackWrapper
2015-06-01 11:48:12 +10:00
IDownloadHandler - Add IWebBrowser param to methods Resolves #2470
2018-07-24 12:38:45 +10:00
handler->OnBeforeDownload(_browserControl, browserWrapper, downloadItem, callbackWrapper);
Merge DownloadAdapter code into ClientAdapter - now consistent with other handler code Resolves the issue of passing in the browserAdapter instance
2015-06-01 10:49:14 +10:00
}
};
void ClientAdapter::OnDownloadUpdated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefDownloadItem> download_item,
CefRefPtr<CefDownloadItemCallback> callback)
{
auto handler = _browserControl->DownloadHandler;
Maintenance - Fixed formatting, file encoding, and copyright year (#2504) * Applied formatting * Fixed file encoding + Updated copyright year * Updated License * Fixed more file encoding * Copyright notice now shows the year the file was created
2018-09-10 02:41:13 +02:00
if (handler != nullptr)
Merge DownloadAdapter code into ClientAdapter - now consistent with other handler code Resolves the issue of passing in the browserAdapter instance
2015-06-01 10:49:14 +10:00
{
Start making the wrapper/callback naming consistent Change to using auto where possible
2015-06-11 11:21:55 +10:00
auto callbackWrapper = gcnew CefDownloadItemCallbackWrapper(callback);
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Start making the wrapper/callback naming consistent Change to using auto where possible
2015-06-11 11:21:55 +10:00
IDownloadHandler - Add IWebBrowser param to methods Resolves #2470
2018-07-24 12:38:45 +10:00
handler->OnDownloadUpdated(_browserControl, browserWrapper, TypeConversion::FromNative(download_item), callbackWrapper);
Merge DownloadAdapter code into ClientAdapter - now consistent with other handler code Resolves the issue of passing in the browserAdapter instance
2015-06-01 10:49:14 +10:00
}
}
added process message handlers and code to call them on both sides
2015-06-27 17:01:51 +02:00
Implement IFindHandler Resolves #1459
2016-03-07 12:44:49 +10:00
void ClientAdapter::OnFindResult(CefRefPtr<CefBrowser> browser, int identifier, int count, const CefRect& selectionRect, int activeMatchOrdinal, bool finalUpdate)
{
auto handler = _browserControl->FindHandler;
if (handler != nullptr)
{
auto rect = Rect(selectionRect.x, selectionRect.y, selectionRect.width, selectionRect.height);
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Implement IFindHandler Resolves #1459
2016-03-07 12:44:49 +10:00
handler->OnFindResult(_browserControl, browserWrapper, identifier, count, rect, activeMatchOrdinal, finalUpdate);
Add IAudioHandler (#2727) * Feature Request - Add IAudioHandler - For performance reasons we return NULL if no audiohandler is assigned - No example is provided currently Initial implementation for #2714
2019-05-03 12:54:40 +10:00
}
}
Core - Re-Add IAudioHandler (#3153) Resolves #3152
2020-07-08 08:06:16 +10:00
bool ClientAdapter::GetAudioParameters(CefRefPtr<CefBrowser> browser, CefAudioParameters & params)
{
auto handler = _browserControl->AudioHandler;
if (handler == nullptr)
{
return false;
}
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
auto parameters = new AudioParameters((CefSharp::Enums::ChannelLayout)params.channel_layout, params.sample_rate, params.frames_per_buffer);
auto result = handler->GetAudioParameters(_browserControl, browserWrapper, *parameters);
if (result)
{
params.channel_layout = (cef_channel_layout_t)parameters->ChannelLayout;
params.sample_rate = parameters->SampleRate;
params.frames_per_buffer = parameters->FramesPerBuffer;
}
return result;
}
void ClientAdapter::OnAudioStreamStarted(CefRefPtr<CefBrowser> browser, const CefAudioParameters& params, int channels)
{
auto handler = _browserControl->AudioHandler;
if (handler != nullptr)
{
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
AudioParameters parameters((CefSharp::Enums::ChannelLayout)params.channel_layout, params.sample_rate, params.frames_per_buffer);
handler->OnAudioStreamStarted(_browserControl, browserWrapper, parameters, channels);
}
}
Core - Change from cef type defs to C++11 defs https://bitbucket.org/chromiumembedded/cef/commits/5042d7140822cd13b80990f61ce2d3865864a3d8
2023-07-16 06:32:58 +10:00
void ClientAdapter::OnAudioStreamPacket(CefRefPtr<CefBrowser> browser, const float** data, int frames, int64_t pts)
Core - Re-Add IAudioHandler (#3153) Resolves #3152
2020-07-08 08:06:16 +10:00
{
auto handler = _browserControl->AudioHandler;
if (handler != nullptr)
{
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
handler->OnAudioStreamPacket(_browserControl, browserWrapper, IntPtr((void *)data), frames, pts);
}
}
void ClientAdapter::OnAudioStreamStopped(CefRefPtr<CefBrowser> browser)
{
auto handler = _browserControl->AudioHandler;
if (handler != nullptr)
{
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
handler->OnAudioStreamStopped(_browserControl, browserWrapper);
}
}
void ClientAdapter::OnAudioStreamError(CefRefPtr<CefBrowser> browser, const CefString& message)
{
auto handler = _browserControl->AudioHandler;
if (handler != nullptr)
{
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
handler->OnAudioStreamError(_browserControl, browserWrapper, StringUtils::ToClr(message));
}
}
Core - Add IFrameHandler (#3757) * Core - Add IFrameHandler/FrameHandler * Update comments
2021-09-03 12:13:42 +02:00
void ClientAdapter::OnFrameCreated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame)
{
auto handler = _browserControl->FrameHandler;
if (handler != nullptr)
{
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Core - OnFrameCreated/OnFrameAttached/OnFrameDetached allocate IFrame on managed heap - Previously they were stack allocated and disposed when out of scope, they're now managed heap allocated to allow for users to keep a long lived reference. FrameHandler still needs to be updated to deal with Disposing of the references. Follow up to #3757 Issue #3588
2021-09-03 20:21:22 +10:00
auto frameWrapper = gcnew CefFrameWrapper(frame);
Core - Add IFrameHandler (#3757) * Core - Add IFrameHandler/FrameHandler * Update comments
2021-09-03 12:13:42 +02:00
Core - ClientAdapter improve HasParent checks (#4443) * Core - Improve ClientAdapter::GetBrowserWrapper logic Simplify the logic - For non popup return immediately (most common scenario) - Check for IBrowser instance for matching popup - Check for HasParent and return the browser Instance - Return nullptr if no matching IBrowser wrapper found * Core - ClientAdapter::OnFrameCreated called before OnAfterCreated - The very first call to ClientAdapter::OnFrameCreated happens before OnAfterCreated leaving us with a IBrowser instance that's null Create an IBrowser instance that's scoped to the method call * Core - ClientAdapter improve HasParent checks - HasParent check has now been replaced with IsHostedBrowser which has additional check to make sure the internal IWebBrowser.Set* methods are only called for a IBrowser instance that's directly associated with a ChromiumWebBrowser instance This resolves issues with DevTools being opened for a popup hosted in a ChromiumWebBrowser instance. Related discussion https://github.com/cefsharp/CefSharp/discussions/4438
2023-04-01 18:58:27 +10:00
if (browserWrapper == nullptr)
{
// Very first OnFrameCreated called may happen before OnAfterCreated
// so we have to create a new wrapper that's lifespan is scoped to this single call.
CefBrowserWrapper browserWrapper(browser);
handler->OnFrameCreated(_browserControl, %browserWrapper, frameWrapper);
}
else
{
handler->OnFrameCreated(_browserControl, browserWrapper, frameWrapper);
}
Core - Add IFrameHandler (#3757) * Core - Add IFrameHandler/FrameHandler * Update comments
2021-09-03 12:13:42 +02:00
}
}
Core - IFrameHandler.OnFrameAttached add reattached param Resolves #3816
2021-09-20 11:51:10 +10:00
void ClientAdapter::OnFrameAttached(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, bool reattached)
Core - Add IFrameHandler (#3757) * Core - Add IFrameHandler/FrameHandler * Update comments
2021-09-03 12:13:42 +02:00
{
auto handler = _browserControl->FrameHandler;
if (handler != nullptr)
{
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Core - FrameHandler update object lifespan (again) - Only OnFrameCreated provides a heap managed IFrame reference this should be sufficient to keep track of frames using a Dictionary in FrameHandler - Xml doc updates - Reorder IFrameHandler methods Issue #3588
2021-09-03 20:41:25 +10:00
CefFrameWrapper frameWrapper(frame);
Core - Add IFrameHandler (#3757) * Core - Add IFrameHandler/FrameHandler * Update comments
2021-09-03 12:13:42 +02:00
Core - IFrameHandler.OnFrameAttached add reattached param Resolves #3816
2021-09-20 11:51:10 +10:00
handler->OnFrameAttached(_browserControl, browserWrapper, % frameWrapper, reattached);
Core - Add IFrameHandler (#3757) * Core - Add IFrameHandler/FrameHandler * Update comments
2021-09-03 12:13:42 +02:00
}
}
void ClientAdapter::OnFrameDetached(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame)
{
auto handler = _browserControl->FrameHandler;
if (handler != nullptr)
{
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Core - FrameHandler update object lifespan (again) - Only OnFrameCreated provides a heap managed IFrame reference this should be sufficient to keep track of frames using a Dictionary in FrameHandler - Xml doc updates - Reorder IFrameHandler methods Issue #3588
2021-09-03 20:41:25 +10:00
CefFrameWrapper frameWrapper(frame);
Core - Add IFrameHandler (#3757) * Core - Add IFrameHandler/FrameHandler * Update comments
2021-09-03 12:13:42 +02:00
Core - FrameHandler update object lifespan (again) - Only OnFrameCreated provides a heap managed IFrame reference this should be sufficient to keep track of frames using a Dictionary in FrameHandler - Xml doc updates - Reorder IFrameHandler methods Issue #3588
2021-09-03 20:41:25 +10:00
handler->OnFrameDetached(_browserControl, browserWrapper, % frameWrapper);
Core - Add IFrameHandler (#3757) * Core - Add IFrameHandler/FrameHandler * Update comments
2021-09-03 12:13:42 +02:00
}
}
Core - OnFrameCreated/OnFrameAttached/OnFrameDetached allocate IFrame on managed heap - Previously they were stack allocated and disposed when out of scope, they're now managed heap allocated to allow for users to keep a long lived reference. FrameHandler still needs to be updated to deal with Disposing of the references. Follow up to #3757 Issue #3588
2021-09-03 20:21:22 +10:00
void ClientAdapter::OnMainFrameChanged(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> oldFrame, CefRefPtr<CefFrame> newFrame)
Core - Add IFrameHandler (#3757) * Core - Add IFrameHandler/FrameHandler * Update comments
2021-09-03 12:13:42 +02:00
{
auto handler = _browserControl->FrameHandler;
if (handler != nullptr)
{
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Core - FrameHandler update object lifespan (again) - Only OnFrameCreated provides a heap managed IFrame reference this should be sufficient to keep track of frames using a Dictionary in FrameHandler - Xml doc updates - Reorder IFrameHandler methods Issue #3588
2021-09-03 20:41:25 +10:00
Core - Add IFrameHandler (#3757) * Core - Add IFrameHandler/FrameHandler * Update comments
2021-09-03 12:13:42 +02:00
CefFrameWrapper^ oldFrameWrapper = nullptr;
Core - OnFrameCreated/OnFrameAttached/OnFrameDetached allocate IFrame on managed heap - Previously they were stack allocated and disposed when out of scope, they're now managed heap allocated to allow for users to keep a long lived reference. FrameHandler still needs to be updated to deal with Disposing of the references. Follow up to #3757 Issue #3588
2021-09-03 20:21:22 +10:00
if (oldFrame.get())
{
oldFrameWrapper = gcnew CefFrameWrapper(oldFrame);
Core - Add IFrameHandler (#3757) * Core - Add IFrameHandler/FrameHandler * Update comments
2021-09-03 12:13:42 +02:00
}
Core - FrameHandler update object lifespan (again) - Only OnFrameCreated provides a heap managed IFrame reference this should be sufficient to keep track of frames using a Dictionary in FrameHandler - Xml doc updates - Reorder IFrameHandler methods Issue #3588
2021-09-03 20:41:25 +10:00
Core - Add IFrameHandler (#3757) * Core - Add IFrameHandler/FrameHandler * Update comments
2021-09-03 12:13:42 +02:00
CefFrameWrapper^ newFrameWrapper = nullptr;
Core - OnFrameCreated/OnFrameAttached/OnFrameDetached allocate IFrame on managed heap - Previously they were stack allocated and disposed when out of scope, they're now managed heap allocated to allow for users to keep a long lived reference. FrameHandler still needs to be updated to deal with Disposing of the references. Follow up to #3757 Issue #3588
2021-09-03 20:21:22 +10:00
if (newFrame.get())
{
newFrameWrapper = gcnew CefFrameWrapper(newFrame);
Core - Add IFrameHandler (#3757) * Core - Add IFrameHandler/FrameHandler * Update comments
2021-09-03 12:13:42 +02:00
}
handler->OnMainFrameChanged(_browserControl, browserWrapper, oldFrameWrapper, newFrameWrapper);
Core - FrameHandler update object lifespan (again) - Only OnFrameCreated provides a heap managed IFrame reference this should be sufficient to keep track of frames using a Dictionary in FrameHandler - Xml doc updates - Reorder IFrameHandler methods Issue #3588
2021-09-03 20:41:25 +10:00
delete oldFrameWrapper;
delete newFrameWrapper;
Core - Add IFrameHandler (#3757) * Core - Add IFrameHandler/FrameHandler * Update comments
2021-09-03 12:13:42 +02:00
}
}
Core - Change from cef type defs to C++11 defs https://bitbucket.org/chromiumembedded/cef/commits/5042d7140822cd13b80990f61ce2d3865864a3d8
2023-07-16 06:32:58 +10:00
bool ClientAdapter::OnShowPermissionPrompt(CefRefPtr<CefBrowser> browser, uint64_t prompt_id,
const CefString& requesting_origin, uint32_t requested_permissions,
Core - Add support PermissonHandler https://bitbucket.org/chromiumembedded/cef/issues/3352/add-cefpermissionhandler-callback-for-the
2022-07-09 13:54:17 +10:00
CefRefPtr<CefPermissionPromptCallback> callback)
{
auto handler = _browserControl->PermissionHandler;
if (handler != nullptr)
{
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
auto callbackWrapper = gcnew CefPermissionPromptCallbackWrapper(callback);
Core - PermissionHandler followup - Rename enums (remove cef prefix) - Fix typos - Slightly improve docs
2022-08-08 14:18:54 +10:00
return handler->OnShowPermissionPrompt(_browserControl, browserWrapper, prompt_id, StringUtils::ToClr(requesting_origin), (PermissionRequestType)requested_permissions, callbackWrapper);
Core - Add support PermissonHandler https://bitbucket.org/chromiumembedded/cef/issues/3352/add-cefpermissionhandler-callback-for-the
2022-07-09 13:54:17 +10:00
}
return false;
}
Core - Change from cef type defs to C++11 defs https://bitbucket.org/chromiumembedded/cef/commits/5042d7140822cd13b80990f61ce2d3865864a3d8
2023-07-16 06:32:58 +10:00
void ClientAdapter::OnDismissPermissionPrompt(CefRefPtr<CefBrowser> browser, uint64_t prompt_id,
Core - Add support PermissonHandler https://bitbucket.org/chromiumembedded/cef/issues/3352/add-cefpermissionhandler-callback-for-the
2022-07-09 13:54:17 +10:00
cef_permission_request_result_t result)
{
auto handler = _browserControl->PermissionHandler;
if (handler != nullptr)
{
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
Core - PermissionHandler followup - Rename enums (remove cef prefix) - Fix typos - Slightly improve docs
2022-08-08 14:18:54 +10:00
handler->OnDismissPermissionPrompt(_browserControl, browserWrapper, prompt_id, (PermissionRequestResult)result);
Core - Add support PermissonHandler https://bitbucket.org/chromiumembedded/cef/issues/3352/add-cefpermissionhandler-callback-for-the
2022-07-09 13:54:17 +10:00
}
}
bool ClientAdapter::OnRequestMediaAccessPermission(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame,
Core - Change from cef type defs to C++11 defs https://bitbucket.org/chromiumembedded/cef/commits/5042d7140822cd13b80990f61ce2d3865864a3d8
2023-07-16 06:32:58 +10:00
const CefString& requesting_origin, uint32_t requested_permissions,
Core - Add support PermissonHandler https://bitbucket.org/chromiumembedded/cef/issues/3352/add-cefpermissionhandler-callback-for-the
2022-07-09 13:54:17 +10:00
CefRefPtr<CefMediaAccessCallback> callback)
{
auto handler = _browserControl->PermissionHandler;
if (handler != nullptr)
{
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
CefFrameWrapper frameWrapper(frame);
auto callbackWrapper = gcnew CefMediaAccessCallbackWrapper(callback);
Core - PermissionHandler followup - Rename enums (remove cef prefix) - Fix typos - Slightly improve docs
2022-08-08 14:18:54 +10:00
return handler->OnRequestMediaAccessPermission(_browserControl, browserWrapper, %frameWrapper, StringUtils::ToClr(requesting_origin), (MediaAccessPermissionType)requested_permissions, callbackWrapper);
Core - Add support PermissonHandler https://bitbucket.org/chromiumembedded/cef/issues/3352/add-cefpermissionhandler-callback-for-the
2022-07-09 13:54:17 +10:00
}
return false;
}
Initial version 75 upgrade and NetworkService changes Compiles, that's about it at this point, there are major CEF breaking changes, and lots to be addressed. Browser Process (main process) - Removed IResourceHandlerFactory as it no longer fits with the structure that CEF provides - New IResourceRequestHandler interface added, not plumbed in yet - CefSettings - Add RootCachePath and ApplicationClientIdForFileScanning BrowserSubprocess (render process) - SendProcessMessage was moved from CefBrowser to CefFrame - OnBrowserCreated added extraInfo param The BrowserSubprocess changes for this upgrade should be complete
2019-06-11 12:29:57 +10:00
bool ClientAdapter::OnProcessMessageReceived(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefProcessId source_process, CefRefPtr<CefProcessMessage> message)
added process message handlers and code to call them on both sides
2015-06-27 17:01:51 +02:00
{
Core - ClientAdapter.OnProcessMessageReceived additional null checks I don't have a full stack trace or a means to reproduce the actual problem, to date there have been only two reported cases. This is a speculative fix, adds some extra null checks and a dispose check. Basically being a little more defensive. Some of the code is duplicated in the hopes of one day refactoring out so each message has a different method/class Issue #3322
2021-01-04 15:03:59 +10:00
if (_disposed)
{
return true;
}
For now simplify message handing - remove delegates Will look at implementing a managed class to handle/route messages later
2015-06-29 15:08:53 +10:00
auto handled = false;
auto name = message->GetName();
async method bindings added
2015-07-14 10:59:10 +02:00
auto argList = message->GetArgumentList();
IJavascriptObjectRepositry - Add ObjectBoundInJavascript event Executed on the thread pool when objects are bound in JS
2018-01-22 11:59:13 +10:00
//TODO: JSB Rename messages (remove Root from name)
Implement Javascript Binding v2 (#2247) * JSB Rewrite - Add CefSharp.RegisterBoundObject javascript method To get around the problem of IPC timing, I've reversed the communication, now it's the render process requesting the bound objects, the implementation is incomplete at this stage, more just a basic proof of concept Rewrite BindingTest.html using QUnit One of the tests doesn't map correctly as it requires def user interaction TODO: - Get objects by name - Rename Messages.h values that relate to this change so they are more descriptive - Better error handling - Caching of objects within a render process - Investigate global context options, don't think it's possible to call an async method directly in the global context # Conflicts: # CefSharp.Example/Resources/BindingTest.html * JSB Improve Request/Response message names * BindingTest.html - Output stress test results * Remove JavascriptRootObject was leftover from time we used WCF to transmit objects * JavascriptObjectRepository - Objects are now sent in the same list with an IsAsync flag Separation when sending over IPC with two unique lists isn't necessary * JavascriptObjectRepository - Return objects by name or return all by default Untabify CefAppUnmanagedWrapper.cpp Add minor comment to CefBrowserWrapper for a reminder that we use Frame Identifier as dictionary key * Add //TODO: JSB comments for work that's left to be done Ideally within a render process we cache bound objects once they've been communicated, It would also be nice to make multiple binding requests so objects can later be added dynamically * JSB Allow multiple calls to CefSharp.RegisterBoundObject Update BindingTest.html to name two distinct calls to different bound objects * JSB - Add some notes about caching, no working implementation yet * JSB - Dynamically Register object on Request * JSB Add ability to unbind an object and rename RegisterBoundObject to BindObjectAsync # Conflicts: # CefSharp.Example/Resources/BindingTest.html * JSB BindObjectAsync - if objects already bound then return false * JSB - Ignore Indexer properties Were previously throwing an exception * JSB - Add LegacyJavascriptBindingEnabled option so preserve existing behaviour This is only useful for SPA application and those that only navigate to pages hosting within a single domain. Any sort of cross-site navigation and a new render process will be spawned and objects won't be bound automatically (You can use the new methods to request they're bound yourself, at least in theory, more testing required on this) * Add LegacyBindingTest.html Current disabled by default. To enable uncomment CefSharpSettings.LegacyJavascriptBindingEnabled = true; in CefExample.cs * RegisterJsObject and RegisterAsyncJsObject can now only be used when CefSharpSettings.LegacyJavascriptBindingEnabled = true See https://github.com/cefsharp/CefSharp/issues/2246 for details
2018-01-22 10:24:25 +10:00
if (name == kJavascriptRootObjectRequest)
{
Core - ClientAdapter.OnProcessMessageReceived additional null checks I don't have a full stack trace or a means to reproduce the actual problem, to date there have been only two reported cases. This is a speculative fix, adds some extra null checks and a dispose check. Basically being a little more defensive. Some of the code is duplicated in the hopes of one day refactoring out so each message has a different method/class Issue #3322
2021-01-04 15:03:59 +10:00
auto browserAdapter = _browserAdapter;
if (Object::ReferenceEquals(browserAdapter, nullptr) || browserAdapter->IsDisposed)
Implement Javascript Binding v2 (#2247) * JSB Rewrite - Add CefSharp.RegisterBoundObject javascript method To get around the problem of IPC timing, I've reversed the communication, now it's the render process requesting the bound objects, the implementation is incomplete at this stage, more just a basic proof of concept Rewrite BindingTest.html using QUnit One of the tests doesn't map correctly as it requires def user interaction TODO: - Get objects by name - Rename Messages.h values that relate to this change so they are more descriptive - Better error handling - Caching of objects within a render process - Investigate global context options, don't think it's possible to call an async method directly in the global context # Conflicts: # CefSharp.Example/Resources/BindingTest.html * JSB Improve Request/Response message names * BindingTest.html - Output stress test results * Remove JavascriptRootObject was leftover from time we used WCF to transmit objects * JavascriptObjectRepository - Objects are now sent in the same list with an IsAsync flag Separation when sending over IPC with two unique lists isn't necessary * JavascriptObjectRepository - Return objects by name or return all by default Untabify CefAppUnmanagedWrapper.cpp Add minor comment to CefBrowserWrapper for a reminder that we use Frame Identifier as dictionary key * Add //TODO: JSB comments for work that's left to be done Ideally within a render process we cache bound objects once they've been communicated, It would also be nice to make multiple binding requests so objects can later be added dynamically * JSB Allow multiple calls to CefSharp.RegisterBoundObject Update BindingTest.html to name two distinct calls to different bound objects * JSB - Add some notes about caching, no working implementation yet * JSB - Dynamically Register object on Request * JSB Add ability to unbind an object and rename RegisterBoundObject to BindObjectAsync # Conflicts: # CefSharp.Example/Resources/BindingTest.html * JSB BindObjectAsync - if objects already bound then return false * JSB - Ignore Indexer properties Were previously throwing an exception * JSB - Add LegacyJavascriptBindingEnabled option so preserve existing behaviour This is only useful for SPA application and those that only navigate to pages hosting within a single domain. Any sort of cross-site navigation and a new render process will be spawned and objects won't be bound automatically (You can use the new methods to request they're bound yourself, at least in theory, more testing required on this) * Add LegacyBindingTest.html Current disabled by default. To enable uncomment CefSharpSettings.LegacyJavascriptBindingEnabled = true; in CefExample.cs * RegisterJsObject and RegisterAsyncJsObject can now only be used when CefSharpSettings.LegacyJavascriptBindingEnabled = true See https://github.com/cefsharp/CefSharp/issues/2246 for details
2018-01-22 10:24:25 +10:00
{
Core - ClientAdapter.OnProcessMessageReceived additional null checks I don't have a full stack trace or a means to reproduce the actual problem, to date there have been only two reported cases. This is a speculative fix, adds some extra null checks and a dispose check. Basically being a little more defensive. Some of the code is duplicated in the hopes of one day refactoring out so each message has a different method/class Issue #3322
2021-01-04 15:03:59 +10:00
return true;
}
auto objectRepository = browserAdapter->JavascriptObjectRepository;
Implement Javascript Binding v2 (#2247) * JSB Rewrite - Add CefSharp.RegisterBoundObject javascript method To get around the problem of IPC timing, I've reversed the communication, now it's the render process requesting the bound objects, the implementation is incomplete at this stage, more just a basic proof of concept Rewrite BindingTest.html using QUnit One of the tests doesn't map correctly as it requires def user interaction TODO: - Get objects by name - Rename Messages.h values that relate to this change so they are more descriptive - Better error handling - Caching of objects within a render process - Investigate global context options, don't think it's possible to call an async method directly in the global context # Conflicts: # CefSharp.Example/Resources/BindingTest.html * JSB Improve Request/Response message names * BindingTest.html - Output stress test results * Remove JavascriptRootObject was leftover from time we used WCF to transmit objects * JavascriptObjectRepository - Objects are now sent in the same list with an IsAsync flag Separation when sending over IPC with two unique lists isn't necessary * JavascriptObjectRepository - Return objects by name or return all by default Untabify CefAppUnmanagedWrapper.cpp Add minor comment to CefBrowserWrapper for a reminder that we use Frame Identifier as dictionary key * Add //TODO: JSB comments for work that's left to be done Ideally within a render process we cache bound objects once they've been communicated, It would also be nice to make multiple binding requests so objects can later be added dynamically * JSB Allow multiple calls to CefSharp.RegisterBoundObject Update BindingTest.html to name two distinct calls to different bound objects * JSB - Add some notes about caching, no working implementation yet * JSB - Dynamically Register object on Request * JSB Add ability to unbind an object and rename RegisterBoundObject to BindObjectAsync # Conflicts: # CefSharp.Example/Resources/BindingTest.html * JSB BindObjectAsync - if objects already bound then return false * JSB - Ignore Indexer properties Were previously throwing an exception * JSB - Add LegacyJavascriptBindingEnabled option so preserve existing behaviour This is only useful for SPA application and those that only navigate to pages hosting within a single domain. Any sort of cross-site navigation and a new render process will be spawned and objects won't be bound automatically (You can use the new methods to request they're bound yourself, at least in theory, more testing required on this) * Add LegacyBindingTest.html Current disabled by default. To enable uncomment CefSharpSettings.LegacyJavascriptBindingEnabled = true; in CefExample.cs * RegisterJsObject and RegisterAsyncJsObject can now only be used when CefSharpSettings.LegacyJavascriptBindingEnabled = true See https://github.com/cefsharp/CefSharp/issues/2246 for details
2018-01-22 10:24:25 +10:00
Core - ClientAdapter::OnProcessMessageReceived add nullptr checks Follow up to https://github.com/cefsharp/CefSharp/discussions/3573
2021-05-20 10:07:53 +10:00
if (objectRepository == nullptr)
{
return true;
}
Core - ClientAdapter.OnProcessMessageReceived additional null checks I don't have a full stack trace or a means to reproduce the actual problem, to date there have been only two reported cases. This is a speculative fix, adds some extra null checks and a dispose check. Basically being a little more defensive. Some of the code is duplicated in the hopes of one day refactoring out so each message has a different method/class Issue #3322
2021-01-04 15:03:59 +10:00
auto callbackId = GetInt64(argList, 0);
auto objectNames = argList->GetList(1);
Implement Javascript Binding v2 (#2247) * JSB Rewrite - Add CefSharp.RegisterBoundObject javascript method To get around the problem of IPC timing, I've reversed the communication, now it's the render process requesting the bound objects, the implementation is incomplete at this stage, more just a basic proof of concept Rewrite BindingTest.html using QUnit One of the tests doesn't map correctly as it requires def user interaction TODO: - Get objects by name - Rename Messages.h values that relate to this change so they are more descriptive - Better error handling - Caching of objects within a render process - Investigate global context options, don't think it's possible to call an async method directly in the global context # Conflicts: # CefSharp.Example/Resources/BindingTest.html * JSB Improve Request/Response message names * BindingTest.html - Output stress test results * Remove JavascriptRootObject was leftover from time we used WCF to transmit objects * JavascriptObjectRepository - Objects are now sent in the same list with an IsAsync flag Separation when sending over IPC with two unique lists isn't necessary * JavascriptObjectRepository - Return objects by name or return all by default Untabify CefAppUnmanagedWrapper.cpp Add minor comment to CefBrowserWrapper for a reminder that we use Frame Identifier as dictionary key * Add //TODO: JSB comments for work that's left to be done Ideally within a render process we cache bound objects once they've been communicated, It would also be nice to make multiple binding requests so objects can later be added dynamically * JSB Allow multiple calls to CefSharp.RegisterBoundObject Update BindingTest.html to name two distinct calls to different bound objects * JSB - Add some notes about caching, no working implementation yet * JSB - Dynamically Register object on Request * JSB Add ability to unbind an object and rename RegisterBoundObject to BindObjectAsync # Conflicts: # CefSharp.Example/Resources/BindingTest.html * JSB BindObjectAsync - if objects already bound then return false * JSB - Ignore Indexer properties Were previously throwing an exception * JSB - Add LegacyJavascriptBindingEnabled option so preserve existing behaviour This is only useful for SPA application and those that only navigate to pages hosting within a single domain. Any sort of cross-site navigation and a new render process will be spawned and objects won't be bound automatically (You can use the new methods to request they're bound yourself, at least in theory, more testing required on this) * Add LegacyBindingTest.html Current disabled by default. To enable uncomment CefSharpSettings.LegacyJavascriptBindingEnabled = true; in CefExample.cs * RegisterJsObject and RegisterAsyncJsObject can now only be used when CefSharpSettings.LegacyJavascriptBindingEnabled = true See https://github.com/cefsharp/CefSharp/issues/2246 for details
2018-01-22 10:24:25 +10:00
Core - ClientAdapter.OnProcessMessageReceived additional null checks I don't have a full stack trace or a means to reproduce the actual problem, to date there have been only two reported cases. This is a speculative fix, adds some extra null checks and a dispose check. Basically being a little more defensive. Some of the code is duplicated in the hopes of one day refactoring out so each message has a different method/class Issue #3322
2021-01-04 15:03:59 +10:00
auto names = gcnew List<String^>(objectNames->GetSize());
for (size_t i = 0; i < objectNames->GetSize(); i++)
{
names->Add(StringUtils::ToClr(objectNames->GetString(i)));
}
JSB - JavascriptObjectRepository.ResolveObject was only being called when object previously registered The HasBoundObjects check has been removed, now we always attempt to GetObjects and return a response Resolves #2273
2018-02-13 09:43:40 +10:00
Core - ClientAdapter.OnProcessMessageReceived additional null checks I don't have a full stack trace or a means to reproduce the actual problem, to date there have been only two reported cases. This is a speculative fix, adds some extra null checks and a dispose check. Basically being a little more defensive. Some of the code is duplicated in the hopes of one day refactoring out so each message has a different method/class Issue #3322
2021-01-04 15:03:59 +10:00
//Call GetObjects with the list of names provided (will default to all if the list is empty
//Previously we only sent a response if there were bound objects, now we always send
//a response so the promise is resolved.
auto objs = objectRepository->GetObjects(names);
JSB - JavascriptObjectRepository.ResolveObject was only being called when object previously registered The HasBoundObjects check has been removed, now we always attempt to GetObjects and return a response Resolves #2273
2018-02-13 09:43:40 +10:00
Core - ClientAdapter.OnProcessMessageReceived additional null checks I don't have a full stack trace or a means to reproduce the actual problem, to date there have been only two reported cases. This is a speculative fix, adds some extra null checks and a dispose check. Basically being a little more defensive. Some of the code is duplicated in the hopes of one day refactoring out so each message has a different method/class Issue #3322
2021-01-04 15:03:59 +10:00
auto msg = CefProcessMessage::Create(kJavascriptRootObjectResponse);
auto responseArgList = msg->GetArgumentList();
SetInt64(responseArgList, 0, callbackId);
SerializeJsObjects(objs, responseArgList, 1);
frame->SendProcessMessage(CefProcessId::PID_RENDERER, msg);
Implement Javascript Binding v2 (#2247) * JSB Rewrite - Add CefSharp.RegisterBoundObject javascript method To get around the problem of IPC timing, I've reversed the communication, now it's the render process requesting the bound objects, the implementation is incomplete at this stage, more just a basic proof of concept Rewrite BindingTest.html using QUnit One of the tests doesn't map correctly as it requires def user interaction TODO: - Get objects by name - Rename Messages.h values that relate to this change so they are more descriptive - Better error handling - Caching of objects within a render process - Investigate global context options, don't think it's possible to call an async method directly in the global context # Conflicts: # CefSharp.Example/Resources/BindingTest.html * JSB Improve Request/Response message names * BindingTest.html - Output stress test results * Remove JavascriptRootObject was leftover from time we used WCF to transmit objects * JavascriptObjectRepository - Objects are now sent in the same list with an IsAsync flag Separation when sending over IPC with two unique lists isn't necessary * JavascriptObjectRepository - Return objects by name or return all by default Untabify CefAppUnmanagedWrapper.cpp Add minor comment to CefBrowserWrapper for a reminder that we use Frame Identifier as dictionary key * Add //TODO: JSB comments for work that's left to be done Ideally within a render process we cache bound objects once they've been communicated, It would also be nice to make multiple binding requests so objects can later be added dynamically * JSB Allow multiple calls to CefSharp.RegisterBoundObject Update BindingTest.html to name two distinct calls to different bound objects * JSB - Add some notes about caching, no working implementation yet * JSB - Dynamically Register object on Request * JSB Add ability to unbind an object and rename RegisterBoundObject to BindObjectAsync # Conflicts: # CefSharp.Example/Resources/BindingTest.html * JSB BindObjectAsync - if objects already bound then return false * JSB - Ignore Indexer properties Were previously throwing an exception * JSB - Add LegacyJavascriptBindingEnabled option so preserve existing behaviour This is only useful for SPA application and those that only navigate to pages hosting within a single domain. Any sort of cross-site navigation and a new render process will be spawned and objects won't be bound automatically (You can use the new methods to request they're bound yourself, at least in theory, more testing required on this) * Add LegacyBindingTest.html Current disabled by default. To enable uncomment CefSharpSettings.LegacyJavascriptBindingEnabled = true; in CefExample.cs * RegisterJsObject and RegisterAsyncJsObject can now only be used when CefSharpSettings.LegacyJavascriptBindingEnabled = true See https://github.com/cefsharp/CefSharp/issues/2246 for details
2018-01-22 10:24:25 +10:00
handled = true;
}
IJavascriptObjectRepositry - Add ObjectBoundInJavascript event Executed on the thread pool when objects are bound in JS
2018-01-22 11:59:13 +10:00
else if (name == kJavascriptObjectsBoundInJavascript)
{
Core - ClientAdapter.OnProcessMessageReceived additional null checks I don't have a full stack trace or a means to reproduce the actual problem, to date there have been only two reported cases. This is a speculative fix, adds some extra null checks and a dispose check. Basically being a little more defensive. Some of the code is duplicated in the hopes of one day refactoring out so each message has a different method/class Issue #3322
2021-01-04 15:03:59 +10:00
auto browserAdapter = _browserAdapter;
if (Object::ReferenceEquals(browserAdapter, nullptr) || browserAdapter->IsDisposed)
IJavascriptObjectRepositry - Add ObjectBoundInJavascript event Executed on the thread pool when objects are bound in JS
2018-01-22 11:59:13 +10:00
{
Core - ClientAdapter.OnProcessMessageReceived additional null checks I don't have a full stack trace or a means to reproduce the actual problem, to date there have been only two reported cases. This is a speculative fix, adds some extra null checks and a dispose check. Basically being a little more defensive. Some of the code is duplicated in the hopes of one day refactoring out so each message has a different method/class Issue #3322
2021-01-04 15:03:59 +10:00
return true;
}
IJavascriptObjectRepositry - Add ObjectBoundInJavascript event Executed on the thread pool when objects are bound in JS
2018-01-22 11:59:13 +10:00
Core - ClientAdapter.OnProcessMessageReceived additional null checks I don't have a full stack trace or a means to reproduce the actual problem, to date there have been only two reported cases. This is a speculative fix, adds some extra null checks and a dispose check. Basically being a little more defensive. Some of the code is duplicated in the hopes of one day refactoring out so each message has a different method/class Issue #3322
2021-01-04 15:03:59 +10:00
auto objectRepository = browserAdapter->JavascriptObjectRepository;
JSB - Add JavascriptBindingCompleteEventArgs and config options to CefSharp.BindObjectAsync CefSharp.BindObjectAsync can now take an optional config object as first param Include additional information when binding complete Add option for cefSharp.bindObjectAsync (starting with lowercase latters) Add new syntax options - not entirely complete, no variant for the options object Add ignore cache option
2018-04-26 10:20:39 +10:00
Core - ClientAdapter::OnProcessMessageReceived add nullptr checks Follow up to https://github.com/cefsharp/CefSharp/discussions/3573
2021-05-20 10:07:53 +10:00
if (objectRepository == nullptr)
{
return true;
}
Core - ClientAdapter.OnProcessMessageReceived additional null checks I don't have a full stack trace or a means to reproduce the actual problem, to date there have been only two reported cases. This is a speculative fix, adds some extra null checks and a dispose check. Basically being a little more defensive. Some of the code is duplicated in the hopes of one day refactoring out so each message has a different method/class Issue #3322
2021-01-04 15:03:59 +10:00
auto boundObjects = argList->GetList(0);
auto objs = gcnew List<Tuple<String^, bool, bool>^>(boundObjects->GetSize());
for (size_t i = 0; i < boundObjects->GetSize(); i++)
{
auto obj = boundObjects->GetDictionary(i);
auto objectName = obj->GetString("Name");
auto alreadyBound = obj->GetBool("AlreadyBound");
auto isCached = obj->GetBool("IsCached");
Maintenance - Fixed formatting, file encoding, and copyright year (#2504) * Applied formatting * Fixed file encoding + Updated copyright year * Updated License * Fixed more file encoding * Copyright notice now shows the year the file was created
2018-09-10 02:41:13 +02:00
Core - ClientAdapter.OnProcessMessageReceived additional null checks I don't have a full stack trace or a means to reproduce the actual problem, to date there have been only two reported cases. This is a speculative fix, adds some extra null checks and a dispose check. Basically being a little more defensive. Some of the code is duplicated in the hopes of one day refactoring out so each message has a different method/class Issue #3322
2021-01-04 15:03:59 +10:00
objs->Add(Tuple::Create(StringUtils::ToClr(objectName), alreadyBound, isCached));
IJavascriptObjectRepositry - Add ObjectBoundInJavascript event Executed on the thread pool when objects are bound in JS
2018-01-22 11:59:13 +10:00
}
Core - ClientAdapter.OnProcessMessageReceived additional null checks I don't have a full stack trace or a means to reproduce the actual problem, to date there have been only two reported cases. This is a speculative fix, adds some extra null checks and a dispose check. Basically being a little more defensive. Some of the code is duplicated in the hopes of one day refactoring out so each message has a different method/class Issue #3322
2021-01-04 15:03:59 +10:00
objectRepository->ObjectsBound(objs);
IJavascriptObjectRepositry - Add ObjectBoundInJavascript event Executed on the thread pool when objects are bound in JS
2018-01-22 11:59:13 +10:00
handled = true;
}
Implement Javascript Binding v2 (#2247) * JSB Rewrite - Add CefSharp.RegisterBoundObject javascript method To get around the problem of IPC timing, I've reversed the communication, now it's the render process requesting the bound objects, the implementation is incomplete at this stage, more just a basic proof of concept Rewrite BindingTest.html using QUnit One of the tests doesn't map correctly as it requires def user interaction TODO: - Get objects by name - Rename Messages.h values that relate to this change so they are more descriptive - Better error handling - Caching of objects within a render process - Investigate global context options, don't think it's possible to call an async method directly in the global context # Conflicts: # CefSharp.Example/Resources/BindingTest.html * JSB Improve Request/Response message names * BindingTest.html - Output stress test results * Remove JavascriptRootObject was leftover from time we used WCF to transmit objects * JavascriptObjectRepository - Objects are now sent in the same list with an IsAsync flag Separation when sending over IPC with two unique lists isn't necessary * JavascriptObjectRepository - Return objects by name or return all by default Untabify CefAppUnmanagedWrapper.cpp Add minor comment to CefBrowserWrapper for a reminder that we use Frame Identifier as dictionary key * Add //TODO: JSB comments for work that's left to be done Ideally within a render process we cache bound objects once they've been communicated, It would also be nice to make multiple binding requests so objects can later be added dynamically * JSB Allow multiple calls to CefSharp.RegisterBoundObject Update BindingTest.html to name two distinct calls to different bound objects * JSB - Add some notes about caching, no working implementation yet * JSB - Dynamically Register object on Request * JSB Add ability to unbind an object and rename RegisterBoundObject to BindObjectAsync # Conflicts: # CefSharp.Example/Resources/BindingTest.html * JSB BindObjectAsync - if objects already bound then return false * JSB - Ignore Indexer properties Were previously throwing an exception * JSB - Add LegacyJavascriptBindingEnabled option so preserve existing behaviour This is only useful for SPA application and those that only navigate to pages hosting within a single domain. Any sort of cross-site navigation and a new render process will be spawned and objects won't be bound automatically (You can use the new methods to request they're bound yourself, at least in theory, more testing required on this) * Add LegacyBindingTest.html Current disabled by default. To enable uncomment CefSharpSettings.LegacyJavascriptBindingEnabled = true; in CefExample.cs * RegisterJsObject and RegisterAsyncJsObject can now only be used when CefSharpSettings.LegacyJavascriptBindingEnabled = true See https://github.com/cefsharp/CefSharp/issues/2246 for details
2018-01-22 10:24:25 +10:00
else if (name == kOnContextCreatedRequest)
Add IRequestHandler.OnContextCreated handler Send an IPC message when OnContextCreated is called in the render process Currently only called for the main frame Should be possible to hook the DOMContentLoaded event
2015-12-02 19:04:19 +10:00
{
OnContextCreated/OnContextDestroyed - only continue if valid frame ptr Follow up to #2563
2018-11-09 07:13:34 +10:00
//In certain circumstances the frame has already been destroyed by the time
//we get here, only continue if we have a valid frame reference
SendProcessMessage - Remove frame/browserid from messages Not complete or tested yet
2019-06-13 22:18:01 +10:00
if (frame.get() && frame->IsValid())
Call OnContextCreated and OnContextReleased for each frame (#2373) * ContextEvents for each frame * set CanExecuteJavascriptOnMainFrame * example and comments * whitespace fix * comments * whitespace * update comments
2018-10-28 08:48:50 +02:00
{
OnContextCreated/OnContextDestroyed - only continue if valid frame ptr Follow up to #2563
2018-11-09 07:13:34 +10:00
if (frame->IsMain())
{
WPF/WinForms/OffScreen - CanExecuteJavascriptInMainFrame incorrectly false after loading page with different origin Proof of concept for a workaround. The frameId for the second OnContextReleased that arrives after the OnContextCreated from the old render process strangely has a frameId greater than the new frameId TODO: Unit tests Issue #3021
2020-05-04 12:34:47 +10:00
_browserControl->SetCanExecuteJavascriptOnMainFrame(frame->GetIdentifier(), true);
OnContextCreated/OnContextDestroyed - only continue if valid frame ptr Follow up to #2563
2018-11-09 07:13:34 +10:00
}
Add IRequestHandler.OnContextCreated handler Send an IPC message when OnContextCreated is called in the render process Currently only called for the main frame Should be possible to hook the DOMContentLoaded event
2015-12-02 19:04:19 +10:00
OnContextCreated/OnContextDestroyed - only continue if valid frame ptr Follow up to #2563
2018-11-09 07:13:34 +10:00
auto handler = _browserControl->RenderProcessMessageHandler;
Add IRequestHandler.OnContextCreated handler Send an IPC message when OnContextCreated is called in the render process Currently only called for the main frame Should be possible to hook the DOMContentLoaded event
2015-12-02 19:04:19 +10:00
OnContextCreated/OnContextDestroyed - only continue if valid frame ptr Follow up to #2563
2018-11-09 07:13:34 +10:00
if (handler != nullptr)
{
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
CefFrameWrapper frameWrapper(frame);
handler->OnContextCreated(_browserControl, browserWrapper, %frameWrapper);
}
Add IRequestHandler.OnContextCreated handler Send an IPC message when OnContextCreated is called in the render process Currently only called for the main frame Should be possible to hook the DOMContentLoaded event
2015-12-02 19:04:19 +10:00
}
handled = true;
}
Add IRenderProcessMessageHandler.OnContextReleased - native IPC message sent from render process
2017-03-07 09:23:10 +10:00
else if (name == kOnContextReleasedRequest)
{
OnContextCreated/OnContextDestroyed - only continue if valid frame ptr Follow up to #2563
2018-11-09 07:13:34 +10:00
//In certain circumstances the frame has already been destroyed by the time
//we get here, only continue if we have a valid frame reference
SendProcessMessage - Remove frame/browserid from messages Not complete or tested yet
2019-06-13 22:18:01 +10:00
if (frame.get() && frame->IsValid())
Call OnContextCreated and OnContextReleased for each frame (#2373) * ContextEvents for each frame * set CanExecuteJavascriptOnMainFrame * example and comments * whitespace fix * comments * whitespace * update comments
2018-10-28 08:48:50 +02:00
{
OnContextCreated/OnContextDestroyed - only continue if valid frame ptr Follow up to #2563
2018-11-09 07:13:34 +10:00
if (frame->IsMain())
{
WPF/WinForms/OffScreen - CanExecuteJavascriptInMainFrame incorrectly false after loading page with different origin Proof of concept for a workaround. The frameId for the second OnContextReleased that arrives after the OnContextCreated from the old render process strangely has a frameId greater than the new frameId TODO: Unit tests Issue #3021
2020-05-04 12:34:47 +10:00
_browserControl->SetCanExecuteJavascriptOnMainFrame(frame->GetIdentifier(), false);
OnContextCreated/OnContextDestroyed - only continue if valid frame ptr Follow up to #2563
2018-11-09 07:13:34 +10:00
}
Make sure frame is not null before accessing it (#2563) closes #256
2018-11-08 13:09:39 -08:00
OnContextCreated/OnContextDestroyed - only continue if valid frame ptr Follow up to #2563
2018-11-09 07:13:34 +10:00
auto handler = _browserControl->RenderProcessMessageHandler;
Add IRenderProcessMessageHandler.OnContextReleased - native IPC message sent from render process
2017-03-07 09:23:10 +10:00
OnContextCreated/OnContextDestroyed - only continue if valid frame ptr Follow up to #2563
2018-11-09 07:13:34 +10:00
if (handler != nullptr)
{
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
CefFrameWrapper frameWrapper(frame);
Add IRenderProcessMessageHandler.OnContextReleased - native IPC message sent from render process
2017-03-07 09:23:10 +10:00
OnContextCreated/OnContextDestroyed - only continue if valid frame ptr Follow up to #2563
2018-11-09 07:13:34 +10:00
handler->OnContextReleased(_browserControl, browserWrapper, %frameWrapper);
}
Add IRenderProcessMessageHandler.OnContextReleased - native IPC message sent from render process
2017-03-07 09:23:10 +10:00
}
handled = true;
}
Merge branch 'feature/oncontextcreated' of https://github.com/amaitland/CefSharp
2015-12-09 11:26:07 +10:00
else if (name == kOnFocusedNodeChanged)
Fix: tabs to spaces, if and for braces, use frame ID.
2015-12-07 09:48:57 -05:00
{
Move OnFocusedNodeChanged into new IRenderProcessMessageHandler.
2015-12-08 09:32:54 -05:00
auto handler = _browserControl->RenderProcessMessageHandler;
Fix: tabs to spaces, if and for braces, use frame ID.
2015-12-07 09:48:57 -05:00
if (handler != nullptr)
{
Remove unused include No need to wrap bool in gcroot Move command line parsing into c# land - can be reused in a few places. Reduce code duplication in OnProcessMessageReceived - kOnFocusedNodeChanged handler Minor changes for code consistency/formatting
2015-12-09 11:23:06 +10:00
IDomNode^ node = nullptr;
SendProcessMessage - Remove frame/browserid from messages Not complete or tested yet
2019-06-13 22:18:01 +10:00
// 0: is a node (bool)
// 1: tag name (string)
// 2: attributes (dictionary)
ThrowUnknownPopupBrowser has been removed - throwing an exception would crash CEF is a lot of cases, so now we'll just pass null into the interface methods Change EvaluateScriptAsyncto check for null and subsequently return null (would have caused a nullptr exception)
2016-04-18 13:50:53 +10:00
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
SendProcessMessage - Remove frame/browserid from messages Not complete or tested yet
2019-06-13 22:18:01 +10:00
CefFrameWrapper frameWrapper(frame);
Maintenance - Fixed formatting, file encoding, and copyright year (#2504) * Applied formatting * Fixed file encoding + Updated copyright year * Updated License * Fixed more file encoding * Copyright notice now shows the year the file was created
2018-09-10 02:41:13 +02:00
SendProcessMessage - Remove frame/browserid from messages Not complete or tested yet
2019-06-13 22:18:01 +10:00
auto notEmpty = argList->GetBool(0);
Fix: tabs to spaces, if and for braces, use frame ID.
2015-12-07 09:48:57 -05:00
if (notEmpty)
{
// Node information was passed from the render process.
SendProcessMessage - Remove frame/browserid from messages Not complete or tested yet
2019-06-13 22:18:01 +10:00
auto tagName = StringUtils::ToClr(argList->GetString(1));
auto argAttributes = argList->GetDictionary(2);
Fix: tabs to spaces, if and for braces, use frame ID.
2015-12-07 09:48:57 -05:00
auto attributes = gcnew System::Collections::Generic::Dictionary<String^, String^>();
CefDictionaryValue::KeyList keys;
argAttributes->GetKeys(keys);
for (auto key : keys)
{
Changed to specifically request FocusNodeChanged messages.
2015-12-08 09:04:22 -05:00
attributes->Add(StringUtils::ToClr(key), StringUtils::ToClr(argAttributes->GetString(key)));
Fix: tabs to spaces, if and for braces, use frame ID.
2015-12-07 09:48:57 -05:00
}
Remove unused include No need to wrap bool in gcroot Move command line parsing into c# land - can be reused in a few places. Reduce code duplication in OnProcessMessageReceived - kOnFocusedNodeChanged handler Minor changes for code consistency/formatting
2015-12-09 11:23:06 +10:00
node = gcnew DomNode(tagName, attributes);
Fix: tabs to spaces, if and for braces, use frame ID.
2015-12-07 09:48:57 -05:00
}
Remove unused include No need to wrap bool in gcroot Move command line parsing into c# land - can be reused in a few places. Reduce code duplication in OnProcessMessageReceived - kOnFocusedNodeChanged handler Minor changes for code consistency/formatting
2015-12-09 11:23:06 +10:00
// DomNode will be empty if input focus was cleared
handler->OnFocusedNodeChanged(_browserControl, browserWrapper, %frameWrapper, node);
Fix: tabs to spaces, if and for braces, use frame ID.
2015-12-07 09:48:57 -05:00
}
}
Support uncaught exception handling (#2244) * Added support for uncaught javascript exception in Render Process Message Handler * Fixed typo * Added stack frame column numbers * Code review * Code review * Update JavascriptException.cs
2018-03-07 00:21:31 +00:00
else if (name == kOnUncaughtException)
{
auto handler = _browserControl->RenderProcessMessageHandler;
if (handler != nullptr)
{
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
SendProcessMessage - Remove frame/browserid from messages Not complete or tested yet
2019-06-13 22:18:01 +10:00
CefFrameWrapper frameWrapper(frame);
Support uncaught exception handling (#2244) * Added support for uncaught javascript exception in Render Process Message Handler * Fixed typo * Added stack frame column numbers * Code review * Code review * Update JavascriptException.cs
2018-03-07 00:21:31 +00:00
auto exception = gcnew JavascriptException();
SendProcessMessage - Remove frame/browserid from messages Not complete or tested yet
2019-06-13 22:18:01 +10:00
exception->Message = StringUtils::ToClr(argList->GetString(0));
Support uncaught exception handling (#2244) * Added support for uncaught javascript exception in Render Process Message Handler * Fixed typo * Added stack frame column numbers * Code review * Code review * Update JavascriptException.cs
2018-03-07 00:21:31 +00:00
auto stackTrace = gcnew System::Collections::Generic::List<JavascriptStackFrame^>();
SendProcessMessage - Remove frame/browserid from messages Not complete or tested yet
2019-06-13 22:18:01 +10:00
auto argFrames = argList->GetList(1);
Support uncaught exception handling (#2244) * Added support for uncaught javascript exception in Render Process Message Handler * Fixed typo * Added stack frame column numbers * Code review * Code review * Update JavascriptException.cs
2018-03-07 00:21:31 +00:00
for (auto i = 0; i < static_cast<int>(argFrames->GetSize()); i++)
{
Fix all C6246 warnings: Local declaration hides declaration of the same name in outer scope. (#3027) * Fix all C6246 warnings: Local declaration hides declaration of the same name in outer scope. * Removing outter scope `global`
2020-01-28 22:17:14 -08:00
auto argFrame = argFrames->GetList(i);
Support uncaught exception handling (#2244) * Added support for uncaught javascript exception in Render Process Message Handler * Fixed typo * Added stack frame column numbers * Code review * Code review * Update JavascriptException.cs
2018-03-07 00:21:31 +00:00
auto stackFrame = gcnew JavascriptStackFrame();
Fix all C6246 warnings: Local declaration hides declaration of the same name in outer scope. (#3027) * Fix all C6246 warnings: Local declaration hides declaration of the same name in outer scope. * Removing outter scope `global`
2020-01-28 22:17:14 -08:00
stackFrame->FunctionName = StringUtils::ToClr(argFrame->GetString(0));
stackFrame->LineNumber = argFrame->GetInt(1);
stackFrame->ColumnNumber = argFrame->GetInt(2);
stackFrame->SourceName = StringUtils::ToClr(argFrame->GetString(3));
Support uncaught exception handling (#2244) * Added support for uncaught javascript exception in Render Process Message Handler * Fixed typo * Added stack frame column numbers * Code review * Code review * Update JavascriptException.cs
2018-03-07 00:21:31 +00:00
stackTrace->Add(stackFrame);
}
exception->StackTrace = stackTrace->ToArray();
handler->OnUncaughtException(_browserControl, browserWrapper, %frameWrapper, exception);
}
}
Changed to specifically request FocusNodeChanged messages.
2015-12-08 09:04:22 -05:00
else if (name == kEvaluateJavascriptResponse || name == kJavascriptCallbackResponse)
{
Core - ClientAdapter.OnProcessMessageReceived additional null checks I don't have a full stack trace or a means to reproduce the actual problem, to date there have been only two reported cases. This is a speculative fix, adds some extra null checks and a dispose check. Basically being a little more defensive. Some of the code is duplicated in the hopes of one day refactoring out so each message has a different method/class Issue #3322
2021-01-04 15:03:59 +10:00
auto browserAdapter = _browserAdapter;
if (Object::ReferenceEquals(browserAdapter, nullptr) || browserAdapter->IsDisposed)
{
return true;
}
auto callbackFactory = browserAdapter->JavascriptCallbackFactory;
Changed to specifically request FocusNodeChanged messages.
2015-12-08 09:04:22 -05:00
auto success = argList->GetBool(0);
auto callbackId = GetInt64(argList, 1);
Javascript Binding - IJavascriptCallbackProxy.ExecuteAsync correctly creates pending task using callback Id - Previously a new PendingTask(TaskCompletionSource) was created using a new Id which worked when the Ids matched between the browser and render process. If you skipped executing a callback then the Ids would get out of sync. Issue #3979
2022-01-27 15:23:21 +10:00
auto pendingTask = name == kEvaluateJavascriptResponse ?
_pendingTaskRepository->RemovePendingTask(callbackId) :
_pendingTaskRepository->RemoveJavascriptCallbackPendingTask(callbackId);
Changed to specifically request FocusNodeChanged messages.
2015-12-08 09:04:22 -05:00
if (pendingTask != nullptr)
{
auto response = gcnew JavascriptResponse();
response->Success = success;
if (success)
{
response->Result = DeserializeObject(argList, 2, callbackFactory);
}
else
{
response->Message = StringUtils::ToClr(argList->GetString(2));
}
Upgrade to .Net 4.6.2 (#4482) * Upgrade minimum .Net version to 4.6.2 #4433 * Use TaskCreationOptions.RunContinuationsAsynchronously - Now that min version is .Net 4.6.2 we can use RunContinuationsAsynchronously - Remove some unused code
2023-06-10 07:33:20 +10:00
pendingTask->TrySetResult(response);
Changed to specifically request FocusNodeChanged messages.
2015-12-08 09:04:22 -05:00
}
handled = true;
}
Core - ClientAdapter.OnProcessMessageReceived additional null checks I don't have a full stack trace or a means to reproduce the actual problem, to date there have been only two reported cases. This is a speculative fix, adds some extra null checks and a dispose check. Basically being a little more defensive. Some of the code is duplicated in the hopes of one day refactoring out so each message has a different method/class Issue #3322
2021-01-04 15:03:59 +10:00
else if (name == kJavascriptAsyncMethodCallRequest)
async method bindings added
2015-07-14 10:59:10 +02:00
{
Core - ClientAdapter.OnProcessMessageReceived additional null checks I don't have a full stack trace or a means to reproduce the actual problem, to date there have been only two reported cases. This is a speculative fix, adds some extra null checks and a dispose check. Basically being a little more defensive. Some of the code is duplicated in the hopes of one day refactoring out so each message has a different method/class Issue #3322
2021-01-04 15:03:59 +10:00
auto browserAdapter = _browserAdapter;
if (Object::ReferenceEquals(browserAdapter, nullptr) || browserAdapter->IsDisposed)
{
return true;
}
auto callbackFactory = browserAdapter->JavascriptCallbackFactory;
Core - ClientAdapter::OnProcessMessageReceived add nullptr checks Follow up to https://github.com/cefsharp/CefSharp/discussions/3573
2021-05-20 10:07:53 +10:00
auto methodRunnerQueue = browserAdapter->MethodRunnerQueue;
//Dispose is called on a different thread, so there's a chance
//dispose is called after our IsDisposed checks, make sure we have
//actual references.
if (callbackFactory == nullptr || methodRunnerQueue == nullptr)
{
return true;
}
Core - ClientAdapter.OnProcessMessageReceived additional null checks I don't have a full stack trace or a means to reproduce the actual problem, to date there have been only two reported cases. This is a speculative fix, adds some extra null checks and a dispose check. Basically being a little more defensive. Some of the code is duplicated in the hopes of one day refactoring out so each message has a different method/class Issue #3322
2021-01-04 15:03:59 +10:00
SendProcessMessage - Remove frame/browserid from messages Not complete or tested yet
2019-06-13 22:18:01 +10:00
auto frameId = frame->GetIdentifier();
auto objectId = GetInt64(argList, 0);
auto callbackId = GetInt64(argList, 1);
auto methodName = StringUtils::ToClr(argList->GetString(2));
auto arguments = argList->GetList(3);
Core - Change from cef type defs to C++11 defs https://bitbucket.org/chromiumembedded/cef/commits/5042d7140822cd13b80990f61ce2d3865864a3d8
2023-07-16 06:32:58 +10:00
auto methodInvocation = gcnew MethodInvocation(browser->GetIdentifier(), frameId, objectId, methodName, (callbackId > 0 ? Nullable<int64_t>(callbackId) : Nullable<int64_t>()));
Only send kJavascriptRootObjectRequest when main browser is created (OnRenderViewReady) Remove IsPopup check from async binding
2015-09-24 19:50:48 +10:00
for (auto i = 0; i < static_cast<int>(arguments->GetSize()); i++)
async method bindings added
2015-07-14 10:59:10 +02:00
{
Only send kJavascriptRootObjectRequest when main browser is created (OnRenderViewReady) Remove IsPopup check from async binding
2015-09-24 19:50:48 +10:00
methodInvocation->Parameters->Add(DeserializeObject(arguments, i, callbackFactory));
async method bindings added
2015-07-14 10:59:10 +02:00
}
Core - ClientAdapter::OnProcessMessageReceived add nullptr checks Follow up to https://github.com/cefsharp/CefSharp/discussions/3573
2021-05-20 10:07:53 +10:00
methodRunnerQueue->Enqueue(methodInvocation);
async method bindings added
2015-07-14 10:59:10 +02:00
For now simplify message handing - remove delegates Will look at implementing a managed class to handle/route messages later
2015-06-29 15:08:53 +10:00
handled = true;
added process message handlers and code to call them on both sides
2015-06-27 17:01:51 +02:00
}
Add CefSharp.PostMessage (#2799) - JavascriptMessageReceived event added to ChromiumWebBrowser/IWebBrowser - CefSharp.PostMessage and cefSharp.postMessage added to V8Context on creation for use in Javascript - Add PostMessageTest.html
2019-06-03 21:08:03 +10:00
else if (name == kJavascriptMessageReceived)
{
Core - ClientAdapter.OnProcessMessageReceived additional null checks I don't have a full stack trace or a means to reproduce the actual problem, to date there have been only two reported cases. This is a speculative fix, adds some extra null checks and a dispose check. Basically being a little more defensive. Some of the code is duplicated in the hopes of one day refactoring out so each message has a different method/class Issue #3322
2021-01-04 15:03:59 +10:00
auto browserAdapter = _browserAdapter;
if (Object::ReferenceEquals(browserAdapter, nullptr) || browserAdapter->IsDisposed)
{
return true;
}
auto callbackFactory = browserAdapter->JavascriptCallbackFactory;
Add CefSharp.PostMessage (#2799) - JavascriptMessageReceived event added to ChromiumWebBrowser/IWebBrowser - CefSharp.PostMessage and cefSharp.postMessage added to V8Context on creation for use in Javascript - Add PostMessageTest.html
2019-06-03 21:08:03 +10:00
//In certain circumstances the frame has already been destroyed by the time
//we get here, only continue if we have a valid frame reference
SendProcessMessage - Remove frame/browserid from messages Not complete or tested yet
2019-06-13 22:18:01 +10:00
if (frame.get() && frame->IsValid())
Add CefSharp.PostMessage (#2799) - JavascriptMessageReceived event added to ChromiumWebBrowser/IWebBrowser - CefSharp.PostMessage and cefSharp.postMessage added to V8Context on creation for use in Javascript - Add PostMessageTest.html
2019-06-03 21:08:03 +10:00
{
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
CefFrameWrapper frameWrapper(frame);
Fix all C6246 warnings: Local declaration hides declaration of the same name in outer scope. (#3027) * Fix all C6246 warnings: Local declaration hides declaration of the same name in outer scope. * Removing outter scope `global`
2020-01-28 22:17:14 -08:00
auto deserializedMessage = DeserializeObject(argList, 0, callbackFactory);
Add CefSharp.PostMessage (#2799) - JavascriptMessageReceived event added to ChromiumWebBrowser/IWebBrowser - CefSharp.PostMessage and cefSharp.postMessage added to V8Context on creation for use in Javascript - Add PostMessageTest.html
2019-06-03 21:08:03 +10:00
Fix all C6246 warnings: Local declaration hides declaration of the same name in outer scope. (#3027) * Fix all C6246 warnings: Local declaration hides declaration of the same name in outer scope. * Removing outter scope `global`
2020-01-28 22:17:14 -08:00
_browserControl->SetJavascriptMessageReceived(gcnew JavascriptMessageReceivedEventArgs(browserWrapper, %frameWrapper, deserializedMessage));
Add CefSharp.PostMessage (#2799) - JavascriptMessageReceived event added to ChromiumWebBrowser/IWebBrowser - CefSharp.PostMessage and cefSharp.postMessage added to V8Context on creation for use in Javascript - Add PostMessageTest.html
2019-06-03 21:08:03 +10:00
}
handled = true;
}
added process message handlers and code to call them on both sides
2015-06-27 17:01:51 +02:00
return handled;
}
added new IJavascriptCallback implementation into the pipeline
2015-07-07 19:10:20 +02:00
PendingTaskRepository<JavascriptResponse^>^ ClientAdapter::GetPendingTaskRepository()
{
return _pendingTaskRepository;
}
added async bound method result callback on browser process side
2015-07-14 12:43:59 +02:00
void ClientAdapter::MethodInvocationComplete(MethodInvocationResult^ result)
{
ClientAdapter::MethodInvocationComplete - Add checking for valid frame Make we have a frame that matches the Id and that it's valid before attempting to create a IPC message
2019-08-06 14:27:01 +10:00
auto browser = GetBrowserWrapper(result->BrowserId);
Javascript Binding - ClientAdapter.MethodInvocationComplete NRE Resolves #3443
2021-03-12 11:59:04 +10:00
if (result->CallbackId.HasValue && browser != nullptr && !browser->IsDisposed)
added async bound method result callback on browser process side
2015-07-14 12:43:59 +02:00
{
Core - Consistent C++ naming - Following the adapter/wrapper naming scheme - Moved classes to internals that aren't public facing Resolves #1005
2020-04-06 06:50:32 +10:00
auto wrapper = static_cast<CefBrowserWrapper^>(browser);
Javascript Binding - ClientAdapter.MethodInvocationComplete NRE Resolves #3443
2021-03-12 11:59:04 +10:00
if (wrapper == nullptr)
{
return;
}
Async JSB now working in popups Still have the issue of callbacks not working as expect, for some reason it can't find the context
2015-09-24 20:08:15 +10:00
Javascript Binding - ClientAdapter.MethodInvocationComplete NRE Resolves #3443
2021-03-12 11:59:04 +10:00
auto cefBrowser = wrapper->Browser;
Async JSB now working in popups Still have the issue of callbacks not working as expect, for some reason it can't find the context
2015-09-24 20:08:15 +10:00
Javascript Binding - ClientAdapter.MethodInvocationComplete NRE Resolves #3443
2021-03-12 11:59:04 +10:00
if (cefBrowser.get())
Async JSB now working in popups Still have the issue of callbacks not working as expect, for some reason it can't find the context
2015-09-24 20:08:15 +10:00
{
Javascript Binding - ClientAdapter.MethodInvocationComplete NRE Resolves #3443
2021-03-12 11:59:04 +10:00
auto frame = cefBrowser->GetFrame(result->FrameId);
if (frame.get() && frame->IsValid())
ClientAdapter::MethodInvocationComplete - Add checking for valid frame Make we have a frame that matches the Id and that it's valid before attempting to create a IPC message
2019-08-06 14:27:01 +10:00
{
Javascript Binding - ClientAdapter.MethodInvocationComplete NRE Resolves #3443
2021-03-12 11:59:04 +10:00
auto message = CefProcessMessage::Create(kJavascriptAsyncMethodCallResponse);
auto argList = message->GetArgumentList();
SetInt64(argList, 0, result->CallbackId.Value);
argList->SetBool(1, result->Success);
if (result->Success)
{
SerializeV8Object(argList, 2, result->Result, result->NameConverter);
}
else
{
argList->SetString(2, StringUtils::ToNative(result->Message));
}
Keep a WeakReference to IBrowserAdapter instead of IBrowser and lookup the browser by it's Id for callbacks
2015-09-24 21:00:53 +10:00
Javascript Binding - ClientAdapter.MethodInvocationComplete NRE Resolves #3443
2021-03-12 11:59:04 +10:00
frame->SendProcessMessage(CefProcessId::PID_RENDERER, message);
}
Async JSB now working in popups Still have the issue of callbacks not working as expect, for some reason it can't find the context
2015-09-24 20:08:15 +10:00
}
added async bound method result callback on browser process side
2015-07-14 12:43:59 +02:00
}
}
moved CefSharp to CefSharp.Core
2014-03-09 13:49:35 +01:00
}
}
Reference in New Issue Copy Permalink