Skip to content

Commit b84f76e

Browse files
amaitlandamaitland
committed
Merge branch 'JsBinding_WIP' into JsBinding/Wip2
2 parents 3066b78 + 6022c22 commit b84f76e

36 files changed

+441
-178
lines changed

‎.nuget/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="cef.redist" version="3.1650.1562-pre0" />
3+
<package id="cef.redist" version="3.1750.1738" />
44
</packages>

‎CefSharp.BrowserSubprocess.Core/CefAppWrapper.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ namespace CefSharp
3636

3737
CefMainArgs cefMainArgs((HINSTANCE)hInstance.ToPointer());
3838

39-
return CefExecuteProcess(cefMainArgs, (CefApp*)_cefApp.get());
39+
return CefExecuteProcess(cefMainArgs, (CefApp*)_cefApp.get(), NULL);
4040
}
4141

4242
void CefAppWrapper::Bind(JavascriptRootObject^ rootObject, Func<IBrowserProcess^>^ createBrowserProxyDelegate)

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\cef.sdk.3.1650.1562-pre2\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.3.1650.1562-pre2\build\cef.sdk.props')" />
3+
<Import Project="..\packages\cef.sdk.3.1750.1738\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.3.1750.1738\build\cef.sdk.props')" />
44
<ItemGroup Label="ProjectConfigurations">
55
<ProjectConfiguration Include="Debug|Win32">
66
<Configuration>Debug</Configuration>
@@ -65,7 +65,9 @@
6565
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
6666
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6767
</ImportGroup>
68-
<PropertyGroup Label="UserMacros" />
68+
<PropertyGroup Label="UserMacros">
69+
<NuGetPackageImportStamp>47d3feda</NuGetPackageImportStamp>
70+
</PropertyGroup>
6971
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7072
<LinkIncremental>true</LinkIncremental>
7173
<LinkKeyFile>..\CefSharp.snk</LinkKeyFile>
@@ -196,6 +198,6 @@
196198
<PropertyGroup>
197199
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
198200
</PropertyGroup>
199-
<Error Condition="!Exists('..\packages\cef.sdk.3.1650.1562-pre2\build\cef.sdk.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.sdk.3.1650.1562-pre2\build\cef.sdk.props'))" />
201+
<Error Condition="!Exists('..\packages\cef.sdk.3.1750.1738\build\cef.sdk.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.sdk.3.1750.1738\build\cef.sdk.props'))" />
200202
</Target>
201203
</Project>

‎CefSharp.BrowserSubprocess.Core/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="cef.sdk" version="3.1650.1562-pre2" targetFramework="Native" />
4-
</packages>
3+
<package id="cef.sdk" version="3.1750.1738" targetFramework="Native" />
4+
</packages>

‎CefSharp.Core/BrowserSettings.h‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -248,18 +248,6 @@ namespace CefSharp
248248
void set(Nullable<bool>^ value) { _browserSettings->tab_to_links = CefStateFromDisabledSetting(value); }
249249
}
250250

251-
property String^ UserStyleSheetLocation
252-
{
253-
String^ get() { return StringUtils::ToClr(_browserSettings->user_style_sheet_location); }
254-
void set(String^ value) { StringUtils::AssignNativeFromClr(_browserSettings->user_style_sheet_location, value); }
255-
}
256-
257-
property Nullable<bool>^ AuthorAndUserStylesDisabled
258-
{
259-
Nullable<bool>^ get() { return CefStateToDisabledSetting(_browserSettings->author_and_user_styles); }
260-
void set(Nullable<bool>^ value) { _browserSettings->author_and_user_styles = CefStateFromDisabledSetting(value); }
261-
}
262-
263251
property Nullable<bool>^ LocalStorageDisabled
264252
{
265253
Nullable<bool>^ get() { return CefStateToDisabledSetting(_browserSettings->local_storage); }

‎CefSharp.Core/Cef.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ namespace CefSharp
148148
CefMainArgs main_args;
149149
CefRefPtr<CefSharpApp> app(new CefSharpApp(cefSettings));
150150

151-
int exitCode = CefExecuteProcess(main_args, app.get());
151+
int exitCode = CefExecuteProcess(main_args, app.get(), NULL);
152152

153153
if (exitCode >= 0)
154154
{
@@ -157,7 +157,7 @@ namespace CefSharp
157157
return false;
158158
}
159159

160-
success = CefInitialize(main_args, *(cefSettings->_cefSettings), app.get());
160+
success = CefInitialize(main_args, *(cefSettings->_cefSettings), app.get(), NULL);
161161
app->CompleteSchemeRegistrations();
162162
_initialized = success;
163163

@@ -318,7 +318,7 @@ namespace CefSharp
318318
}
319319

320320
/// <summary> Flush the backing store (if any) to disk and execute the specified |handler| on the IO thread when done. Returns </summary>
321-
/// <param name="handler">A user-provided ICompletion handler implementation.</param>
321+
/// <param name="handler">A user-provided ICompletionHandler implementation.</param>
322322
/// <return>Returns false if cookies cannot be accessed.</return>
323323
static bool FlushStore(ICompletionHandler^ handler)
324324
{

‎CefSharp.Core/CefSettings.h‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ namespace CefSharp
6565
public:
6666
CefSettings() : _cefSettings(new ::CefSettings())
6767
{
68-
MultiThreadedMessageLoop = true;
68+
_cefSettings->multi_threaded_message_loop = true;
6969
BrowserSubprocessPath = "CefSharp.BrowserSubprocess.exe";
7070
cefCustomSchemes = gcnew List<CefCustomScheme^>();
7171
cefCommandLineArgs = gcnew Dictionary<String^, String^>();
@@ -86,12 +86,7 @@ namespace CefSharp
8686

8787
virtual property bool MultiThreadedMessageLoop
8888
{
89-
bool get() { return _cefSettings->multi_threaded_message_loop; }
90-
91-
// CefSharp doesn't support single threaded message loop (and there's little point in supporting it), so we make this
92-
// property read-only externally.
93-
private:
94-
void set(bool value) sealed { _cefSettings->multi_threaded_message_loop = value; }
89+
bool get() { return _cefSettings->multi_threaded_message_loop == 1; }
9590
}
9691

9792
virtual property String^ BrowserSubprocessPath
@@ -108,7 +103,7 @@ namespace CefSharp
108103

109104
virtual property bool IgnoreCertificateErrors
110105
{
111-
bool get() { return _cefSettings->ignore_certificate_errors; }
106+
bool get() { return _cefSettings->ignore_certificate_errors == 1; }
112107
void set(bool value) { _cefSettings->ignore_certificate_errors = value; }
113108
}
114109

@@ -138,7 +133,7 @@ namespace CefSharp
138133

139134
virtual property bool PackLoadingDisabled
140135
{
141-
bool get() { return _cefSettings->pack_loading_disabled; }
136+
bool get() { return _cefSettings->pack_loading_disabled == 1; }
142137
void set(bool value) { _cefSettings->pack_loading_disabled = value; }
143138
}
144139

‎CefSharp.Core/CefSharp.Core.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\cef.sdk.3.1650.1562-pre2\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.3.1650.1562-pre2\build\cef.sdk.props')" />
3+
<Import Project="..\packages\cef.sdk.3.1750.1738\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.3.1750.1738\build\cef.sdk.props')" />
44
<ItemGroup Label="ProjectConfigurations">
55
<ProjectConfiguration Include="Debug|Win32">
66
<Configuration>Debug</Configuration>
@@ -278,6 +278,6 @@
278278
<PropertyGroup>
279279
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
280280
</PropertyGroup>
281-
<Error Condition="!Exists('..\packages\cef.sdk.3.1650.1562-pre2\build\cef.sdk.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.sdk.3.1650.1562-pre2\build\cef.sdk.props'))" />
281+
<Error Condition="!Exists('..\packages\cef.sdk.3.1750.1738\build\cef.sdk.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.sdk.3.1750.1738\build\cef.sdk.props'))" />
282282
</Target>
283283
</Project>

‎CefSharp.Core/Internals/ClientAdapter.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ namespace CefSharp
141141

142142
// TODO: windows_key_code could possibly be the wrong choice here (the OnKeyEvent signature has changed since CEF1). The
143143
// other option would be native_key_code.
144-
return handler->OnKeyEvent(_browserControl, KeyTypeToManaged(event.type), event.windows_key_code, event.modifiers, event.is_system_key);
144+
return handler->OnKeyEvent(_browserControl, KeyTypeToManaged(event.type), event.windows_key_code, event.modifiers, event.is_system_key == 1);
145145
}
146146

147147
bool ClientAdapter::OnPreKeyEvent(CefRefPtr<CefBrowser> browser, const CefKeyEvent& event, CefEventHandle os_event, bool* is_keyboard_shortcut)
@@ -153,7 +153,7 @@ namespace CefSharp
153153
return false;
154154
}
155155

156-
return handler->OnPreKeyEvent(_browserControl, (KeyType)event.type, event.windows_key_code, event.native_key_code, event.modifiers, event.is_system_key, *is_keyboard_shortcut);
156+
return handler->OnPreKeyEvent(_browserControl, (KeyType)event.type, event.windows_key_code, event.native_key_code, event.modifiers, event.is_system_key == 1, *is_keyboard_shortcut);
157157
}
158158

159159
void ClientAdapter::OnLoadStart(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame)
@@ -266,8 +266,6 @@ namespace CefSharp
266266
}
267267
else if (requestResponse->Action == ResponseAction::Respond)
268268
{
269-
CefRefPtr<StreamAdapter> adapter = new StreamAdapter(requestResponse->ResponseStream);
270-
271269
throw gcnew NotImplementedException("Respond is not yet supported.");
272270

273271
//resourceStream = CefStreamReader::CreateForHandler(static_cast<CefRefPtr<CefReadHandler>>(adapter));

‎CefSharp.Core/Internals/CookieVisitor.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ namespace CefSharp
2020
cookie->Value = StringUtils::ToClr(cefCookie.value);
2121
cookie->Domain = StringUtils::ToClr(cefCookie.domain);
2222
cookie->Path = StringUtils::ToClr(cefCookie.path);
23-
cookie->Secure = cefCookie.secure;
24-
cookie->HttpOnly = cefCookie.httponly;
23+
cookie->Secure = cefCookie.secure == 1;
24+
cookie->HttpOnly = cefCookie.httponly == 1;
2525

2626
if (cefCookie.has_expires)
2727
{

0 commit comments

Comments
 (0)