Skip to content

Commit 4062d38

Browse files
amaitlandamaitland
authored
Merge 1a0b925 into 1dd444b 
2 parents 1dd444b + 1a0b925 commit 4062d38

22 files changed

+87
-42
lines changed

‎CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ namespace CefSharp
301301
frame->SendProcessMessage(CefProcessId::PID_BROWSER, uncaughtExceptionMessage);
302302
}
303303

304-
JavascriptRootObjectWrapper^ CefAppUnmanagedWrapper::GetJsRootObjectWrapper(int browserId, CefString& frameId)
304+
JavascriptRootObjectWrapper^ CefAppUnmanagedWrapper::GetJsRootObjectWrapper(int browserId, CefString frameId)
305305
{
306306
auto rootObjectWrappers = _jsRootObjectWrappersByFrameId;
307307

‎CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ namespace CefSharp
8585
}
8686

8787
CefBrowserWrapper^ FindBrowserWrapper(int browserId);
88-
JavascriptRootObjectWrapper^ GetJsRootObjectWrapper(int browserId, CefString& frameId);
88+
JavascriptRootObjectWrapper^ GetJsRootObjectWrapper(int browserId, CefString frameId);
8989

9090
virtual DECL CefRefPtr<CefRenderProcessHandler> GetRenderProcessHandler() override;
9191
virtual DECL void OnBrowserCreated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefDictionaryValue> extraInfo) override;

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,8 @@
154154
<PrecompiledHeader>Use</PrecompiledHeader>
155155
<BrowseInformation>true</BrowseInformation>
156156
<MultiProcessorCompilation>true</MultiProcessorCompilation>
157-
<LanguageStandard>stdcpp17</LanguageStandard>
157+
<LanguageStandard>stdcpp20</LanguageStandard>
158+
<CompileAs>CompileAsCpp</CompileAs>
158159
</ClCompile>
159160
<Link>
160161
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -174,7 +175,8 @@
174175
<PreprocessorDefinitions>_DEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
175176
<PrecompiledHeader>Use</PrecompiledHeader>
176177
<MultiProcessorCompilation>true</MultiProcessorCompilation>
177-
<LanguageStandard>stdcpp17</LanguageStandard>
178+
<LanguageStandard>stdcpp20</LanguageStandard>
179+
<CompileAs>CompileAsCpp</CompileAs>
178180
</ClCompile>
179181
<Link>
180182
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -194,7 +196,8 @@
194196
<PreprocessorDefinitions>_DEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
195197
<PrecompiledHeader>Use</PrecompiledHeader>
196198
<MultiProcessorCompilation>true</MultiProcessorCompilation>
197-
<LanguageStandard>stdcpp17</LanguageStandard>
199+
<LanguageStandard>stdcpp20</LanguageStandard>
200+
<CompileAs>CompileAsCpp</CompileAs>
198201
</ClCompile>
199202
<Link>
200203
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -214,7 +217,8 @@
214217
<PrecompiledHeader>Use</PrecompiledHeader>
215218
<BrowseInformation>true</BrowseInformation>
216219
<MultiProcessorCompilation>true</MultiProcessorCompilation>
217-
<LanguageStandard>stdcpp17</LanguageStandard>
220+
<LanguageStandard>stdcpp20</LanguageStandard>
221+
<CompileAs>CompileAsCpp</CompileAs>
218222
</ClCompile>
219223
<Link>
220224
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -232,7 +236,8 @@
232236
<PreprocessorDefinitions>NDEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
233237
<PrecompiledHeader>Use</PrecompiledHeader>
234238
<MultiProcessorCompilation>true</MultiProcessorCompilation>
235-
<LanguageStandard>stdcpp17</LanguageStandard>
239+
<LanguageStandard>stdcpp20</LanguageStandard>
240+
<CompileAs>CompileAsCpp</CompileAs>
236241
</ClCompile>
237242
<Link>
238243
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -250,7 +255,8 @@
250255
<PreprocessorDefinitions>NDEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
251256
<PrecompiledHeader>Use</PrecompiledHeader>
252257
<MultiProcessorCompilation>true</MultiProcessorCompilation>
253-
<LanguageStandard>stdcpp17</LanguageStandard>
258+
<LanguageStandard>stdcpp20</LanguageStandard>
259+
<CompileAs>CompileAsCpp</CompileAs>
254260
</ClCompile>
255261
<Link>
256262
<GenerateDebugInformation>true</GenerateDebugInformation>

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@
111111
<BrowseInformation>true</BrowseInformation>
112112
<MultiProcessorCompilation>true</MultiProcessorCompilation>
113113
<TreatWarningAsError>true</TreatWarningAsError>
114-
<LanguageStandard>stdcpp17</LanguageStandard>
114+
<LanguageStandard>stdcpp20</LanguageStandard>
115+
<CompileAs>CompileAsCpp</CompileAs>
115116
</ClCompile>
116117
<Link>
117118
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -129,7 +130,8 @@
129130
<PrecompiledHeader>Use</PrecompiledHeader>
130131
<MultiProcessorCompilation>true</MultiProcessorCompilation>
131132
<TreatWarningAsError>true</TreatWarningAsError>
132-
<LanguageStandard>stdcpp17</LanguageStandard>
133+
<LanguageStandard>stdcpp20</LanguageStandard>
134+
<CompileAs>CompileAsCpp</CompileAs>
133135
</ClCompile>
134136
<Link>
135137
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -146,7 +148,8 @@
146148
<PrecompiledHeader>Use</PrecompiledHeader>
147149
<BrowseInformation>true</BrowseInformation>
148150
<MultiProcessorCompilation>true</MultiProcessorCompilation>
149-
<LanguageStandard>stdcpp17</LanguageStandard>
151+
<LanguageStandard>stdcpp20</LanguageStandard>
152+
<CompileAs>CompileAsCpp</CompileAs>
150153
</ClCompile>
151154
<Link>
152155
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -161,7 +164,8 @@
161164
<PreprocessorDefinitions>WIN32;NDEBUG;EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
162165
<PrecompiledHeader>Use</PrecompiledHeader>
163166
<MultiProcessorCompilation>true</MultiProcessorCompilation>
164-
<LanguageStandard>stdcpp17</LanguageStandard>
167+
<LanguageStandard>stdcpp20</LanguageStandard>
168+
<CompileAs>CompileAsCpp</CompileAs>
165169
</ClCompile>
166170
<Link>
167171
<GenerateDebugInformation>true</GenerateDebugInformation>

‎CefSharp.BrowserSubprocess.Core/Stdafx.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
#define DECL __declspec(dllimport)
1111
#endif
1212

13+
#define NOMINMAX
14+
1315
#include <vector>
1416

1517
#include <include/cef_base.h>

‎CefSharp.BrowserSubprocess.Core/Wrapper/Browser.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,9 @@ IFrame^ Browser::MainFrame::get()
148148
/*--cef()--*/
149149
IFrame^ Browser::FocusedFrame::get()
150150
{
151-
return gcnew Frame(_browser->GetFocusedFrame());
151+
auto frame = _browser->GetFocusedFrame();
152+
153+
return gcnew Frame(frame);
152154
}
153155

154156
///

‎CefSharp.BrowserSubprocess.Core/Wrapper/Frame.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,9 @@ IBrowser^ Frame::Browser::get()
270270
return _owningBrowser;
271271
}
272272

273-
_owningBrowser = gcnew CefSharp::BrowserSubprocess::Browser(_frame->GetBrowser());
273+
auto browser = _frame->GetBrowser();
274+
275+
_owningBrowser = gcnew CefSharp::BrowserSubprocess::Browser(browser);
274276
return _owningBrowser;
275277
}
276278

‎CefSharp.Core.Runtime.RefAssembly/CefSharp.Core.Runtime.netcore.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ public BrowserSettings() { }
1616
public BrowserSettings(bool autoDispose) { }
1717
public virtual bool AutoDispose { get { throw null; } }
1818
public virtual uint BackgroundColor { get { throw null; } set { } }
19+
public virtual CefSharp.CefState ChromeStatusBubble { get { throw null; } set { } }
20+
public virtual CefSharp.CefState ChromeZoomBubble { get { throw null; } set { } }
1921
public virtual string CursiveFontFamily { get { throw null; } set { } }
2022
public virtual CefSharp.CefState Databases { get { throw null; } set { } }
2123
public virtual string DefaultEncoding { get { throw null; } set { } }
@@ -40,8 +42,6 @@ public BrowserSettings(bool autoDispose) { }
4042
public virtual CefSharp.CefState TabToLinks { get { throw null; } set { } }
4143
public virtual CefSharp.CefState TextAreaResize { get { throw null; } set { } }
4244
public virtual CefSharp.CefState WebGl { get { throw null; } set { } }
43-
public virtual CefSharp.CefState ChromeStatusBubble { get { throw null; } set { } }
44-
public virtual CefSharp.CefState ChromeZoomBubble { get { throw null; } set { } }
4545
public virtual int WindowlessFrameRate { get { throw null; } set { } }
4646
public void Dispose() { }
4747
protected virtual void Dispose(bool A_0) { }

‎CefSharp.Core.Runtime/CefSharp.Core.Runtime.netcore.vcxproj‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,8 @@
178178
<PrecompiledHeaderFile>Stdafx.h</PrecompiledHeaderFile>
179179
<BrowseInformation>true</BrowseInformation>
180180
<MultiProcessorCompilation>true</MultiProcessorCompilation>
181-
<LanguageStandard>stdcpp17</LanguageStandard>
181+
<LanguageStandard>stdcpp20</LanguageStandard>
182+
<CompileAs>CompileAsCpp</CompileAs>
182183
</ClCompile>
183184
<ProjectReference>
184185
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -212,7 +213,8 @@
212213
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
213214
<PrecompiledHeaderFile>Stdafx.h</PrecompiledHeaderFile>
214215
<MultiProcessorCompilation>true</MultiProcessorCompilation>
215-
<LanguageStandard>stdcpp17</LanguageStandard>
216+
<LanguageStandard>stdcpp20</LanguageStandard>
217+
<CompileAs>CompileAsCpp</CompileAs>
216218
</ClCompile>
217219
<ProjectReference>
218220
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -243,7 +245,8 @@
243245
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
244246
<PrecompiledHeaderFile>Stdafx.h</PrecompiledHeaderFile>
245247
<MultiProcessorCompilation>true</MultiProcessorCompilation>
246-
<LanguageStandard>stdcpp17</LanguageStandard>
248+
<LanguageStandard>stdcpp20</LanguageStandard>
249+
<CompileAs>CompileAsCpp</CompileAs>
247250
</ClCompile>
248251
<ProjectReference>
249252
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -273,7 +276,8 @@
273276
<GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
274277
<BrowseInformation>true</BrowseInformation>
275278
<MultiProcessorCompilation>true</MultiProcessorCompilation>
276-
<LanguageStandard>stdcpp17</LanguageStandard>
279+
<LanguageStandard>stdcpp20</LanguageStandard>
280+
<CompileAs>CompileAsCpp</CompileAs>
277281
</ClCompile>
278282
<Link>
279283
<AdditionalDependencies>libcef.lib;libcef_dll_wrapper.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -297,7 +301,8 @@
297301
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
298302
<GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
299303
<MultiProcessorCompilation>true</MultiProcessorCompilation>
300-
<LanguageStandard>stdcpp17</LanguageStandard>
304+
<LanguageStandard>stdcpp20</LanguageStandard>
305+
<CompileAs>CompileAsCpp</CompileAs>
301306
</ClCompile>
302307
<Link>
303308
<AdditionalDependencies>libcef.lib;libcef_dll_wrapper.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -319,7 +324,8 @@
319324
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
320325
<GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
321326
<MultiProcessorCompilation>true</MultiProcessorCompilation>
322-
<LanguageStandard>stdcpp17</LanguageStandard>
327+
<LanguageStandard>stdcpp20</LanguageStandard>
328+
<CompileAs>CompileAsCpp</CompileAs>
323329
</ClCompile>
324330
<Link>
325331
<AdditionalDependencies>libcef.lib;libcef_dll_wrapper.lib;%(AdditionalDependencies)</AdditionalDependencies>

‎CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,8 @@
130130
<PrecompiledHeaderFile>Stdafx.h</PrecompiledHeaderFile>
131131
<BrowseInformation>true</BrowseInformation>
132132
<MultiProcessorCompilation>true</MultiProcessorCompilation>
133-
<LanguageStandard>stdcpp17</LanguageStandard>
133+
<LanguageStandard>stdcpp20</LanguageStandard>
134+
<CompileAs>CompileAsCpp</CompileAs>
134135
</ClCompile>
135136
<ProjectReference>
136137
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -161,7 +162,8 @@
161162
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
162163
<PrecompiledHeaderFile>Stdafx.h</PrecompiledHeaderFile>
163164
<MultiProcessorCompilation>true</MultiProcessorCompilation>
164-
<LanguageStandard>stdcpp17</LanguageStandard>
165+
<LanguageStandard>stdcpp20</LanguageStandard>
166+
<CompileAs>CompileAsCpp</CompileAs>
165167
</ClCompile>
166168
<ProjectReference>
167169
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -188,7 +190,8 @@
188190
<GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
189191
<BrowseInformation>true</BrowseInformation>
190192
<MultiProcessorCompilation>true</MultiProcessorCompilation>
191-
<LanguageStandard>stdcpp17</LanguageStandard>
193+
<LanguageStandard>stdcpp20</LanguageStandard>
194+
<CompileAs>CompileAsCpp</CompileAs>
192195
</ClCompile>
193196
<Link>
194197
<AdditionalDependencies>opengl32.lib;glu32.lib;libcef.lib;libcef_dll_wrapper.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -209,7 +212,8 @@
209212
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
210213
<GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
211214
<MultiProcessorCompilation>true</MultiProcessorCompilation>
212-
<LanguageStandard>stdcpp17</LanguageStandard>
215+
<LanguageStandard>stdcpp20</LanguageStandard>
216+
<CompileAs>CompileAsCpp</CompileAs>
213217
</ClCompile>
214218
<Link>
215219
<AdditionalDependencies>opengl32.lib;glu32.lib;libcef.lib;libcef_dll_wrapper.lib;%(AdditionalDependencies)</AdditionalDependencies>

0 commit comments

Comments
 (0)