Skip to content

Commit 02011e5

Browse files
campersaucampersau
authored
Merge 0e09797 into 24e7df2 
2 parents 24e7df2 + 0e09797 commit 02011e5

6 files changed

Lines changed: 91 additions & 25 deletions

‎CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,11 @@ namespace CefSharp
6262
_onBrowserCreated->Invoke(wrapper);
6363

6464
//Multiple CefBrowserWrappers created when opening popups
65-
_browserWrappers->TryAdd(browser->GetIdentifier(), wrapper);
65+
auto browserId = browser->GetIdentifier();
66+
_browserWrappers->TryAdd(browserId, wrapper);
67+
68+
auto javascriptBindingSettings = gcnew JavascriptBindingSettings();
69+
_browserJavascriptBindingSettings->TryAdd(browserId, javascriptBindingSettings);
6670

6771
if (!extraInfo.get())
6872
{
@@ -103,19 +107,19 @@ namespace CefSharp
103107

104108
if (extraInfo->HasKey("JavascriptBindingApiEnabled"))
105109
{
106-
wrapper->JavascriptBindingApiEnabled = extraInfo->GetBool("JavascriptBindingApiEnabled");
110+
javascriptBindingSettings->JavascriptBindingApiEnabled = extraInfo->GetBool("JavascriptBindingApiEnabled");
107111
}
108112

109113
if (extraInfo->HasKey("JavascriptBindingApiHasAllowOrigins"))
110114
{
111-
wrapper->JavascriptBindingApiHasAllowOrigins = extraInfo->GetBool("JavascriptBindingApiHasAllowOrigins");
115+
javascriptBindingSettings->JavascriptBindingApiHasAllowOrigins = extraInfo->GetBool("JavascriptBindingApiHasAllowOrigins");
112116

113-
if (wrapper->JavascriptBindingApiHasAllowOrigins)
117+
if (javascriptBindingSettings->JavascriptBindingApiHasAllowOrigins)
114118
{
115119
auto allowOrigins = extraInfo->GetList("JavascriptBindingApiAllowOrigins");
116120
if (allowOrigins.get() && allowOrigins->IsValid())
117121
{
118-
wrapper->JavascriptBindingApiAllowOrigins = allowOrigins->Copy();
122+
javascriptBindingSettings->JavascriptBindingApiAllowOrigins = allowOrigins->Copy();
119123
}
120124
}
121125
}
@@ -136,6 +140,9 @@ namespace CefSharp
136140
_onBrowserDestroyed->Invoke(wrapper);
137141
delete wrapper;
138142
}
143+
144+
// Don't remove javascript settings because cef is unreliable in calling OnBrowserCreated/OnBrowserDestroyed consistently:
145+
// https://github.com/cefsharp/CefSharp/issues/5228
139146
};
140147

141148
void CefAppUnmanagedWrapper::OnContextCreated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context)
@@ -165,9 +172,10 @@ namespace CefSharp
165172
}
166173
}
167174

168-
auto browserWrapper = FindBrowserWrapper(browser->GetIdentifier());
175+
JavascriptBindingSettings^ javascriptBindingSettings = nullptr;
176+
_browserJavascriptBindingSettings->TryGetValue(browser->GetIdentifier(), javascriptBindingSettings);
169177

170-
if (browserWrapper != nullptr && browserWrapper->JavascriptBindingApiEnabled && IsJavascriptBindingApiAllowed(browserWrapper, frame))
178+
if (IsJavascriptBindingApiAllowed(javascriptBindingSettings, frame))
171179
{
172180
//TODO: Look at adding some sort of javascript mapping layer to reduce the code duplication
173181
auto global = context->GetGlobal();
@@ -347,14 +355,24 @@ namespace CefSharp
347355
return rootObject;
348356
}
349357

350-
bool CefAppUnmanagedWrapper::IsJavascriptBindingApiAllowed(CefBrowserWrapper^ browserWrapper, CefRefPtr<CefFrame> frame)
358+
bool CefAppUnmanagedWrapper::IsJavascriptBindingApiAllowed(JavascriptBindingSettings^ javascriptBindingSettings, CefRefPtr<CefFrame> frame)
351359
{
352-
if (browserWrapper == nullptr || !browserWrapper->JavascriptBindingApiHasAllowOrigins)
360+
if (javascriptBindingSettings == nullptr)
361+
{
362+
return false;
363+
}
364+
365+
if (!javascriptBindingSettings->JavascriptBindingApiEnabled)
366+
{
367+
return false;
368+
}
369+
370+
if (!javascriptBindingSettings->JavascriptBindingApiHasAllowOrigins)
353371
{
354372
return true;
355373
}
356374

357-
auto allowOrigins = browserWrapper->JavascriptBindingApiAllowOrigins;
375+
auto allowOrigins = javascriptBindingSettings->JavascriptBindingApiAllowOrigins;
358376
if (!allowOrigins.get())
359377
{
360378
return false;

‎CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.h‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
#include "SubProcessApp.h"
1111
#include "CefBrowserWrapper.h"
12+
#include "JavascriptBindingSettings.h"
1213
#include "RegisterBoundObjectRegistry.h"
1314

1415
using namespace System::Collections::Generic;
@@ -26,6 +27,7 @@ namespace CefSharp
2627
gcroot<Action<CefBrowserWrapper^>^> _onBrowserCreated;
2728
gcroot<Action<CefBrowserWrapper^>^> _onBrowserDestroyed;
2829
gcroot<ConcurrentDictionary<int, CefBrowserWrapper^>^> _browserWrappers;
30+
gcroot<ConcurrentDictionary<int, JavascriptBindingSettings^>^> _browserJavascriptBindingSettings;
2931
gcroot<ConcurrentDictionary<String^, JavascriptRootObjectWrapper^>^> _jsRootObjectWrappersByFrameId;
3032
bool _focusedNodeChangedEnabled;
3133
bool _legacyBindingEnabled;
@@ -38,7 +40,7 @@ namespace CefSharp
3840
gcroot<Dictionary<String^, JavascriptObject^>^> _javascriptObjects;
3941

4042
gcroot<RegisterBoundObjectRegistry^> _registerBoundObjectRegistry;
41-
bool IsJavascriptBindingApiAllowed(CefBrowserWrapper^ browserWrapper, CefRefPtr<CefFrame> frame);
43+
bool IsJavascriptBindingApiAllowed(JavascriptBindingSettings^ javascriptBindingSettings, CefRefPtr<CefFrame> frame);
4244

4345
public:
4446
static const CefString kPromiseCreatorScript;
@@ -49,6 +51,7 @@ namespace CefSharp
4951
_onBrowserCreated = onBrowserCreated;
5052
_onBrowserDestroyed = onBrowserDestroyed;
5153
_browserWrappers = gcnew ConcurrentDictionary<int, CefBrowserWrapper^>();
54+
_browserJavascriptBindingSettings = gcnew ConcurrentDictionary<int, JavascriptBindingSettings^>();
5255
_jsRootObjectWrappersByFrameId = gcnew ConcurrentDictionary<String^, JavascriptRootObjectWrapper^>();
5356
_focusedNodeChangedEnabled = enableFocusedNodeChanged;
5457
_javascriptObjects = gcnew Dictionary<String^, JavascriptObject^>();
@@ -70,6 +73,16 @@ namespace CefSharp
7073
_browserWrappers = nullptr;
7174
}
7275

76+
if (!Object::ReferenceEquals(_browserJavascriptBindingSettings, nullptr))
77+
{
78+
for each (JavascriptBindingSettings ^ javascriptBindingSettings in Enumerable::OfType<JavascriptBindingSettings^>(_browserJavascriptBindingSettings))
79+
{
80+
delete javascriptBindingSettings;
81+
}
82+
83+
_browserJavascriptBindingSettings = nullptr;
84+
}
85+
7386
if (!Object::ReferenceEquals(_jsRootObjectWrappersByFrameId, nullptr))
7487
{
7588
for each (JavascriptRootObjectWrapper^ rootObject in Enumerable::OfType<JavascriptRootObjectWrapper^>(_jsRootObjectWrappersByFrameId))

‎CefSharp.BrowserSubprocess.Core/CefBrowserWrapper.h‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,18 @@ namespace CefSharp
2828
{
2929
private:
3030
MCefRefPtr<CefBrowser> _cefBrowser;
31-
MCefRefPtr<CefListValue> _javascriptBindingApiAllowOrigins;
3231

3332
public:
3433
CefBrowserWrapper(const CefRefPtr<CefBrowser> &cefBrowser)
3534
{
3635
_cefBrowser = cefBrowser.get();
3736
BrowserId = cefBrowser->GetIdentifier();
3837
IsPopup = cefBrowser->IsPopup();
39-
40-
JavascriptBindingApiEnabled = true;
41-
JavascriptBindingApiHasAllowOrigins = false;
42-
JavascriptBindingApiAllowOrigins = nullptr;
4338
}
4439

4540
!CefBrowserWrapper()
4641
{
4742
_cefBrowser = nullptr;
48-
49-
_javascriptBindingApiAllowOrigins = nullptr;
5043
}
5144

5245
~CefBrowserWrapper()
@@ -56,13 +49,6 @@ namespace CefSharp
5649

5750
property int BrowserId;
5851
property bool IsPopup;
59-
property bool JavascriptBindingApiEnabled;
60-
property bool JavascriptBindingApiHasAllowOrigins;
61-
property CefRefPtr<CefListValue> JavascriptBindingApiAllowOrigins
62-
{
63-
CefRefPtr<CefListValue> get() { return _javascriptBindingApiAllowOrigins.get(); }
64-
void set(CefRefPtr<CefListValue> value) { _javascriptBindingApiAllowOrigins = value.get(); }
65-
}
6652

6753
#ifndef NETCOREAPP
6854
// This allows us to create the WCF proxies back to our parent process.

‎CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@
278278
<ClCompile Include="..\CefSharp.Core.Runtime\Internals\CefRefCountManaged.cpp" />
279279
<ClCompile Include="BrowserSubprocessExecutable.h" />
280280
<ClInclude Include="Cef.h" />
281+
<ClInclude Include="JavascriptBindingSettings.h" />
281282
<ClInclude Include="JavascriptRootObjectWrapper.h" />
282283
<ClInclude Include="SubProcessApp.h" />
283284
<ClInclude Include="Async\JavascriptAsyncMethodCallback.h" />

‎CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@
188188
<ClCompile Include="..\CefSharp.Core.Runtime\Internals\CefRefCountManaged.cpp" />
189189
<ClCompile Include="BrowserSubprocessExecutable.h" />
190190
<ClInclude Include="Cef.h" />
191+
<ClInclude Include="JavascriptBindingSettings.h" />
191192
<ClInclude Include="JavascriptPromiseHandler.h" />
192193
<ClInclude Include="JavascriptPromiseResolverCatch.h" />
193194
<ClInclude Include="JavascriptPromiseResolverThen.h" />

‎CefSharp.BrowserSubprocess.Core/JavascriptBindingSettings.h‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
// Copyright © 2013 The CefSharp Authors. All rights reserved.
2+
//
3+
// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
4+
5+
#pragma once
6+
7+
#include "include/cef_v8.h"
8+
9+
#include "Stdafx.h"
10+
11+
namespace CefSharp
12+
{
13+
namespace BrowserSubprocess
14+
{
15+
private ref class JavascriptBindingSettings
16+
{
17+
private:
18+
MCefRefPtr<CefListValue> _javascriptBindingApiAllowOrigins;
19+
20+
public:
21+
JavascriptBindingSettings()
22+
{
23+
JavascriptBindingApiEnabled = true;
24+
JavascriptBindingApiHasAllowOrigins = false;
25+
JavascriptBindingApiAllowOrigins = nullptr;
26+
}
27+
28+
!JavascriptBindingSettings()
29+
{
30+
_javascriptBindingApiAllowOrigins = nullptr;
31+
}
32+
33+
~JavascriptBindingSettings()
34+
{
35+
this->!JavascriptBindingSettings();
36+
}
37+
38+
property bool JavascriptBindingApiEnabled;
39+
property bool JavascriptBindingApiHasAllowOrigins;
40+
property CefRefPtr<CefListValue> JavascriptBindingApiAllowOrigins
41+
{
42+
CefRefPtr<CefListValue> get() { return _javascriptBindingApiAllowOrigins.get(); }
43+
void set(CefRefPtr<CefListValue> value) { _javascriptBindingApiAllowOrigins = value.get(); }
44+
}
45+
};
46+
}
47+
}

0 commit comments

Comments
 (0)