Skip to content
Merged
Changes from 1 commit
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
14 changes: 12 additions & 2 deletions CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ namespace CefSharp

auto browserWrapper = FindBrowserWrapper(browser->GetIdentifier());

if (browserWrapper != nullptr && browserWrapper->JavascriptBindingApiEnabled && IsJavascriptBindingApiAllowed(browserWrapper, frame))
if (IsJavascriptBindingApiAllowed(browserWrapper, frame))
{
//TODO: Look at adding some sort of javascript mapping layer to reduce the code duplication
auto global = context->GetGlobal();
Expand Down Expand Up @@ -349,7 +349,17 @@ namespace CefSharp

bool CefAppUnmanagedWrapper::IsJavascriptBindingApiAllowed(CefBrowserWrapper^ browserWrapper, CefRefPtr<CefFrame> frame)
{
if (browserWrapper == nullptr || !browserWrapper->JavascriptBindingApiHasAllowOrigins)
if (browserWrapper == nullptr)
{
return true;
}

if (!browserWrapper->JavascriptBindingApiEnabled)
{
return false;
}

if (!browserWrapper->JavascriptBindingApiHasAllowOrigins)
{
return true;
}
Expand Down