Skip to content

Commit 2eac865

Browse files
author
Luca Sonntag
committed
Fix JavaScript Binding API settings for popups
Move the JS binding API configuration block out of the !browser->IsPopup() scope in OnBrowserCreated. This ensures that IsJavascriptBindingApiAllowed() enforces configured restrictions for popups as well.
1 parent 4eeaef6 commit 2eac865

1 file changed

Lines changed: 13 additions & 6 deletions

File tree

CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,15 @@ namespace CefSharp
9999
}
100100
}
101101
}
102+
}
102103

104+
if (extraInfo->HasKey("JavascriptBindingApiEnabled"))
105+
{
103106
wrapper->JavascriptBindingApiEnabled = extraInfo->GetBool("JavascriptBindingApiEnabled");
107+
}
108+
109+
if (extraInfo->HasKey("JavascriptBindingApiHasAllowOrigins"))
110+
{
104111
wrapper->JavascriptBindingApiHasAllowOrigins = extraInfo->GetBool("JavascriptBindingApiHasAllowOrigins");
105112

106113
if (wrapper->JavascriptBindingApiHasAllowOrigins)
@@ -111,13 +118,13 @@ namespace CefSharp
111118
wrapper->JavascriptBindingApiAllowOrigins = allowOrigins->Copy();
112119
}
113120
}
121+
}
114122

115-
if (extraInfo->HasKey("JsBindingPropertyName") || extraInfo->HasKey("JsBindingPropertyNameCamelCase"))
116-
{
117-
//TODO: Create constant for these and legacy binding strings above
118-
_jsBindingPropertyName = extraInfo->GetString("JsBindingPropertyName");
119-
_jsBindingPropertyNameCamelCase = extraInfo->GetString("JsBindingPropertyNameCamelCase");
120-
}
123+
if (extraInfo->HasKey("JsBindingPropertyName") || extraInfo->HasKey("JsBindingPropertyNameCamelCase"))
124+
{
125+
//TODO: Create constant for these and legacy binding strings above
126+
_jsBindingPropertyName = extraInfo->GetString("JsBindingPropertyName");
127+
_jsBindingPropertyNameCamelCase = extraInfo->GetString("JsBindingPropertyNameCamelCase");
121128
}
122129
}
123130

0 commit comments

Comments
 (0)