Remove Alloy Bootstrap (M128)

- Remove ChromeRuntime option - Remove Extension Handling and related methods (no longer supported) - Remove PackLoadingDisabled (no longer supported) - Remove PersistUserPreferences (always on) Resolves #4795
cefsharp · Sep 18, 2024 · 19739ab · 19739ab
1 parent 77f5e6d
commit 19739ab
Show file tree

Hide file tree

Showing 34 changed files with 63 additions and 1,558 deletions.
diff --git a/CefSharp.Core.Runtime/Cef.h b/CefSharp.Core.Runtime/Cef.h
@@ -286,10 +286,9 @@ namespace CefSharp
                 PathCheck::AssertAbsolute(cefSettings->LocalesDirPath, "CefSettings.LocalesDirPath");
                 PathCheck::AssertAbsolute(cefSettings->BrowserSubprocessPath, "CefSettings.BrowserSubprocessPath");
 
-
                 if (performDependencyCheck)
                 {
-                    DependencyChecker::AssertAllDependenciesPresent(cefSettings->Locale, cefSettings->LocalesDirPath, cefSettings->ResourcesDirPath, cefSettings->PackLoadingDisabled, cefSettings->BrowserSubprocessPath);
+                    DependencyChecker::AssertAllDependenciesPresent(cefSettings->Locale, cefSettings->LocalesDirPath, cefSettings->ResourcesDirPath, false, cefSettings->BrowserSubprocessPath);
                 }
                 else if (!File::Exists(cefSettings->BrowserSubprocessPath))
                 {

diff --git a/CefSharp.Core.Runtime/CefSettingsBase.h b/CefSharp.Core.Runtime/CefSettingsBase.h
@@ -84,18 +84,6 @@ namespace CefSharp
                 CommandLineArgDictionary^ get() { return _cefCommandLineArgs; }
             }
 
-            /// <summary>
-            /// **Experimental**
-            /// Set to true to enable use of the Chrome runtime in CEF. This feature is
-            /// considered experimental and is not recommended for most users at this time.
-            /// See issue https://github.com/chromiumembedded/cef/issues/2969
-            /// </summary>
-            property bool ChromeRuntime
-            {
-                bool get() { return _cefSettings->chrome_runtime == 1; }
-                void set(bool value) { _cefSettings->chrome_runtime = value; }
-            }
-
             /// <summary>
             /// Set to true to disable configuration of browser process features using standard CEF and Chromium command-line arguments.
             /// Configuration can still be specified using CEF data structures or by adding to CefCommandLineArgs.
@@ -235,17 +223,6 @@ namespace CefSharp
                 void set(String^ value) { StringUtils::AssignNativeFromClr(_cefSettings->javascript_flags, value); }
             }
 
-            /// <summary>
-            /// Set to true to disable loading of pack files for resources and locales. A resource bundle handler must be provided for the
-            /// browser and render processes via CefApp::GetResourceBundleHandler() if loading of pack files is disabled. Also configurable
-            /// using the "disable-pack-loading" command- line switch.
-            /// </summary>
-            property bool PackLoadingDisabled
-            {
-                bool get() { return _cefSettings->pack_loading_disabled == 1; }
-                void set(bool value) { _cefSettings->pack_loading_disabled = value; }
-            }
-
             /// <summary>
             /// Value that will be inserted as the product portion of the default User-Agent string. If empty the Chromium product version
             /// will be used. If UserAgent is specified this value will be ignored. Also configurable using the "user-agent-product" command-
@@ -312,17 +289,6 @@ namespace CefSharp
                 void set(bool value) { _cefSettings->persist_session_cookies = value; }
             }
 
-            /// <summary>
-            /// To persist user preferences as a JSON file in the cache path directory set this value to true. A CachePath value must also be
-            /// specified to enable this feature. Also configurable using the "persist-user-preferences" command-line switch. Can be
-            /// overridden for individual RequestContext instances via the RequestContextSettings.PersistUserPreferences value.
-            /// </summary>
-            property bool PersistUserPreferences
-            {
-                bool get() { return _cefSettings->persist_user_preferences == 1; }
-                void set(bool value) { _cefSettings->persist_user_preferences = value; }
-            }
-
             /// <summary>
             /// Comma delimited ordered list of language codes without any whitespace that will be used in the "Accept-Language" HTTP header.
             /// May be set globally using the CefSettings.AcceptLanguageList value. If both values are empty then "en-US,en" will be used.

diff --git a/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj b/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj
@@ -239,7 +239,6 @@
     <ClCompile Include="CookieManager.cpp" />
     <ClCompile Include="Internals\CefBrowserHostWrapper.cpp" />
     <ClCompile Include="Internals\CefContextMenuParamsWrapper.cpp" />
-    <ClCompile Include="Internals\CefExtensionWrapper.cpp" />
     <ClCompile Include="Internals\CefFrameWrapper.cpp" />
     <ClCompile Include="Internals\CefBrowserWrapper.cpp" />
     <ClCompile Include="Internals\CefRefCountManaged.cpp" />
@@ -277,8 +276,6 @@
     <ClInclude Include="Internals\CefRegistrationWrapper.h" />
     <ClInclude Include="Internals\CefResourceReadCallbackWrapper.h" />
     <ClInclude Include="Internals\CefCookieAccessFilterAdapter.h" />
-    <ClInclude Include="Internals\CefExtensionHandlerAdapter.h" />
-    <ClInclude Include="Internals\CefExtensionWrapper.h" />
     <ClInclude Include="Internals\CefGetExtensionResourceCallbackWrapper.h" />
     <ClInclude Include="Internals\CefResourceRequestHandlerAdapter.h" />
     <ClInclude Include="Internals\CefResourceSkipCallbackWrapper.h" />

diff --git a/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj.filters b/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj.filters
@@ -62,9 +62,6 @@
     <ClCompile Include="Internals\CefValueWrapper.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Internals\CefExtensionWrapper.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="RequestContext.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -259,12 +256,6 @@
     <ClInclude Include="Internals\CefGetExtensionResourceCallbackWrapper.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Internals\CefExtensionWrapper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Internals\CefExtensionHandlerAdapter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Internals\CefRunFileDialogCallbackAdapter.h">
       <Filter>Header Files</Filter>
     </ClInclude>

diff --git a/CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.cpp b/CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.cpp
@@ -9,7 +9,6 @@
 #include "include\cef_parser.h"
 
 #include "Cef.h"
-#include "CefExtensionWrapper.h"
 #include "CefTaskScheduler.h"
 #include "DragData.h"
 #include "CefRunFileDialogCallbackAdapter.h"
@@ -287,20 +286,6 @@ void CefBrowserHostWrapper::ReplaceMisspelling(String^ word)
     _browserHost->ReplaceMisspelling(StringUtils::ToNative(word));
 }
 
-IExtension^ CefBrowserHostWrapper::Extension::get()
-{
-    ThrowIfDisposed();
-
-    auto extension = _browserHost->GetExtension();
-
-    if (extension.get())
-    {
-        return gcnew CefExtensionWrapper(_browserHost->GetExtension());
-    }
-
-    return nullptr;
-}
-
 void CefBrowserHostWrapper::RunFileDialog(CefFileDialogMode mode, String^ title, String^ defaultFilePath, IList<String^>^ acceptFilters, IRunFileDialogCallback^ callback)
 {
     ThrowIfDisposed();
@@ -482,13 +467,6 @@ void CefBrowserHostWrapper::Invalidate(PaintElementType type)
     _browserHost->Invalidate((CefBrowserHost::PaintElementType)type);
 }
 
-bool CefBrowserHostWrapper::IsBackgroundHost::get()
-{
-    ThrowIfDisposed();
-
-    return _browserHost->IsBackgroundHost();
-}
-
 void CefBrowserHostWrapper::ImeSetComposition(String^ text, cli::array<CompositionUnderline>^ underlines, Nullable<CefSharp::Structs::Range> replacementRange, Nullable<CefSharp::Structs::Range> selectionRange)
 {
     ThrowIfDisposed();

diff --git a/CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.h b/CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.h
@@ -81,11 +81,6 @@ namespace CefSharp
             virtual void AddWordToDictionary(String^ word);
             virtual void ReplaceMisspelling(String^ word);
 
-            virtual property IExtension^ Extension
-            {
-                IExtension^ get();
-            }
-
             virtual void RunFileDialog(CefFileDialogMode mode, String^ title, String^ defaultFilePath, IList<String^>^ acceptFilters, IRunFileDialogCallback^ callback);
 
             virtual void Find(String^ searchText, bool forward, bool matchCase, bool findNext);
@@ -102,11 +97,6 @@ namespace CefSharp
 
             virtual void Invalidate(PaintElementType type);
 
-            virtual property bool IsBackgroundHost
-            {
-                bool get();
-            }
-
             virtual void ImeSetComposition(String^ text, cli::array<CompositionUnderline>^ underlines, Nullable<CefSharp::Structs::Range> replacementRange, Nullable<CefSharp::Structs::Range> selectionRange);
             virtual void ImeCommitText(String^ text, Nullable<CefSharp::Structs::Range> replacementRange, int relativeCursorPos);
             virtual void ImeFinishComposingText(bool keepSelection);

diff --git a/CefSharp.Core.Runtime/Internals/CefExtensionHandlerAdapter.h b/CefSharp.Core.Runtime/Internals/CefExtensionHandlerAdapter.h