pascal/CEF4Delphi
1
0
Fork 0
mirror of https://github.com/salvadordf/CEF4Delphi.git synced 2025-06-12 22:07:39 +02:00
Code Issues Actions Releases Activity

improve: allow to disable extensions (cef_extensions.pak)

Browse Source 
Some projects does not use extenstions, so there is no need to include
`cef_extensions.pak` into a project, but CEF4Delphi requires it.

Make able to disable extensions. Let's introduce the method
`DisableExtensions` which will disable the file check for
`cef_extensions.pak` and will add the `--disable-extensions` command
line option.
This commit is contained in:
Alexey Shumkin
2018-10-03 10:58:51 +03:00
parent b16ea570cf
commit 16a676128f
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/uCEFApplication.pas
View File

@ -138,6 +138,7 @@ type
FAppSettings : TCefSettings; FAppSettings : TCefSettings;
FDeviceScaleFactor : single; FDeviceScaleFactor : single;
FCheckDevToolsResources : boolean; FCheckDevToolsResources : boolean;
FCheckExtensions : boolean;
FDisableGPUCache : boolean; FDisableGPUCache : boolean;
FStatus : TCefAplicationStatus; FStatus : TCefAplicationStatus;
FMissingLibFiles : string; FMissingLibFiles : string;
@ -259,6 +260,7 @@ type
function FindFlashDLL(var aFileName : string) : boolean; function FindFlashDLL(var aFileName : string) : boolean;
procedure ShowErrorMessageDlg(const aError : string); virtual; procedure ShowErrorMessageDlg(const aError : string); virtual;
function ParseProcessType : TCefProcessType; function ParseProcessType : TCefProcessType;
procedure DisableExtensions;
public public
constructor Create; constructor Create;
@ -355,6 +357,7 @@ type
property ReRaiseExceptions : boolean read FReRaiseExceptions write FReRaiseExceptions; property ReRaiseExceptions : boolean read FReRaiseExceptions write FReRaiseExceptions;
property DeviceScaleFactor : single read FDeviceScaleFactor; property DeviceScaleFactor : single read FDeviceScaleFactor;
property CheckDevToolsResources : boolean read FCheckDevToolsResources write FCheckDevToolsResources; property CheckDevToolsResources : boolean read FCheckDevToolsResources write FCheckDevToolsResources;
property CheckExtensions : boolean read FCheckExtensions write FCheckExtensions;
property LocalesRequired : ustring read FLocalesRequired write FLocalesRequired; property LocalesRequired : ustring read FLocalesRequired write FLocalesRequired;
property CustomFlashPath : ustring read FCustomFlashPath write FCustomFlashPath; property CustomFlashPath : ustring read FCustomFlashPath write FCustomFlashPath;
property ProcessType : TCefProcessType read FProcessType; property ProcessType : TCefProcessType read FProcessType;
@ -507,6 +510,7 @@ begin
FSetCurrentDir := False; FSetCurrentDir := False;
FGlobalContextInitialized := False; FGlobalContextInitialized := False;
FCheckDevToolsResources := True; FCheckDevToolsResources := True;
FCheckExtensions := True;
FDisableGPUCache := True; FDisableGPUCache := True;
FLocalesRequired := ''; FLocalesRequired := '';
FProcessType := ParseProcessType; FProcessType := ParseProcessType;
@ -580,6 +584,12 @@ begin
end; end;
end; end;
procedure TCefApplication.DisableExtensions;
begin
CheckExtensions := False;
AddCustomCommandLine('--disable-extensions');
end;
procedure TCefApplication.AfterConstruction; procedure TCefApplication.AfterConstruction;
begin begin
inherited AfterConstruction; inherited AfterConstruction;
@ -814,7 +824,7 @@ begin
end; end;
TempMissingFrm := not(CheckDLLs(FFrameworkDirPath, FMissingLibFiles)); TempMissingFrm := not(CheckDLLs(FFrameworkDirPath, FMissingLibFiles));
TempMissingRsc := not(CheckResources(FResourcesDirPath, FMissingLibFiles, FCheckDevToolsResources)); TempMissingRsc := not(CheckResources(FResourcesDirPath, FMissingLibFiles, FCheckDevToolsResources, FCheckExtensions));
TempMissingLoc := not(CheckLocales(FLocalesDirPath, FMissingLibFiles, FLocalesRequired)); TempMissingLoc := not(CheckLocales(FLocalesDirPath, FMissingLibFiles, FLocalesRequired));
if TempMissingFrm or TempMissingRsc or TempMissingLoc then if TempMissingFrm or TempMissingRsc or TempMissingLoc then
@ -855,6 +865,7 @@ begin
if not(Is32BitProcess) then if not(Is32BitProcess) then
Result := True Result := True
else else
begin begin
FStatus := asErrorDLLVersion; FStatus := asErrorDLLVersion;
TempString := 'Wrong CEF3 binaries !' + TempString := 'Wrong CEF3 binaries !' +

6
source/uCEFMiscFunctions.pas
View File

@ -167,7 +167,7 @@ function GetDLLVersion(const aDLLFile : string; var aVersionInfo : TFileVersion
function SplitLongString(aSrcString : string) : string; function SplitLongString(aSrcString : string) : string;
function GetAbsoluteDirPath(const aSrcPath : string; var aRsltPath : string) : boolean; function GetAbsoluteDirPath(const aSrcPath : string; var aRsltPath : string) : boolean;
function CheckLocales(const aLocalesDirPath : string; var aMissingFiles : string; const aLocalesRequired : string = '') : boolean; function CheckLocales(const aLocalesDirPath : string; var aMissingFiles : string; const aLocalesRequired : string = '') : boolean;
function CheckResources(const aResourcesDirPath : string; var aMissingFiles : string; aCheckDevResources: boolean = True) : boolean; function CheckResources(const aResourcesDirPath : string; var aMissingFiles : string; aCheckDevResources: boolean = True; aCheckExtensions: boolean = True) : boolean;
function CheckDLLs(const aFrameworkDirPath : string; var aMissingFiles : string) : boolean; function CheckDLLs(const aFrameworkDirPath : string; var aMissingFiles : string) : boolean;
function CheckDLLVersion(const aDLLFile : string; aMajor, aMinor, aRelease, aBuild : uint16) : boolean; function CheckDLLVersion(const aDLLFile : string; aMajor, aMinor, aRelease, aBuild : uint16) : boolean;
function FileVersionInfoToString(const aVersionInfo : TFileVersionInfo) : string; function FileVersionInfoToString(const aVersionInfo : TFileVersionInfo) : string;
@ -909,7 +909,7 @@ begin
end; end;
end; end;
function CheckResources(const aResourcesDirPath : string; var aMissingFiles : string; aCheckDevResources: boolean) : boolean; function CheckResources(const aResourcesDirPath : string; var aMissingFiles : string; aCheckDevResources, aCheckExtensions: boolean) : boolean;
var var
TempDir : string; TempDir : string;
TempList : TStringList; TempList : TStringList;
@ -928,8 +928,8 @@ begin
TempList.Add(TempDir + 'cef.pak'); TempList.Add(TempDir + 'cef.pak');
TempList.Add(TempDir + 'cef_100_percent.pak'); TempList.Add(TempDir + 'cef_100_percent.pak');
TempList.Add(TempDir + 'cef_200_percent.pak'); TempList.Add(TempDir + 'cef_200_percent.pak');
TempList.Add(TempDir + 'cef_extensions.pak');
if aCheckExtensions then TempList.Add(TempDir + 'cef_extensions.pak');
if aCheckDevResources then TempList.Add(TempDir + 'devtools_resources.pak'); if aCheckDevResources then TempList.Add(TempDir + 'devtools_resources.pak');
if TempExists then if TempExists then