Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,19 @@
#include "CefAppUnmanagedWrapper.h"
#include "RegisterBoundObjectHandler.h"
#include "JavascriptRootObjectWrapper.h"
#include "Async\JavascriptAsyncMethodCallback.h"
#include "Serialization\V8Serialization.h"
#include "Serialization\JsObjectsSerialization.h"
#include "Async\JavascriptAsyncMethodCallback.h"
#include "Wrapper\V8Context.h"
#include "Wrapper\Frame.h"
#include "Wrapper\Browser.h"
#include "..\CefSharp.Core\Internals\Messaging\Messages.h"
#include "..\CefSharp.Core\Internals\Serialization\Primitives.h"

using namespace System;
using namespace System::Diagnostics;
using namespace System::Collections::Generic;
using namespace CefSharp::BrowserSubprocess;
using namespace CefSharp::Internals::Messaging;
using namespace CefSharp::Internals::Serialization;

Expand Down Expand Up @@ -62,6 +66,15 @@ namespace CefSharp

void CefAppUnmanagedWrapper::OnContextCreated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context)
{
if (!Object::ReferenceEquals(_handler, nullptr))
{
Browser browserWrapper(browser);
Frame frameWrapper(frame);
V8Context contextWrapper(context);

_handler->OnContextCreated(%browserWrapper, %frameWrapper, %contextWrapper);
}

if (_legacyBindingEnabled)
{
if (_javascriptObjects->Count > 0)
Expand Down Expand Up @@ -115,6 +128,15 @@ namespace CefSharp

void CefAppUnmanagedWrapper::OnContextReleased(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context)
{
if (!Object::ReferenceEquals(_handler, nullptr))
{
Browser browserWrapper(browser);
Frame frameWrapper(frame);
V8Context contextWrapper(context);

_handler->OnContextReleased(%browserWrapper, %frameWrapper, %contextWrapper);
}

auto contextReleasedMessage = CefProcessMessage::Create(kOnContextReleasedRequest);

SetInt64(contextReleasedMessage->GetArgumentList(), 0, frame->GetIdentifier());
Expand Down
5 changes: 4 additions & 1 deletion CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@
#include "RegisterBoundObjectRegistry.h"

using namespace System::Collections::Generic;
using namespace CefSharp::RenderProcess;

namespace CefSharp
{
// This class is the native subprocess level CEF object wrapper.
private class CefAppUnmanagedWrapper : CefApp, CefRenderProcessHandler
{
private:
gcroot<IRenderProcessHandler^> _handler;
gcroot<Action<CefBrowserWrapper^>^> _onBrowserCreated;
gcroot<Action<CefBrowserWrapper^>^> _onBrowserDestroyed;
gcroot<ConcurrentDictionary<int, CefBrowserWrapper^>^> _browserWrappers;
Expand All @@ -35,8 +37,9 @@ namespace CefSharp
public:
static const CefString kPromiseCreatorScript;

CefAppUnmanagedWrapper(List<CefCustomScheme^>^ schemes, bool enableFocusedNodeChanged, Action<CefBrowserWrapper^>^ onBrowserCreated, Action<CefBrowserWrapper^>^ onBrowserDestoryed)
CefAppUnmanagedWrapper(IRenderProcessHandler^ handler, List<CefCustomScheme^>^ schemes, bool enableFocusedNodeChanged, Action<CefBrowserWrapper^>^ onBrowserCreated, Action<CefBrowserWrapper^>^ onBrowserDestoryed)
{
_handler = handler;
_onBrowserCreated = onBrowserCreated;
_onBrowserDestroyed = onBrowserDestoryed;
_browserWrappers = gcnew ConcurrentDictionary<int, CefBrowserWrapper^>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,9 @@
<ClInclude Include="Async\JavascriptAsyncMethodWrapper.h" />
<ClInclude Include="Async\JavascriptAsyncObjectWrapper.h" />
<ClInclude Include="CefAppUnmanagedWrapper.h" />
<ClInclude Include="Wrapper\Frame.h" />
<ClInclude Include="Wrapper\Browser.h" />
<ClInclude Include="Wrapper\V8Context.h" />
<ClInclude Include="RegisterBoundObjectHandler.h" />
<ClInclude Include="RegisterBoundObjectRegistry.h" />
<ClInclude Include="resource.h" />
Expand Down Expand Up @@ -206,6 +209,8 @@
<ClCompile Include="Async\JavascriptAsyncMethodWrapper.cpp" />
<ClCompile Include="Async\JavascriptAsyncObjectWrapper.cpp" />
<ClCompile Include="CefAppUnmanagedWrapper.cpp" />
<ClCompile Include="Wrapper\Frame.cpp" />
<ClCompile Include="Wrapper\Browser.cpp" />
<ClCompile Include="WcfEnabledSubProcess.cpp" />
<ClCompile Include="JavascriptCallbackRegistry.cpp" />
<ClCompile Include="JavascriptMethodHandler.cpp" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,15 @@
<ClInclude Include="RegisterBoundObjectRegistry.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Wrapper\Frame.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Wrapper\Browser.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Wrapper\V8Context.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="AssemblyInfo.cpp">
Expand Down Expand Up @@ -157,6 +166,12 @@
<ClCompile Include="WcfEnabledSubProcess.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Wrapper\Frame.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Wrapper\Browser.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Resource.rc" />
Expand Down
5 changes: 3 additions & 2 deletions CefSharp.BrowserSubprocess.Core/SubProcess.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
using namespace System::Collections::Generic;
using namespace System::Linq;
using namespace CefSharp::Internals;
using namespace CefSharp::RenderProcess;

namespace CefSharp
{
Expand All @@ -26,14 +27,14 @@ namespace CefSharp
MCefRefPtr<CefAppUnmanagedWrapper> _cefApp;

public:
SubProcess(IEnumerable<String^>^ args)
SubProcess(IRenderProcessHandler^ handler, IEnumerable<String^>^ args)
{
auto onBrowserCreated = gcnew Action<CefBrowserWrapper^>(this, &SubProcess::OnBrowserCreated);
auto onBrowserDestroyed = gcnew Action<CefBrowserWrapper^>(this, &SubProcess::OnBrowserDestroyed);
auto schemes = CefCustomScheme::ParseCommandLineArguments(args);
auto enableFocusedNodeChanged = CommandLineArgsParser::HasArgument(args, CefSharpArguments::FocusedNodeChangedEnabledArgument);

_cefApp = new CefAppUnmanagedWrapper(schemes, enableFocusedNodeChanged, onBrowserCreated, onBrowserDestroyed);
_cefApp = new CefAppUnmanagedWrapper(handler, schemes, enableFocusedNodeChanged, onBrowserCreated, onBrowserDestroyed);
}

!SubProcess()
Expand Down
5 changes: 3 additions & 2 deletions CefSharp.BrowserSubprocess.Core/WcfEnabledSubProcess.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "CefBrowserWrapper.h"

using namespace System;
using namespace CefSharp::RenderProcess;

namespace CefSharp
{
Expand All @@ -25,7 +26,7 @@ namespace CefSharp
int _parentProcessId;

public:
WcfEnabledSubProcess(int parentProcessId, IEnumerable<String^>^ args) : SubProcess(args)
WcfEnabledSubProcess(int parentProcessId, IRenderProcessHandler^ handler, IEnumerable<String^>^ args) : SubProcess(handler,args)
{
_parentProcessId = parentProcessId;
}
Expand All @@ -34,4 +35,4 @@ namespace CefSharp
void OnBrowserDestroyed(CefBrowserWrapper^ browser) override;
};
}
}
}
221 changes: 221 additions & 0 deletions CefSharp.BrowserSubprocess.Core/Wrapper/Browser.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,221 @@
// Copyright © 2015 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.

#include "Stdafx.h"

#include "Frame.h"
#include "Browser.h"

using namespace CefSharp::BrowserSubprocess;

///
// Returns the browser host object. This method can only be called in the
// browser process.
///
/*--cef()--*/
IBrowserHost^ Browser::GetHost()
{
throw gcnew NotImplementedException("Browser process only");
}

///
// Returns true if the browser can navigate backwards.
///
/*--cef()--*/
bool Browser::CanGoBack::get()
{
return _browser->CanGoBack();
}

///
// Navigate backwards.
///
/*--cef()--*/
void Browser::GoBack()
{
_browser->GoBack();
}

///
// Returns true if the browser can navigate forwards.
///
/*--cef()--*/
bool Browser::CanGoForward::get()
{
return _browser->CanGoForward();
}

///
// Navigate forwards.
///
/*--cef()--*/
void Browser::GoForward()
{
_browser->GoForward();
}

///
// Returns true if the browser is currently loading.
///
/*--cef()--*/
bool Browser::IsLoading::get()
{
return _browser->IsLoading();
}

void Browser::CloseBrowser(bool forceClose)
{
throw gcnew NotImplementedException("Browser process only");
}

///
// Reload the current page.
///
/*--cef()--*/
void Browser::Reload(bool ignoreCache)
{
if (ignoreCache)
{
_browser->ReloadIgnoreCache();
}
else
{
_browser->Reload();
}
}

///
// Stop loading the page.
///
/*--cef()--*/
void Browser::StopLoad()
{
_browser->StopLoad();
}

///
// Returns the globally unique identifier for this browser.
///
/*--cef()--*/
int Browser::Identifier::get()
{
return _browser->GetIdentifier();
}

///
// Returns true if this object is pointing to the same handle as |that|
// object.
///
/*--cef()--*/
bool Browser::IsSame(IBrowser^ that)
{
return _browser->IsSame(dynamic_cast<Browser^>(that)->_browser.get());
}

///
// Returns true if the window is a popup window.
///
/*--cef()--*/
bool Browser::IsPopup::get()
{
return _browser->IsPopup();
}

///
// Returns true if a document has been loaded in the browser.
///
/*--cef()--*/
bool Browser::HasDocument::get()
{
return _browser->HasDocument();
}

IFrame^ Browser::MainFrame::get()
{
auto frame = _browser->GetMainFrame();
return gcnew Frame(frame);
}

///
// Returns the focused frame for the browser window.
///
/*--cef()--*/
IFrame^ Browser::FocusedFrame::get()
{
return gcnew Frame(_browser->GetFocusedFrame());
}

///
// Returns the frame with the specified identifier, or NULL if not found.
///
/*--cef(capi_name=get_frame_byident)--*/
IFrame^ Browser::GetFrame(Int64 identifier)
{
auto frame = _browser->GetFrame(identifier);

if (frame.get())
{
return gcnew Frame(frame);
}

return nullptr;
}

///
// Returns the frame with the specified name, or NULL if not found.
///
/*--cef(optional_param=name)--*/
IFrame^ Browser::GetFrame(String^ name)
{
auto frame = _browser->GetFrame(StringUtils::ToNative(name));

if (frame.get())
{
return gcnew Frame(frame);
}

return nullptr;
}

///
// Returns the number of frames that currently exist.
///
/*--cef()--*/
int Browser::GetFrameCount()
{
return _browser->GetFrameCount();
}

///
// Returns the identifiers of all existing frames.
///
/*--cef(count_func=identifiers:GetFrameCount)--*/
List<Int64>^ Browser::GetFrameIdentifiers()
{
std::vector<Int64> identifiers;
_browser->GetFrameIdentifiers(identifiers);
List<Int64>^ results = gcnew List<Int64>(identifiers.size());
for (UINT i = 0; i < identifiers.size(); i++)
{
results->Add(identifiers[i]);
}
return results;
}

///
// Returns the names of all existing frames.
///
/*--cef()--*/
List<String^>^ Browser::GetFrameNames()
{
std::vector<CefString> names;

_browser->GetFrameNames(names);
return StringUtils::ToClr(names);
}

bool Browser::IsDisposed::get()
{
return _disposed;
}
Loading