Skip to content

Commit

Permalink
SendProcessMessage - Remove frame/browserid from messages
Browse files Browse the repository at this point in the history 
Not complete or tested yet
  • Loading branch information
@amaitland
amaitland committed Jun 13, 2019
1 parent 165b267 commit becb14d
Show file tree
Hide file tree
Showing 8 changed files with 78 additions and 146 deletions.
9 changes: 4 additions & 5 deletions CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncMethodHandler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,10 @@ namespace CefSharp
SerializeV8Object(arguments[i], params, i, _callbackRegistry);
}

SetInt64(argList, 0, frame->GetIdentifier());
SetInt64(argList, 1, _objectId);
SetInt64(argList, 2, callbackId);
argList->SetString(3, name);
argList->SetList(4, params);
SetInt64(argList, 0, _objectId);
SetInt64(argList, 1, callbackId);
argList->SetString(2, name);
argList->SetList(3, params);

frame->SendProcessMessage(CefProcessId::PID_BROWSER, request);

Expand Down
35 changes: 13 additions & 22 deletions CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,6 @@ namespace CefSharp
//have been created
auto contextCreatedMessage = CefProcessMessage::Create(kOnContextCreatedRequest);

SetInt64(contextCreatedMessage->GetArgumentList(), 0, frame->GetIdentifier());

frame->SendProcessMessage(CefProcessId::PID_BROWSER, contextCreatedMessage);
};

Expand All @@ -141,8 +139,6 @@ namespace CefSharp

auto contextReleasedMessage = CefProcessMessage::Create(kOnContextReleasedRequest);

SetInt64(contextReleasedMessage->GetArgumentList(), 0, frame->GetIdentifier());

frame->SendProcessMessage(CefProcessId::PID_BROWSER, contextReleasedMessage);

auto browserWrapper = FindBrowserWrapper(browser->GetIdentifier());
Expand Down Expand Up @@ -172,19 +168,16 @@ namespace CefSharp
auto focusedNodeChangedMessage = CefProcessMessage::Create(kOnFocusedNodeChanged);
auto list = focusedNodeChangedMessage->GetArgumentList();

// Needed in the browser process to get the frame.
SetInt64(list, 0, frame->GetIdentifier());

// The node will be empty if an element loses focus but another one
// doesn't gain focus. Only transfer information if the node is an
// element.
if (node != nullptr && node->IsElement())
{
// True when a node exists, false if it doesn't.
list->SetBool(1, true);
list->SetBool(0, true);

// Store the tag name.
list->SetString(2, node->GetElementTagName());
list->SetString(1, node->GetElementTagName());

// Transfer the attributes in a Dictionary.
auto attributes = CefDictionaryValue::Create();
Expand All @@ -195,11 +188,11 @@ namespace CefSharp
attributes->SetString(iter.first, iter.second);
}

list->SetDictionary(3, attributes);
list->SetDictionary(2, attributes);
}
else
{
list->SetBool(1, false);
list->SetBool(0, false);
}

frame->SendProcessMessage(CefProcessId::PID_BROWSER, focusedNodeChangedMessage);
Expand All @@ -210,9 +203,7 @@ namespace CefSharp
auto uncaughtExceptionMessage = CefProcessMessage::Create(kOnUncaughtException);
auto list = uncaughtExceptionMessage->GetArgumentList();

// Needed in the browser process to get the frame.
SetInt64(list, 0, frame->GetIdentifier());
list->SetString(1, exception->GetMessage());
list->SetString(0, exception->GetMessage());

auto frames = CefListValue::Create();
for (auto i = 0; i < stackTrace->GetFrameCount(); i++)
Expand All @@ -228,7 +219,7 @@ namespace CefSharp
frames->SetList(i, frame);
}

list->SetList(2, frames);
list->SetList(1, frames);

frame->SendProcessMessage(CefProcessId::PID_BROWSER, uncaughtExceptionMessage);
}
Expand Down Expand Up @@ -336,7 +327,7 @@ namespace CefSharp
}

//both messages have the frameId stored at 0 and callbackId stored at index 1
auto frameId = GetInt64(argList, 0);
auto frameId = frame->GetIdentifier();
int64 callbackId = GetInt64(argList, 1);

if (name == kEvaluateJavascriptRequest)
Expand Down Expand Up @@ -478,7 +469,7 @@ namespace CefSharp
else if (name == kJavascriptCallbackDestroyRequest)
{
auto jsCallbackId = GetInt64(argList, 0);
auto frameId = GetInt64(argList, 1);
auto frameId = frame->GetIdentifier();
JavascriptRootObjectWrapper^ rootObjectWrapper;
browserWrapper->JavascriptRootObjectWrappers->TryGetValue(frameId, rootObjectWrapper);
if (rootObjectWrapper != nullptr && rootObjectWrapper->CallbackRegistry != nullptr)
Expand Down Expand Up @@ -517,10 +508,10 @@ namespace CefSharp
}
else
{
auto browserId = argList->GetInt(1);
auto frameId = GetInt64(argList, 2);
auto callbackId = GetInt64(argList, 3);
auto javascriptObjects = DeserializeJsObjects(argList, 4);
auto browserId = browser->GetIdentifier();
auto frameId = frame->GetIdentifier();
auto callbackId = GetInt64(argList, 1);
auto javascriptObjects = DeserializeJsObjects(argList, 2);

//Caching of JavascriptObjects
//TODO: JSB Should caching be configurable? On a per object basis?
Expand Down Expand Up @@ -609,7 +600,7 @@ namespace CefSharp
}
else if (name == kJavascriptAsyncMethodCallResponse)
{
auto frameId = GetInt64(argList, 0);
auto frameId = frame->GetIdentifier();
auto callbackId = GetInt64(argList, 1);

JavascriptRootObjectWrapper^ rootObjectWrapper;
Expand Down
4 changes: 1 addition & 3 deletions CefSharp.BrowserSubprocess.Core/JavascriptPostMessageHandler.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,13 @@ namespace CefSharp
auto request = CefProcessMessage::Create(kJavascriptMessageReceived);
auto argList = request->GetArgumentList();

SetInt64(argList, 0, frame->GetIdentifier());

auto params = CefListValue::Create();
SerializeV8Object(arguments[0], params, 0, _javascriptCallbackRegistry);

//We're only interested in the first param
if (params->GetSize() > 0)
{
argList->SetValue(1, params->GetValue(0));
argList->SetValue(0, params->GetValue(0));
}

frame->SendProcessMessage(CefProcessId::PID_BROWSER, request);
Expand Down
6 changes: 2 additions & 4 deletions CefSharp.BrowserSubprocess.Core/RegisterBoundObjectHandler.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,10 +282,8 @@ namespace CefSharp
//Obtain a callbackId then send off the Request for objects
auto callbackId = _callbackRegistry->SaveMethodCallback(callback);

argList->SetInt(0, browser->GetIdentifier());
SetInt64(argList, 1, frame->GetIdentifier());
SetInt64(argList, 2, callbackId);
argList->SetList(3, params);
SetInt64(argList, 0, callbackId);
argList->SetList(1, params);

frame->SendProcessMessage(CefProcessId::PID_BROWSER, request);
}
Expand Down
30 changes: 28 additions & 2 deletions CefSharp.Core/Internals/CefFrameWrapper.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
#include "Internals\CefFrameWrapper.h"
#include "Internals\StringVisitor.h"
#include "Internals\ClientAdapter.h"
#include "Internals\Serialization\Primitives.h"
#include "Internals\Messaging\Messages.h"

using namespace CefSharp::Internals::Messaging;
using namespace CefSharp::Internals::Serialization;

///
// True if this object is currently attached to a valid frame.
Expand Down Expand Up @@ -240,9 +245,30 @@ Task<JavascriptResponse^>^ CefFrameWrapper::EvaluateScriptAsync(String^ script,
auto browser = _frame->GetBrowser();
auto host = browser->GetHost();

//If we're unable to get the underlying browser/browserhost then return null
if (!browser.get() || !host.get())
{
return nullptr;
}

auto client = static_cast<ClientAdapter*>(host->GetClient().get());

return client->EvaluateScriptAsync(browser->GetIdentifier(), browser->IsPopup(), _frame->GetIdentifier(), script, scriptUrl, startLine, timeout);
auto pendingTaskRepository = client->GetPendingTaskRepository();

//create a new taskcompletionsource
auto idAndComplectionSource = pendingTaskRepository->CreatePendingTask(timeout);

auto message = CefProcessMessage::Create(kEvaluateJavascriptRequest);
auto argList = message->GetArgumentList();
SetInt64(argList, 0, _frame->GetIdentifier());
SetInt64(argList, 1, idAndComplectionSource.Key);
argList->SetString(2, StringUtils::ToNative(script));
argList->SetString(3, StringUtils::ToNative(scriptUrl));
argList->SetInt(4, startLine);

_frame->SendProcessMessage(CefProcessId::PID_RENDERER, message);

return idAndComplectionSource.Value->Task;
}

///
Expand Down Expand Up @@ -388,4 +414,4 @@ void CefFrameWrapper::ThrowIfFrameInvalid()
{
throw gcnew Exception(L"The underlying frame is no longer valid - please check the IsValid property before calling!");
}
}
}
94 changes: 25 additions & 69 deletions CefSharp.Core/Internals/ClientAdapter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -635,10 +635,8 @@ namespace CefSharp
auto msg = CefProcessMessage::Create(kJavascriptRootObjectResponse);
auto responseArgList = msg->GetArgumentList();
responseArgList->SetBool(0, true); //Use Legacy Behaviour (auto bind on context creation)
responseArgList->SetInt(1, -1); //BrowserId
SetInt64(responseArgList, 2, 0); //FrameId
SetInt64(responseArgList, 3, 0); //CallbackId
SerializeJsObjects(objectRepository->GetObjects(nullptr), responseArgList, 4);
SetInt64(responseArgList, 1, 0); //CallbackId
SerializeJsObjects(objectRepository->GetObjects(nullptr), responseArgList, 2);

browser->GetMainFrame()->SendProcessMessage(CefProcessId::PID_RENDERER, msg);
}
Expand Down Expand Up @@ -1050,10 +1048,8 @@ namespace CefSharp
{
auto objectRepository = _browserAdapter->JavascriptObjectRepository;

auto browserId = argList->GetInt(0);
auto frameId = GetInt64(argList, 1);
auto callbackId = GetInt64(argList, 2);
auto objectNames = argList->GetList(3);
auto callbackId = GetInt64(argList, 0);
auto objectNames = argList->GetList(1);

auto names = gcnew List<String^>(objectNames->GetSize());
for (auto i = 0; i < objectNames->GetSize(); i++)
Expand All @@ -1069,10 +1065,8 @@ namespace CefSharp
auto msg = CefProcessMessage::Create(kJavascriptRootObjectResponse);
auto responseArgList = msg->GetArgumentList();
responseArgList->SetBool(0, false); //Use LegacyBehaviour (false)
responseArgList->SetInt(1, browserId);
SetInt64(responseArgList, 2, frameId);
SetInt64(responseArgList, 3, callbackId);
SerializeJsObjects(objs, responseArgList, 4);
SetInt64(responseArgList, 1, callbackId);
SerializeJsObjects(objs, responseArgList, 2);
frame->SendProcessMessage(CefProcessId::PID_RENDERER, msg);
}

Expand Down Expand Up @@ -1103,11 +1097,9 @@ namespace CefSharp
}
else if (name == kOnContextCreatedRequest)
{
auto frame = browser->GetFrame(GetInt64(argList, 0));

//In certain circumstances the frame has already been destroyed by the time
//we get here, only continue if we have a valid frame reference
if (frame.get())
if (frame.get() && frame->IsValid())
{
if (frame->IsMain())
{
Expand All @@ -1129,11 +1121,9 @@ namespace CefSharp
}
else if (name == kOnContextReleasedRequest)
{
auto frame = browser->GetFrame(GetInt64(argList, 0));

//In certain circumstances the frame has already been destroyed by the time
//we get here, only continue if we have a valid frame reference
if (frame.get())
if (frame.get() && frame->IsValid())
{
if (frame->IsMain())
{
Expand All @@ -1160,19 +1150,18 @@ namespace CefSharp
{
IDomNode^ node = nullptr;

// 0: frame ID (int 64)
// 1: is a node (bool)
// 2: tag name (string)
// 3: attributes (dictionary)
// 0: is a node (bool)
// 1: tag name (string)
// 2: attributes (dictionary)
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
CefFrameWrapper frameWrapper(browser->GetFrame(GetInt64(argList, 0)));
CefFrameWrapper frameWrapper(frame);

auto notEmpty = argList->GetBool(1);
auto notEmpty = argList->GetBool(0);
if (notEmpty)
{
// Node information was passed from the render process.
auto tagName = StringUtils::ToClr(argList->GetString(2));
auto argAttributes = argList->GetDictionary(3);
auto tagName = StringUtils::ToClr(argList->GetString(1));
auto argAttributes = argList->GetDictionary(2);
auto attributes = gcnew System::Collections::Generic::Dictionary<String^, String^>();
CefDictionaryValue::KeyList keys;
argAttributes->GetKeys(keys);
Expand All @@ -1194,14 +1183,14 @@ namespace CefSharp
if (handler != nullptr)
{
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
CefFrameWrapper frameWrapper(browser->GetFrame(GetInt64(argList, 0)));
CefFrameWrapper frameWrapper(frame);

auto exception = gcnew JavascriptException();
exception->Message = StringUtils::ToClr(argList->GetString(1));
exception->Message = StringUtils::ToClr(argList->GetString(0));

auto stackTrace = gcnew System::Collections::Generic::List<JavascriptStackFrame^>();

auto argFrames = argList->GetList(2);
auto argFrames = argList->GetList(1);

for (auto i = 0; i < static_cast<int>(argFrames->GetSize()); i++)
{
Expand Down Expand Up @@ -1248,11 +1237,11 @@ namespace CefSharp
}
else if (name == kJavascriptAsyncMethodCallRequest && !_browserAdapter->IsDisposed)
{
auto frameId = GetInt64(argList, 0);
auto objectId = GetInt64(argList, 1);
auto callbackId = GetInt64(argList, 2);
auto methodName = StringUtils::ToClr(argList->GetString(3));
auto arguments = argList->GetList(4);
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);
auto methodInvocation = gcnew MethodInvocation(browser->GetIdentifier(), frameId, objectId, methodName, (callbackId > 0 ? Nullable<int64>(callbackId) : Nullable<int64>()));
for (auto i = 0; i < static_cast<int>(arguments->GetSize()); i++)
{
Expand All @@ -1265,16 +1254,14 @@ namespace CefSharp
}
else if (name == kJavascriptMessageReceived)
{
auto frame = browser->GetFrame(GetInt64(argList, 0));

//In certain circumstances the frame has already been destroyed by the time
//we get here, only continue if we have a valid frame reference
if (frame.get())
if (frame.get() && frame->IsValid())
{
auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
CefFrameWrapper frameWrapper(frame);

auto message = DeserializeObject(argList, 1, callbackFactory);
auto message = DeserializeObject(argList, 0, callbackFactory);

_browserControl->SetJavascriptMessageReceived(gcnew JavascriptMessageReceivedEventArgs(browserWrapper, %frameWrapper, message));
}
Expand All @@ -1285,37 +1272,6 @@ namespace CefSharp
return handled;
}

Task<JavascriptResponse^>^ ClientAdapter::EvaluateScriptAsync(int browserId, bool isBrowserPopup, int64 frameId, String^ script, String^ scriptUrl, int startLine, Nullable<TimeSpan> timeout)
{
auto browser = GetBrowserWrapper(browserId, isBrowserPopup);

//If we're unable to get the underlying browser wrapper then return null
if (browser == nullptr)
{
return nullptr;
}

auto browserWrapper = static_cast<CefSharpBrowserWrapper^>(browser);
auto cefBrowser = browserWrapper->Browser;

//create a new taskcompletionsource
auto idAndComplectionSource = _pendingTaskRepository->CreatePendingTask(timeout);

auto message = CefProcessMessage::Create(kEvaluateJavascriptRequest);
auto argList = message->GetArgumentList();
SetInt64(argList, 0, frameId);
SetInt64(argList, 1, idAndComplectionSource.Key);
argList->SetString(2, StringUtils::ToNative(script));
argList->SetString(3, StringUtils::ToNative(scriptUrl));
argList->SetInt(4, startLine);

auto frame = cefBrowser->GetFrame(frameId);

frame->SendProcessMessage(CefProcessId::PID_RENDERER, message);

return idAndComplectionSource.Value->Task;
}

PendingTaskRepository<JavascriptResponse^>^ ClientAdapter::GetPendingTaskRepository()
{
return _pendingTaskRepository;
Expand Down
Loading

0 comments on commit becb14d

Please sign in to comment.