From f773189b70cb129a94d566e38d5b25bd05441eb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20D=C3=ADaz=20Fau?= Date: Tue, 26 May 2020 16:57:37 +0200 Subject: [PATCH] Update to CEF 83.3.10 - Issue #280 : Added GlobalCEFApp.MissingBinariesException property. --- README.md | 6 +++--- packages/cef4delphi_lazarus.lpk | 2 +- source/uCEFApplicationCore.pas | 8 +++++++- update_CEF4Delphi.json | 4 ++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 1f91471c..f4bb5b9b 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,10 @@ CEF4Delphi is an open source project created by Salvador Díaz Fau to embed Chro 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 83.3.9 which includes Chromium 83.0.4103.61. +CEF4Delphi uses CEF 83.3.10 which includes Chromium 83.0.4103.61. The CEF binaries used by CEF4Delphi are available for download at spotify : -* [32 bits](http://opensource.spotify.com/cefbuilds/cef_binary_83.3.9%2Bged43e55%2Bchromium-83.0.4103.61_windows32.tar.bz2) -* [64 bits](http://opensource.spotify.com/cefbuilds/cef_binary_83.3.9%2Bged43e55%2Bchromium-83.0.4103.61_windows64.tar.bz2) +* [32 bits](http://opensource.spotify.com/cefbuilds/cef_binary_83.3.10%2Bg124ce01%2Bchromium-83.0.4103.61_windows32.tar.bz2) +* [64 bits](http://opensource.spotify.com/cefbuilds/cef_binary_83.3.10%2Bg124ce01%2Bchromium-83.0.4103.61_windows64.tar.bz2) CEF4Delphi was developed and tested on Delphi 10.3.3 and it has been tested in Delphi 7, Delphi XE, Delphi 10, Delphi 10.2 and Lazarus 2.0.8/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 2356a500..fb9b3ff0 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 a7d16103..65e7fd08 100644 --- a/source/uCEFApplicationCore.pas +++ b/source/uCEFApplicationCore.pas @@ -62,7 +62,7 @@ uses const CEF_SUPPORTED_VERSION_MAJOR = 83; CEF_SUPPORTED_VERSION_MINOR = 3; - CEF_SUPPORTED_VERSION_RELEASE = 9; + CEF_SUPPORTED_VERSION_RELEASE = 10; CEF_SUPPORTED_VERSION_BUILD = 0; CEF_CHROMEELF_VERSION_MAJOR = 83; @@ -131,6 +131,7 @@ type FMuteAudio : boolean; FReRaiseExceptions : boolean; FShowMessageDlg : boolean; + FMissingBinariesException : boolean; FSetCurrentDir : boolean; FGlobalContextInitialized : boolean; FSitePerProcess : boolean; @@ -449,6 +450,7 @@ type property DeleteCookies : boolean read FDeleteCookies write FDeleteCookies; property CheckCEFFiles : boolean read FCheckCEFFiles write FCheckCEFFiles; property ShowMessageDlg : boolean read FShowMessageDlg write FShowMessageDlg; + property MissingBinariesException : boolean read FMissingBinariesException write FMissingBinariesException; property SetCurrentDir : boolean read FSetCurrentDir write FSetCurrentDir; property GlobalContextInitialized : boolean read GetGlobalContextInitialized; property ChromeMajorVer : uint16 read FChromeVersionInfo.MajorVer; @@ -646,6 +648,7 @@ begin FReRaiseExceptions := False; FLibLoaded := False; FShowMessageDlg := True; + FMissingBinariesException := False; FSetCurrentDir := False; FGlobalContextInitialized := False; FCheckDevToolsResources := True; @@ -1397,6 +1400,9 @@ begin MessageBox(0, PChar(aError + #0), PChar('Error' + #0), MB_ICONERROR or MB_OK or MB_TOPMOST); {$ENDIF} end; + + if FMissingBinariesException then + raise Exception.Create(aError); end; procedure TCefApplicationCore.UpdateSupportedSchemes(aIncludeDefaults : boolean); diff --git a/update_CEF4Delphi.json b/update_CEF4Delphi.json index dc807cd0..7c58925c 100644 --- a/update_CEF4Delphi.json +++ b/update_CEF4Delphi.json @@ -2,9 +2,9 @@ "UpdateLazPackages" : [ { "ForceNotify" : true, - "InternalVersion" : 139, + "InternalVersion" : 140, "Name" : "cef4delphi_lazarus.lpk", - "Version" : "83.3.9.0" + "Version" : "83.3.10.0" } ], "UpdatePackageData" : {