Skip to content

Commit ab34cf1

Browse files
amaitlandamaitland
committed
Remove Alloy Bootstrap (M128) (continued)
- Fix netcore lib Resolves #4795
1 parent 19739ab commit ab34cf1

File tree

7 files changed

+2
-120
lines changed

7 files changed

+2
-120
lines changed

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public Cef() { }
5757
public static bool CrashReportingEnabled { get { throw null; } }
5858
public static System.Threading.Tasks.TaskFactory FileThreadTaskFactory { get { throw null; } set { } }
5959
public static System.Threading.Tasks.TaskFactory IOThreadTaskFactory { get { throw null; } set { } }
60-
public static bool IsInitialized { get { throw null; } }
60+
public static bool? IsInitialized { get { throw null; } }
6161
public static bool IsShutdown { get { throw null; } }
6262
public static System.Threading.Tasks.TaskFactory UIThreadTaskFactory { get { throw null; } set { } }
6363
public static bool AddCrossOriginWhitelistEntry(string sourceOrigin, string targetProtocol, string targetDomain, bool allowTargetSubdomains) { throw null; }
@@ -103,7 +103,6 @@ public CefSettingsBase() { }
103103
public string CachePath { get { throw null; } set { } }
104104
public CefSharp.Internals.CommandLineArgDictionary CefCommandLineArgs { get { throw null; } }
105105
public System.Collections.Generic.IEnumerable<CefSharp.CefCustomScheme> CefCustomSchemes { get { throw null; } }
106-
public bool ChromeRuntime { get { throw null; } set { } }
107106
public bool CommandLineArgsDisabled { get { throw null; } set { } }
108107
public bool CookieableSchemesExcludeDefaults { get { throw null; } set { } }
109108
public string CookieableSchemesList { get { throw null; } set { } }
@@ -114,9 +113,7 @@ public CefSettingsBase() { }
114113
public string LogFile { get { throw null; } set { } }
115114
public CefSharp.LogSeverity LogSeverity { get { throw null; } set { } }
116115
public bool MultiThreadedMessageLoop { get { throw null; } set { } }
117-
public bool PackLoadingDisabled { get { throw null; } set { } }
118116
public bool PersistSessionCookies { get { throw null; } set { } }
119-
public bool PersistUserPreferences { get { throw null; } set { } }
120117
public int RemoteDebuggingPort { get { throw null; } set { } }
121118
public string ResourcesDirPath { get { throw null; } set { } }
122119
public string RootCachePath { get { throw null; } set { } }
@@ -270,20 +267,15 @@ public virtual void ClearHttpAuthCredentials(CefSharp.ICompletionCallback callba
270267
public virtual bool ClearSchemeHandlerFactories() { throw null; }
271268
public virtual void CloseAllConnections(CefSharp.ICompletionCallback callback) { }
272269
public static CefSharp.IRequestContext CreateContext(CefSharp.IRequestContext other, CefSharp.IRequestContextHandler requestContextHandler) { throw null; }
273-
public virtual bool DidLoadExtension(string extensionId) { throw null; }
274270
public void Dispose() { }
275271
protected virtual void Dispose(bool A_0) { }
276272
~RequestContext() { }
277273
public virtual System.Collections.Generic.IDictionary<string, object> GetAllPreferences(bool includeDefaults) { throw null; }
278274
public virtual CefSharp.ICookieManager GetCookieManager(CefSharp.ICompletionCallback callback) { throw null; }
279-
public virtual CefSharp.IExtension GetExtension(string extensionId) { throw null; }
280-
public virtual bool GetExtensions(out System.Collections.Generic.IList<string> extensionIds) { throw null; }
281275
public virtual object GetPreference(string name) { throw null; }
282-
public virtual bool HasExtension(string extensionId) { throw null; }
283276
public virtual bool HasPreference(string name) { throw null; }
284277
public virtual bool IsSame(CefSharp.IRequestContext context) { throw null; }
285278
public virtual bool IsSharingWith(CefSharp.IRequestContext context) { throw null; }
286-
public virtual void LoadExtension(string rootDirectory, string manifestJson, CefSharp.IExtensionHandler handler) { }
287279
public virtual bool RegisterSchemeHandlerFactory(string schemeName, string domainName, CefSharp.ISchemeHandlerFactory factory) { throw null; }
288280
public virtual System.Threading.Tasks.Task<CefSharp.ResolveCallbackResult> ResolveHostAsync(System.Uri origin) { throw null; }
289281
public virtual bool SetPreference(string name, object value, out string error) { throw null; }
@@ -298,7 +290,6 @@ public RequestContextSettings() { }
298290
public bool CookieableSchemesExcludeDefaults { get { throw null; } set { } }
299291
public string CookieableSchemesList { get { throw null; } set { } }
300292
public bool PersistSessionCookies { get { throw null; } set { } }
301-
public bool PersistUserPreferences { get { throw null; } set { } }
302293
public void Dispose() { }
303294
protected virtual void Dispose(bool A_0) { }
304295
~RequestContextSettings() { }

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,6 @@
335335
<ClCompile Include="CookieManager.cpp" />
336336
<ClCompile Include="Internals\CefBrowserHostWrapper.cpp" />
337337
<ClCompile Include="Internals\CefContextMenuParamsWrapper.cpp" />
338-
<ClCompile Include="Internals\CefExtensionWrapper.cpp" />
339338
<ClCompile Include="Internals\CefFrameWrapper.cpp" />
340339
<ClCompile Include="Internals\CefBrowserWrapper.cpp" />
341340
<ClCompile Include="Internals\CefRefCountManaged.cpp" />
@@ -374,9 +373,6 @@
374373
<ClInclude Include="Internals\CefRegistrationWrapper.h" />
375374
<ClInclude Include="Internals\CefResourceReadCallbackWrapper.h" />
376375
<ClInclude Include="Internals\CefCookieAccessFilterAdapter.h" />
377-
<ClInclude Include="Internals\CefExtensionHandlerAdapter.h" />
378-
<ClInclude Include="Internals\CefExtensionWrapper.h" />
379-
<ClInclude Include="Internals\CefGetExtensionResourceCallbackWrapper.h" />
380376
<ClInclude Include="Internals\CefResourceRequestHandlerAdapter.h" />
381377
<ClInclude Include="Internals\CefResourceSkipCallbackWrapper.h" />
382378
<ClInclude Include="Internals\CefRunFileDialogCallbackAdapter.h" />

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

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@
6262
<ClCompile Include="Internals\CefValueWrapper.cpp">
6363
<Filter>Source Files</Filter>
6464
</ClCompile>
65-
<ClCompile Include="Internals\CefExtensionWrapper.cpp">
66-
<Filter>Source Files</Filter>
67-
</ClCompile>
6865
<ClCompile Include="RequestContext.cpp">
6966
<Filter>Source Files</Filter>
7067
</ClCompile>
@@ -124,7 +121,7 @@
124121
<ClInclude Include="Internals\CefTaskScheduler.h">
125122
<Filter>Header Files</Filter>
126123
</ClInclude>
127-
<ClInclude Include="Internals\CefPermissionPromptCallbackWrapper.h">
124+
<ClInclude Include="Internals\CefPermissionPromptCallbackWrapper.h">
128125
<Filter>Header Files</Filter>
129126
</ClInclude>
130127
<ClInclude Include="Internals\CefMediaAccessCallbackWrapper.h">
@@ -262,15 +259,6 @@
262259
<ClInclude Include="Internals\CefValueWrapper.h">
263260
<Filter>Header Files</Filter>
264261
</ClInclude>
265-
<ClInclude Include="Internals\CefGetExtensionResourceCallbackWrapper.h">
266-
<Filter>Header Files</Filter>
267-
</ClInclude>
268-
<ClInclude Include="Internals\CefExtensionWrapper.h">
269-
<Filter>Header Files</Filter>
270-
</ClInclude>
271-
<ClInclude Include="Internals\CefExtensionHandlerAdapter.h">
272-
<Filter>Header Files</Filter>
273-
</ClInclude>
274262
<ClInclude Include="Internals\CefRunFileDialogCallbackAdapter.h">
275263
<Filter>Header Files</Filter>
276264
</ClInclude>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,6 @@
276276
<ClInclude Include="Internals\CefRegistrationWrapper.h" />
277277
<ClInclude Include="Internals\CefResourceReadCallbackWrapper.h" />
278278
<ClInclude Include="Internals\CefCookieAccessFilterAdapter.h" />
279-
<ClInclude Include="Internals\CefGetExtensionResourceCallbackWrapper.h" />
280279
<ClInclude Include="Internals\CefResourceRequestHandlerAdapter.h" />
281280
<ClInclude Include="Internals\CefResourceSkipCallbackWrapper.h" />
282281
<ClInclude Include="Internals\CefRunFileDialogCallbackAdapter.h" />

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -253,9 +253,6 @@
253253
<ClInclude Include="Internals\CefValueWrapper.h">
254254
<Filter>Header Files</Filter>
255255
</ClInclude>
256-
<ClInclude Include="Internals\CefGetExtensionResourceCallbackWrapper.h">
257-
<Filter>Header Files</Filter>
258-
</ClInclude>
259256
<ClInclude Include="Internals\CefRunFileDialogCallbackAdapter.h">
260257
<Filter>Header Files</Filter>
261258
</ClInclude>

‎CefSharp.Core.Runtime/Internals/CefGetExtensionResourceCallbackWrapper.h

Lines changed: 0 additions & 74 deletions
This file was deleted.

‎CefSharp.Core/RequestContext.netcore.cs

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,6 @@ public RequestContext(CefSharp.RequestContextSettings settings, CefSharp.IReques
4141
{
4242
}
4343

44-
public override void LoadExtension(string rootDirectory, string manifestJson, IExtensionHandler handler)
45-
{
46-
if (Cef.CurrentlyOnThread(CefThreadIds.TID_UI))
47-
{
48-
base.LoadExtension(rootDirectory, manifestJson, handler);
49-
}
50-
else
51-
{
52-
Cef.UIThreadTaskFactory.StartNew(() =>
53-
{
54-
base.LoadExtension(rootDirectory, manifestJson, handler);
55-
});
56-
}
57-
}
58-
5944
/// <summary>
6045
/// Creates a new RequestContextBuilder which can be used to fluently set
6146
/// preferences

0 commit comments

Comments
 (0)