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
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
// Copyright © 2019 The CefSharp Authors. All rights reserved.
//
// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
#pragma once
#include "include/cef_v8.h"
#include "RegisterBoundObjectRegistry.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 "..\CefSharp.Core.Runtime\Internals\Messaging\Messages.h"
#include "..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.h"
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
using namespace System;
using namespace CefSharp::Internals::Messaging;
using namespace CefSharp::Internals::Serialization;
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
using namespace CefSharp::BrowserSubprocess;
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
namespace CefSharp
{
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
namespace BrowserSubprocess
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
{
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
const CefString kBindObjectAsync = CefString("BindObjectAsync");
const CefString kBindObjectAsyncCamelCase = CefString("bindObjectAsync");
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
private class BindObjectAsyncHandler : public CefV8Handler
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
{
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
private:
gcroot<RegisterBoundObjectRegistry^> _callbackRegistry;
gcroot<Dictionary<String^, JavascriptObject^>^> _javascriptObjects;
gcroot<CefBrowserWrapper^> _browserWrapper;
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
public:
BindObjectAsyncHandler(RegisterBoundObjectRegistry^ callbackRegistery, Dictionary<String^, JavascriptObject^>^ javascriptObjects, CefBrowserWrapper^ browserWrapper)
{
_callbackRegistry = callbackRegistery;
_javascriptObjects = javascriptObjects;
_browserWrapper = browserWrapper;
}
BindObjectAsyncHandler - Add destructor Release managed resources
2019-07-08 20:11:42 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
~BindObjectAsyncHandler()
{
_callbackRegistry = nullptr;
_javascriptObjects = nullptr;
_browserWrapper = nullptr;
}
BindObjectAsyncHandler - Move some variables closer to their usage
2019-07-08 15:17:40 +10:00
C++/CLI - Replace OVERRIDE with override OVERRIDE was a CEF macro which has been removed, use standard compliant override Issue #3636
2021-07-31 15:24:13 +10:00
bool Execute(const CefString& name, CefRefPtr<CefV8Value> object, const CefV8ValueList& arguments, CefRefPtr<CefV8Value>& retval, CefString& exception) override
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
{
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
auto context = CefV8Context::GetCurrentContext();
if (context.get() && context->Enter())
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
{
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
try
BindObjectAsyncHandler - Reduce nesting Combine Context Get and Context Enter error handling
2019-07-08 13:49:45 +10:00
{
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
auto params = CefListValue::Create();
//We need to store a seperate index into our params as
//there are instances we skip over already cached objects
//and end up with empty strings in the list.
//e.g. first object is already bound/cached, we previously
//second object isn't we end up with a list of "", "secondObject"
int paramsIndex = 0;
auto boundObjectRequired = false;
auto notifyIfAlreadyBound = false;
auto ignoreCache = false;
auto cachedObjects = gcnew List<JavascriptObject^>();
//TODO: Create object to represent this information
auto objectNamesWithBoundStatus = gcnew List<Tuple<String^, bool, bool>^>();
auto objectCount = 0;
if (arguments.size() > 0)
BindObjectAsyncHandler - Reduce nesting Combine Context Get and Context Enter error handling
2019-07-08 13:49:45 +10:00
{
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
objectCount = (int)arguments.size();
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
//If first argument is an object, we'll see if it contains config values
if (arguments[0]->IsObject())
{
//Upper and camelcase options are supported
notifyIfAlreadyBound = GetV8BoolValue(arguments[0], "NotifyIfAlreadyBound", "notifyIfAlreadyBound");
ignoreCache = GetV8BoolValue(arguments[0], "IgnoreCache", "ignoreCache");
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
//If we have a config object then we remove that from the count
objectCount = objectCount - 1;
}
BindObjectAsyncHandler - Move some variables closer to their usage
2019-07-08 15:17:40 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
auto global = context->GetGlobal();
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
//Loop through all arguments and ignore anything that's not a string
for (size_t i = 0; i < arguments.size(); i++)
{
//Validate arg as being a string
if (arguments[i]->IsString())
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
{
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
auto objectName = arguments[i]->GetStringValue();
auto managedObjectName = StringUtils::ToClr(objectName);
auto alreadyBound = global->HasValue(objectName);
auto cached = false;
BindObjectAsyncHandler - Reduce nesting Combine Context Get and Context Enter error handling
2019-07-08 13:49:45 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
//Check if the object has already been bound
if (alreadyBound)
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
{
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
cached = _javascriptObjects->ContainsKey(managedObjectName);
}
else
{
//If no matching object found then we'll add the object name to the list
boundObjectRequired = true;
params->SetString(paramsIndex++, objectName);
JavascriptObject^ obj;
if (_javascriptObjects->TryGetValue(managedObjectName, obj))
{
cachedObjects->Add(obj);
BindObjectAsyncHandler - Reduce nesting Combine Context Get and Context Enter error handling
2019-07-08 13:49:45 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
cached = true;
}
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
}
BindObjectAsyncHandler - Reduce nesting Combine Context Get and Context Enter error handling
2019-07-08 13:49:45 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
objectNamesWithBoundStatus->Add(Tuple::Create(managedObjectName, alreadyBound, cached));
}
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
}
BindObjectAsyncHandler - Reduce nesting Combine Context Get and Context Enter error handling
2019-07-08 13:49:45 +10:00
}
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
else
{
//No objects names were specified so we default to makeing the request
boundObjectRequired = true;
}
BindObjectAsyncHandler - Reduce nesting Combine Context Get and Context Enter error handling
2019-07-08 13:49:45 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
auto frame = context->GetFrame();
BindObjectAsyncHandler - Further reduce nesting, simplifying frame checks in the progress
2019-07-08 15:14:42 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
if (frame.get() && frame->IsValid())
BindObjectAsyncHandler - Reduce nesting Combine Context Get and Context Enter error handling
2019-07-08 13:49:45 +10:00
{
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
if (boundObjectRequired || ignoreCache)
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
{
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
//If the number of cached objects matches the number of args
//(we have a cached copy of all requested objects)
//then we'll immediately bind the cached objects
Javascript Binding - CefSharp.BindObjectAsync() never raised the ResolveObject event Resolves #3470
2021-04-28 13:45:58 +10:00
//If objectCount and cachedObject count are both 0 then we'll
//send the kJavascriptRootObjectRequest message
//https://github.com/cefsharp/CefSharp/issues/3470
if (objectCount > 0 && cachedObjects->Count == objectCount && ignoreCache == false)
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
{
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
if (Object::ReferenceEquals(_browserWrapper, nullptr))
{
exception = "BindObjectAsyncHandler::Execute - Browser wrapper null, unable to bind objects";
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
return true;
}
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
auto browser = context->GetBrowser();
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
auto rootObjectWrappers = _browserWrapper->JavascriptRootObjectWrappers;
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
JavascriptRootObjectWrapper^ rootObject;
if (!rootObjectWrappers->TryGetValue(frame->GetIdentifier(), rootObject))
{
Net Core - Support for compiling with .Net Core 3.1 - Make Wpf/WinForms/OffScreen projects target AnyCPU Only the VC++ projects are platform specific now. - Remove BrowserSubProcess project reference Not needed as we now have a standalone exe - Add OffScreen example - Add WPF Example project - Fix some compile errors for main solution - Add BrowserSubProcess executable - JavascriptObjectRepository remove isAsync param Rather than throw exception remove the option - BrowserSubprocess Exclude the WCF specific code from the netCore project - Add some ifdef/ifndef to exclude the WCF specific implementation - Move WCF implementation into separate namespace
2020-07-18 13:30:54 +10:00
#ifdef NETCOREAPP
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
rootObject = gcnew JavascriptRootObjectWrapper(browser->GetIdentifier());
Net Core - Support for compiling with .Net Core 3.1 - Make Wpf/WinForms/OffScreen projects target AnyCPU Only the VC++ projects are platform specific now. - Remove BrowserSubProcess project reference Not needed as we now have a standalone exe - Add OffScreen example - Add WPF Example project - Fix some compile errors for main solution - Add BrowserSubProcess executable - JavascriptObjectRepository remove isAsync param Rather than throw exception remove the option - BrowserSubprocess Exclude the WCF specific code from the netCore project - Add some ifdef/ifndef to exclude the WCF specific implementation - Move WCF implementation into separate namespace
2020-07-18 13:30:54 +10:00
#else
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
rootObject = gcnew JavascriptRootObjectWrapper(browser->GetIdentifier(), _browserWrapper->BrowserProcess);
Net Core - Support for compiling with .Net Core 3.1 - Make Wpf/WinForms/OffScreen projects target AnyCPU Only the VC++ projects are platform specific now. - Remove BrowserSubProcess project reference Not needed as we now have a standalone exe - Add OffScreen example - Add WPF Example project - Fix some compile errors for main solution - Add BrowserSubProcess executable - JavascriptObjectRepository remove isAsync param Rather than throw exception remove the option - BrowserSubprocess Exclude the WCF specific code from the netCore project - Add some ifdef/ifndef to exclude the WCF specific implementation - Move WCF implementation into separate namespace
2020-07-18 13:30:54 +10:00
#endif
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
rootObjectWrappers->TryAdd(frame->GetIdentifier(), rootObject);
}
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
//Cached objects only contains a list of objects not already bound
rootObject->Bind(cachedObjects, context->GetGlobal());
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
//Objects already bound or ignore cache
CefRefPtr<CefV8Value> promiseResolve;
CefRefPtr<CefV8Exception> promiseException;
BindObjectAsyncHandler - Switch to using Promise.resolve when immediate response available Instead of creating a new promise then resolving it, we just resolve directly Requires a slightly different approach using Eval with a string as I couldn't get a reference to Promise.resolve then execute it successfully.
2019-07-08 21:06:32 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
auto promiseResolveScript = StringUtils::ToNative("Promise.resolve({Success:true, Count:" + cachedObjects->Count + ", Message:'OK'});");
BindObjectAsyncHandler - Switch to using Promise.resolve when immediate response available Instead of creating a new promise then resolving it, we just resolve directly Requires a slightly different approach using Eval with a string as I couldn't get a reference to Promise.resolve then execute it successfully.
2019-07-08 21:06:32 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
if (context->Eval(promiseResolveScript, CefString(), 0, promiseResolve, promiseException))
{
retval = promiseResolve;
}
else
{
exception = promiseException->GetMessage();
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
return true;
}
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
NotifyObjectBound(frame, objectNamesWithBoundStatus);
}
else
BindObjectAsyncHandler - Switch to using Promise.resolve when immediate response available Instead of creating a new promise then resolving it, we just resolve directly Requires a slightly different approach using Eval with a string as I couldn't get a reference to Promise.resolve then execute it successfully.
2019-07-08 21:06:32 +10:00
{
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
CefRefPtr<CefV8Value> promiseData;
CefRefPtr<CefV8Exception> promiseException;
//this will create a promise and give us the reject/resolve functions {p: Promise, res: resolve(), rej: reject()}
if (!context->Eval(CefAppUnmanagedWrapper::kPromiseCreatorScript, CefString(), 0, promiseData, promiseException))
{
exception = promiseException->GetMessage();
BindObjectAsyncHandler - Switch to using Promise.resolve when immediate response available Instead of creating a new promise then resolving it, we just resolve directly Requires a slightly different approach using Eval with a string as I couldn't get a reference to Promise.resolve then execute it successfully.
2019-07-08 21:06:32 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
return true;
}
BindObjectAsyncHandler - Switch to using Promise.resolve when immediate response available Instead of creating a new promise then resolving it, we just resolve directly Requires a slightly different approach using Eval with a string as I couldn't get a reference to Promise.resolve then execute it successfully.
2019-07-08 21:06:32 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
//when refreshing the browser this is sometimes null, in this case return true and log message
//https://github.com/cefsharp/CefSharp/pull/2446
C++/CLI - Replace NULL with nullptr Issue #3636
2021-07-31 15:35:38 +10:00
if (promiseData == nullptr)
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
{
C++/CLI - Replace NULL with nullptr Issue #3636
2021-07-31 15:35:38 +10:00
LOG(WARNING) << "BindObjectAsyncHandler::Execute promiseData returned nullptr";
BindObjectAsyncHandler - Switch to using Promise.resolve when immediate response available Instead of creating a new promise then resolving it, we just resolve directly Requires a slightly different approach using Eval with a string as I couldn't get a reference to Promise.resolve then execute it successfully.
2019-07-08 21:06:32 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
return true;
}
BindObjectAsyncHandler - Switch to using Promise.resolve when immediate response available Instead of creating a new promise then resolving it, we just resolve directly Requires a slightly different approach using Eval with a string as I couldn't get a reference to Promise.resolve then execute it successfully.
2019-07-08 21:06:32 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
//return the promose
retval = promiseData->GetValue("p");
BindObjectAsyncHandler - Switch to using Promise.resolve when immediate response available Instead of creating a new promise then resolving it, we just resolve directly Requires a slightly different approach using Eval with a string as I couldn't get a reference to Promise.resolve then execute it successfully.
2019-07-08 21:06:32 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
//References to the promise resolve and reject methods
auto resolve = promiseData->GetValue("res");
auto reject = promiseData->GetValue("rej");
BindObjectAsyncHandler - Switch to using Promise.resolve when immediate response available Instead of creating a new promise then resolving it, we just resolve directly Requires a slightly different approach using Eval with a string as I couldn't get a reference to Promise.resolve then execute it successfully.
2019-07-08 21:06:32 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
auto callback = gcnew JavascriptAsyncMethodCallback(context, resolve, reject);
BindObjectAsyncHandler - Switch to using Promise.resolve when immediate response available Instead of creating a new promise then resolving it, we just resolve directly Requires a slightly different approach using Eval with a string as I couldn't get a reference to Promise.resolve then execute it successfully.
2019-07-08 21:06:32 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
auto request = CefProcessMessage::Create(kJavascriptRootObjectRequest);
auto argList = request->GetArgumentList();
BindObjectAsyncHandler - Move some variables closer to their usage
2019-07-08 15:17:40 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
//Obtain a callbackId then send off the Request for objects
auto callbackId = _callbackRegistry->SaveMethodCallback(callback);
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
SetInt64(argList, 0, callbackId);
argList->SetList(1, params);
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
frame->SendProcessMessage(CefProcessId::PID_BROWSER, request);
}
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
}
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
else
{
//Objects already bound or ignore cache
CefRefPtr<CefV8Value> promiseResolve;
CefRefPtr<CefV8Exception> promiseException;
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
auto promiseResolveScript = CefString("Promise.resolve({Success:false, Count:0, Message:'Object(s) already bound'});");
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
if (context->Eval(promiseResolveScript, CefString(), 0, promiseResolve, promiseException))
{
retval = promiseResolve;
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
if (notifyIfAlreadyBound)
{
NotifyObjectBound(frame, objectNamesWithBoundStatus);
}
}
else
BindObjectAsyncHandler - Switch to using Promise.resolve when immediate response available Instead of creating a new promise then resolving it, we just resolve directly Requires a slightly different approach using Eval with a string as I couldn't get a reference to Promise.resolve then execute it successfully.
2019-07-08 21:06:32 +10:00
{
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
exception = promiseException->GetMessage();
BindObjectAsyncHandler - Switch to using Promise.resolve when immediate response available Instead of creating a new promise then resolving it, we just resolve directly Requires a slightly different approach using Eval with a string as I couldn't get a reference to Promise.resolve then execute it successfully.
2019-07-08 21:06:32 +10:00
}
}
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
}
else
{
exception = "BindObjectAsyncHandler::Execute - Frame is invalid.";
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
}
}
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
finally
BindObjectAsyncHandler - Further reduce nesting, simplifying frame checks in the progress
2019-07-08 15:14:42 +10:00
{
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
context->Exit();
BindObjectAsyncHandler - Further reduce nesting, simplifying frame checks in the progress
2019-07-08 15:14:42 +10:00
}
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
}
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
else
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
{
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
exception = "BindObjectAsyncHandler::Execute - Unable to Get or Enter Context";
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
}
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
return true;
}
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
private:
void NotifyObjectBound(const CefRefPtr<CefFrame> frame, List<Tuple<String^, bool, bool>^>^ objectNamesWithBoundStatus)
{
//Send message notifying Browser Process of which objects were bound
//We do this after the objects have been created in the V8Context to gurantee
//they are accessible.
auto msg = CefProcessMessage::Create(kJavascriptObjectsBoundInJavascript);
auto args = msg->GetArgumentList();
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
auto boundObjects = CefListValue::Create();
auto index = 0;
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
for each (auto obj in objectNamesWithBoundStatus)
{
auto dict = CefDictionaryValue::Create();
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
auto name = obj->Item1;
auto alreadyBound = obj->Item2;
auto isCached = obj->Item3;
dict->SetString("Name", StringUtils::ToNative(name));
dict->SetBool("IsCached", isCached);
dict->SetBool("AlreadyBound", alreadyBound);
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
boundObjects->SetDictionary(index++, dict);
}
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
args->SetList(0, boundObjects);
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
frame->SendProcessMessage(CefProcessId::PID_BROWSER, msg);
}
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
bool GetV8BoolValue(const CefRefPtr<CefV8Value> val, const CefString key, const CefString camelCaseKey)
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
{
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
if (val->HasValue(key))
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
{
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
auto obj = val->GetValue(key);
if (obj->IsBool())
{
return obj->GetBoolValue();
}
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
}
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
if (val->HasValue(camelCaseKey))
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
{
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
auto obj = val->GetValue(camelCaseKey);
if (obj->IsBool())
{
return obj->GetBoolValue();
}
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
}
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
return false;
}
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
Update to M93 (#3781) * Upgrade to CEF 93.1.7+g9117d6a+chromium-93.0.4577.42 / Chromium 93.0.4577.42 - Core - Add basic ref counting implementation IMPLEMENT_REFCOUNTING implementation uses atomic which forces the VC++ compiler to compile as native which doesn't work for our managed ref classes. - Use InterlockedCompareExchange for custom ref count reads - Use InterlockedIncrement/InterlockedDecrement directly - There's no memory barrier for HasOneRef/HasAtLeastOneRef as the read of a LONG should happen in one operation on 32/64 bit architectures (at least that's my understanding at this point in time). References: https://github.com/chromiumembedded/cef/blob/4472/include/base/internal/cef_atomicops_x86_msvc.h#L125 https://github.com/chromiumembedded/cef/blob/4472/include/base/internal/cef_atomicops_arm64_msvc.h#L107 https://github.com/chromiumembedded/cef/blob/4472/include/base/cef_atomic_ref_count.h#L114 https://github.com/chromiumembedded/cef/blob/4472/include/cef_base.h#L91 - Remove Microsoft.Net.Compilers package from projects Now that we require a min of VS2019 to build there's no need for a custom compiler package - Start removing VS2015/VC++2015 references - Remove RegisterWidevineCdm This is a breaking change. CEF will now automatically download the Widevine CDM component Resolves #3767 - RequestContext.LoadExtension now uses managed to code spawn on CEF UI Thread Avoid having to use cef_callback.h which was causing problems for x86 builds
2021-09-03 10:51:18 +10:00
IMPLEMENT_REFCOUNTINGM(BindObjectAsyncHandler);
BrowserSubprocess - Namespace cleanup Possibly a few cases that were missed, this should be the bulk of the rename Resolves #3253
2021-02-27 12:11:35 +10:00
};
}
CefSharp.BindObjectAsync - Split out into it's own Handler - Add BindObjectAsyncHandler - Remove unneeded params from RegisterBoundObjectHandler
2019-07-08 13:47:22 +10:00
}
Reference in New Issue Copy Permalink