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
2 changes: 1 addition & 1 deletion CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ namespace CefSharp
frame->SendProcessMessage(CefProcessId::PID_BROWSER, uncaughtExceptionMessage);
}

JavascriptRootObjectWrapper^ CefAppUnmanagedWrapper::GetJsRootObjectWrapper(int browserId, CefString& frameId)
JavascriptRootObjectWrapper^ CefAppUnmanagedWrapper::GetJsRootObjectWrapper(int browserId, CefString frameId)
{
auto rootObjectWrappers = _jsRootObjectWrappersByFrameId;

Expand Down
2 changes: 1 addition & 1 deletion CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ namespace CefSharp
}

CefBrowserWrapper^ FindBrowserWrapper(int browserId);
JavascriptRootObjectWrapper^ GetJsRootObjectWrapper(int browserId, CefString& frameId);
JavascriptRootObjectWrapper^ GetJsRootObjectWrapper(int browserId, CefString frameId);

virtual DECL CefRefPtr<CefRenderProcessHandler> GetRenderProcessHandler() override;
virtual DECL void OnBrowserCreated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefDictionaryValue> extraInfo) override;
Expand Down
2 changes: 1 addition & 1 deletion CefSharp.BrowserSubprocess.Core/CefBrowserWrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace CefSharp
MCefRefPtr<CefBrowser> _cefBrowser;

public:
CefBrowserWrapper(CefRefPtr<CefBrowser> cefBrowser)
CefBrowserWrapper(const CefRefPtr<CefBrowser> &cefBrowser)
{
_cefBrowser = cefBrowser.get();
BrowserId = cefBrowser->GetIdentifier();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,8 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<BrowseInformation>true</BrowseInformation>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
Expand All @@ -174,7 +175,8 @@
<PreprocessorDefinitions>_DEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
Expand All @@ -194,7 +196,8 @@
<PreprocessorDefinitions>_DEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
Expand All @@ -214,7 +217,8 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<BrowseInformation>true</BrowseInformation>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
Expand All @@ -232,7 +236,8 @@
<PreprocessorDefinitions>NDEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
Expand All @@ -250,7 +255,8 @@
<PreprocessorDefinitions>NDEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@
<BrowseInformation>true</BrowseInformation>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<TreatWarningAsError>true</TreatWarningAsError>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
Expand All @@ -129,7 +130,8 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<TreatWarningAsError>true</TreatWarningAsError>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
Expand All @@ -146,7 +148,8 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<BrowseInformation>true</BrowseInformation>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
Expand All @@ -161,7 +164,8 @@
<PreprocessorDefinitions>WIN32;NDEBUG;EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
Expand Down
2 changes: 2 additions & 0 deletions CefSharp.BrowserSubprocess.Core/Stdafx.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
#define DECL __declspec(dllimport)
#endif

#define NOMINMAX

#include <vector>

#include <include/cef_base.h>
Expand Down
2 changes: 1 addition & 1 deletion CefSharp.BrowserSubprocess.Core/Wrapper/Browser.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace CefSharp
bool _disposed;

internal:
Browser(CefRefPtr<CefBrowser> &browser)
Browser(const CefRefPtr<CefBrowser> &browser)
: _browser(browser)
{
}
Expand Down
2 changes: 1 addition & 1 deletion CefSharp.BrowserSubprocess.Core/Wrapper/Frame.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace CefSharp
bool _disposed;

internal:
Frame(CefRefPtr<CefFrame> &frame)
Frame(const CefRefPtr<CefFrame> &frame)
: _frame(frame), _parentFrame(nullptr),
_owningBrowser(nullptr), _syncRoot(gcnew Object())
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ public BrowserSettings() { }
public BrowserSettings(bool autoDispose) { }
public virtual bool AutoDispose { get { throw null; } }
public virtual uint BackgroundColor { get { throw null; } set { } }
public virtual CefSharp.CefState ChromeStatusBubble { get { throw null; } set { } }
public virtual CefSharp.CefState ChromeZoomBubble { get { throw null; } set { } }
public virtual string CursiveFontFamily { get { throw null; } set { } }
public virtual CefSharp.CefState Databases { get { throw null; } set { } }
public virtual string DefaultEncoding { get { throw null; } set { } }
Expand All @@ -40,8 +42,6 @@ public BrowserSettings(bool autoDispose) { }
public virtual CefSharp.CefState TabToLinks { get { throw null; } set { } }
public virtual CefSharp.CefState TextAreaResize { get { throw null; } set { } }
public virtual CefSharp.CefState WebGl { get { throw null; } set { } }
public virtual CefSharp.CefState ChromeStatusBubble { get { throw null; } set { } }
public virtual CefSharp.CefState ChromeZoomBubble { get { throw null; } set { } }
public virtual int WindowlessFrameRate { get { throw null; } set { } }
public void Dispose() { }
protected virtual void Dispose(bool A_0) { }
Expand Down
18 changes: 12 additions & 6 deletions CefSharp.Core.Runtime/CefSharp.Core.Runtime.netcore.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,8 @@
<PrecompiledHeaderFile>Stdafx.h</PrecompiledHeaderFile>
<BrowseInformation>true</BrowseInformation>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
Expand Down Expand Up @@ -212,7 +213,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<PrecompiledHeaderFile>Stdafx.h</PrecompiledHeaderFile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
Expand Down Expand Up @@ -243,7 +245,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<PrecompiledHeaderFile>Stdafx.h</PrecompiledHeaderFile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
Expand Down Expand Up @@ -273,7 +276,8 @@
<GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
<BrowseInformation>true</BrowseInformation>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<Link>
<AdditionalDependencies>libcef.lib;libcef_dll_wrapper.lib;%(AdditionalDependencies)</AdditionalDependencies>
Expand All @@ -297,7 +301,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<Link>
<AdditionalDependencies>libcef.lib;libcef_dll_wrapper.lib;%(AdditionalDependencies)</AdditionalDependencies>
Expand All @@ -319,7 +324,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<Link>
<AdditionalDependencies>libcef.lib;libcef_dll_wrapper.lib;%(AdditionalDependencies)</AdditionalDependencies>
Expand Down
12 changes: 8 additions & 4 deletions CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@
<PrecompiledHeaderFile>Stdafx.h</PrecompiledHeaderFile>
<BrowseInformation>true</BrowseInformation>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
Expand Down Expand Up @@ -161,7 +162,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<PrecompiledHeaderFile>Stdafx.h</PrecompiledHeaderFile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
Expand All @@ -188,7 +190,8 @@
<GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
<BrowseInformation>true</BrowseInformation>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<Link>
<AdditionalDependencies>opengl32.lib;glu32.lib;libcef.lib;libcef_dll_wrapper.lib;%(AdditionalDependencies)</AdditionalDependencies>
Expand All @@ -209,7 +212,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<Link>
<AdditionalDependencies>opengl32.lib;glu32.lib;libcef.lib;libcef_dll_wrapper.lib;%(AdditionalDependencies)</AdditionalDependencies>
Expand Down
2 changes: 1 addition & 1 deletion CefSharp.Core.Runtime/DragData.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ namespace CefSharp
MCefRefPtr<CefDragData> _wrappedDragData;

internal:
DragData(CefRefPtr<CefDragData> &dragData) :
DragData(const CefRefPtr<CefDragData> &dragData) :
_wrappedDragData(dragData)
{
IsReadOnly = dragData->IsReadOnly();
Expand Down
2 changes: 1 addition & 1 deletion CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ namespace CefSharp
double GetZoomLevelOnUI();

internal:
CefBrowserHostWrapper(CefRefPtr<CefBrowserHost> &browserHost) : _browserHost(browserHost)
CefBrowserHostWrapper(const CefRefPtr<CefBrowserHost> &browserHost) : _browserHost(browserHost)
{
}

Expand Down
2 changes: 1 addition & 1 deletion CefSharp.Core.Runtime/Internals/CefBrowserWrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace CefSharp
IBrowserHost^ _browserHost;

internal:
CefBrowserWrapper::CefBrowserWrapper(CefRefPtr<CefBrowser> &browser)
CefBrowserWrapper(const CefRefPtr<CefBrowser> &browser)
: _browser(browser), _browserHost(nullptr)
{
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ namespace CefSharp
{
ThrowIfDisposed();

std::vector<CefString>& dictionarySuggestions = std::vector<CefString>();
std::vector<CefString> dictionarySuggestions;
bool result = _wrappedInfo->GetDictionarySuggestions(dictionarySuggestions);

return StringUtils::ToClr(dictionarySuggestions);
Expand Down
2 changes: 1 addition & 1 deletion CefSharp.Core.Runtime/Internals/CefFrameWrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ namespace CefSharp
Object^ _syncRoot;

internal:
CefFrameWrapper::CefFrameWrapper(CefRefPtr<CefFrame> &frame)
CefFrameWrapper(const CefRefPtr<CefFrame> &frame)
: _frame(frame), _parentFrame(nullptr),
_owningBrowser(nullptr), _syncRoot(gcnew Object())
{
Expand Down
2 changes: 1 addition & 1 deletion CefSharp.Core.Runtime/Internals/CefImageWrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace CefSharp
internal:
MCefRefPtr<CefImage> _image;

CefImageWrapper::CefImageWrapper(CefRefPtr<CefImage> &image)
CefImageWrapper(const CefRefPtr<CefImage> &image)
: _image(image)
{
}
Expand Down
2 changes: 1 addition & 1 deletion CefSharp.Core.Runtime/Internals/CefResponseWrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace CefSharp
{
MCefRefPtr<CefResponse> _response;
internal:
CefResponseWrapper(CefRefPtr<CefResponse> &response) :
CefResponseWrapper(const CefRefPtr<CefResponse> &response) :
_response(response)
{

Expand Down
2 changes: 1 addition & 1 deletion CefSharp.Core.Runtime/Internals/CefValueWrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ namespace CefSharp
}

internal:
CefValueWrapper(CefRefPtr<CefValue> &cefValue) : _cefValue(cefValue)
CefValueWrapper(const CefRefPtr<CefValue> &cefValue) : _cefValue(cefValue)
{
}

Expand Down
6 changes: 3 additions & 3 deletions CefSharp.Core.Runtime/Internals/StringUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ namespace CefSharp
/// <param name="cefStr">The string that should be converted.</param>
/// <returns>A .NET string.</returns>
[DebuggerStepThrough]
static String^ StringUtils::ToClr(const cef_string_t& cefStr)
static String^ ToClr(const cef_string_t& cefStr)
{
auto str = reinterpret_cast<wchar_t*>(cefStr.str);

Expand All @@ -39,7 +39,7 @@ namespace CefSharp
/// <param name="cefStr">The string that should be converted.</param>
/// <returns>A .NET string.</returns>
[DebuggerStepThrough]
static String^ StringUtils::ToClr(const CefString& cefStr)
static String^ ToClr(const CefString& cefStr)
{
auto str = reinterpret_cast<const wchar_t*>(cefStr.c_str());

Expand Down Expand Up @@ -112,7 +112,7 @@ namespace CefSharp
/// <param name="cefStr">The cef_string_t that should be updated.</param>
/// <param name="str">The .NET string whose value should be used to update cefStr.</param>
[DebuggerStepThrough]
static void StringUtils::AssignNativeFromClr(cef_string_t& cefStr, String^ str)
static void AssignNativeFromClr(cef_string_t& cefStr, String^ str)
{
cef_string_clear(&cefStr);

Expand Down
2 changes: 1 addition & 1 deletion CefSharp.Core.Runtime/RequestContext.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ namespace CefSharp
RequestContextSettings^ _settings;

internal:
RequestContext(CefRefPtr<CefRequestContext>& context)
RequestContext(const CefRefPtr<CefRequestContext>& context)
{
_requestContext = context.get();
_settings = nullptr;
Expand Down
2 changes: 2 additions & 0 deletions CefSharp.Core.Runtime/Stdafx.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
#define DECL __declspec(dllimport)
#endif

#define NOMINMAX

#include <vector>
#include <list>

Expand Down