From a397f68a1a28c2b5e55a347fd2cf9df46ec33a7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20D=C3=ADaz=20Fau?= Date: Tue, 10 Mar 2020 11:59:58 +0100 Subject: [PATCH] Update to CEF 80.0.8 - Added GlobalCEFApp.ForceFieldTrials property. - Added GlobalCEFApp.ForceFieldTrialParams property. --- README.md | 6 +++--- packages/cef4delphi_lazarus.lpk | 2 +- source/uCEFApplicationCore.pas | 32 ++++++++++++++++++++++---------- update_CEF4Delphi.json | 4 ++-- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 6c1b66e4..4ed98e30 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,10 @@ CEF4Delphi is an open source project created by Salvador D CEF4Delphi is based on DCEF3, made by Henri Gourvest. The original license of DCEF3 still applies to CEF4Delphi. Read the license terms in the first lines of any *.pas file. -CEF4Delphi uses CEF 80.0.5 which includes Chromium 80.0.3987.132. +CEF4Delphi uses CEF 80.0.8 which includes Chromium 80.0.3987.132. The CEF binaries used by CEF4Delphi are available for download at spotify : -* [32 bits](http://opensource.spotify.com/cefbuilds/cef_binary_80.0.5%2Bgdf7fb8e%2Bchromium-80.0.3987.132_windows32.tar.bz2) -* [64 bits](http://opensource.spotify.com/cefbuilds/cef_binary_80.0.5%2Bgdf7fb8e%2Bchromium-80.0.3987.132_windows64.tar.bz2) +* [32 bits](http://opensource.spotify.com/cefbuilds/cef_binary_80.0.8%2Bgf96cd1d%2Bchromium-80.0.3987.132_windows32.tar.bz2) +* [64 bits](http://opensource.spotify.com/cefbuilds/cef_binary_80.0.8%2Bgf96cd1d%2Bchromium-80.0.3987.132_windows64.tar.bz2) CEF4Delphi was developed and tested on Delphi 10.3 Rio and it has been tested in Delphi 7, Delphi XE, Delphi 10, Delphi 10.2 and Lazarus 2.0.6/FPC 3.0.4. CEF4Delphi includes VCL, FireMonkey (FMX) and Lazarus components. diff --git a/packages/cef4delphi_lazarus.lpk b/packages/cef4delphi_lazarus.lpk index a6871d0f..7253bdf2 100644 --- a/packages/cef4delphi_lazarus.lpk +++ b/packages/cef4delphi_lazarus.lpk @@ -21,7 +21,7 @@ - + diff --git a/source/uCEFApplicationCore.pas b/source/uCEFApplicationCore.pas index 19b9ddad..c7859bdd 100644 --- a/source/uCEFApplicationCore.pas +++ b/source/uCEFApplicationCore.pas @@ -62,7 +62,7 @@ uses const CEF_SUPPORTED_VERSION_MAJOR = 80; CEF_SUPPORTED_VERSION_MINOR = 0; - CEF_SUPPORTED_VERSION_RELEASE = 5; + CEF_SUPPORTED_VERSION_RELEASE = 8; CEF_SUPPORTED_VERSION_BUILD = 0; CEF_CHROMEELF_VERSION_MAJOR = 80; @@ -138,10 +138,12 @@ type FDisablePDFExtension : boolean; FLogProcessInfo : boolean; FDisableSiteIsolationTrials : boolean; - FEnableFeatures : string; - FDisableFeatures : string; - FEnableBlinkFeatures : string; - FDisableBlinkFeatures : string; + FEnableFeatures : ustring; + FDisableFeatures : ustring; + FEnableBlinkFeatures : ustring; + FDisableBlinkFeatures : ustring; + FForceFieldTrials : ustring; + FForceFieldTrialParams : ustring; FChromeVersionInfo : TFileVersionInfo; {$IFDEF FPC} FLibHandle : TLibHandle; @@ -396,10 +398,12 @@ type property EnableSpeechInput : boolean read FEnableSpeechInput write FEnableSpeechInput; // --enable-speech-input property UseFakeUIForMediaStream : boolean read FUseFakeUIForMediaStream write FUseFakeUIForMediaStream; // --use-fake-ui-for-media-stream property EnableGPU : boolean read FEnableGPU write FEnableGPU; // --enable-gpu-plugin - property EnableFeatures : string read FEnableFeatures write FEnableFeatures; // --enable-features - property DisableFeatures : string read FDisableFeatures write FDisableFeatures; // --disable-features - property EnableBlinkFeatures : string read FEnableBlinkFeatures write FEnableBlinkFeatures; // --enable-blink-features - property DisableBlinkFeatures : string read FDisableBlinkFeatures write FDisableBlinkFeatures; // --disable-blink-features + property EnableFeatures : ustring read FEnableFeatures write FEnableFeatures; // --enable-features + property DisableFeatures : ustring read FDisableFeatures write FDisableFeatures; // --disable-features + property EnableBlinkFeatures : ustring read FEnableBlinkFeatures write FEnableBlinkFeatures; // --enable-blink-features + property DisableBlinkFeatures : ustring read FDisableBlinkFeatures write FDisableBlinkFeatures; // --disable-blink-features + property ForceFieldTrials : ustring read FForceFieldTrials write FForceFieldTrials; // --force-fieldtrials + property ForceFieldTrialParams : ustring read FForceFieldTrialParams write FForceFieldTrialParams; // --force-fieldtrial-params property SmoothScrolling : TCefState read FSmoothScrolling write FSmoothScrolling; // --enable-smooth-scrolling property FastUnload : boolean read FFastUnload write FFastUnload; // --enable-fast-unload property DisableSafeBrowsing : boolean read FDisableSafeBrowsing write FDisableSafeBrowsing; // --safebrowsing-disable-auto-update @@ -662,6 +666,8 @@ begin FDisableFeatures := ''; FEnableBlinkFeatures := ''; FDisableBlinkFeatures := ''; + FForceFieldTrials := ''; + FForceFieldTrialParams := ''; FSupportedSchemes := nil; FDisableNewBrowserInfoTimeout := False; @@ -1574,7 +1580,7 @@ begin end; procedure TCefApplicationCore.Internal_OnBeforeCommandLineProcessing(const processType : ustring; - const commandLine : ICefCommandLine); + const commandLine : ICefCommandLine); var i : integer; {$IFDEF MSWINDOWS} @@ -1763,6 +1769,12 @@ begin if (length(FDisableBlinkFeatures) > 0) then commandLine.AppendSwitchWithValue('--disable-blink-features', FDisableBlinkFeatures); + if (length(FForceFieldTrials) > 0) then + commandLine.AppendSwitchWithValue('--force-fieldtrials', FForceFieldTrials); + + if (length(FForceFieldTrialParams) > 0) then + commandLine.AppendSwitchWithValue('--force-fieldtrial-params', FForceFieldTrialParams); + if (FCustomCommandLines <> nil) and (FCustomCommandLineValues <> nil) and (FCustomCommandLines.Count = FCustomCommandLineValues.Count) then diff --git a/update_CEF4Delphi.json b/update_CEF4Delphi.json index f153c3f5..b81139ba 100644 --- a/update_CEF4Delphi.json +++ b/update_CEF4Delphi.json @@ -2,9 +2,9 @@ "UpdateLazPackages" : [ { "ForceNotify" : true, - "InternalVersion" : 106, + "InternalVersion" : 107, "Name" : "cef4delphi_lazarus.lpk", - "Version" : "80.0.5.0" + "Version" : "80.0.8.0" } ], "UpdatePackageData" : {