From c7074c102c78b6131350b910eb4048bf9836c27f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20D=C3=ADaz=20Fau?= Date: Tue, 15 Sep 2020 15:47:46 +0200 Subject: [PATCH] Update to CEF 85.3.7 --- README.md | 6 +- demos/Delphi_VCL/MDIBrowser/MDIBrowser.dproj | 138 ++++++++++++++++++- demos/Delphi_VCL/MDIBrowser/uChildForm.pas | 11 +- demos/Delphi_VCL/MDIBrowser/uMainForm.dfm | 8 ++ demos/Delphi_VCL/MDIBrowser/uMainForm.pas | 5 + packages/cef4delphi_lazarus.lpk | 2 +- source/uCEFApplicationCore.pas | 2 +- update_CEF4Delphi.json | 4 +- 8 files changed, 167 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index dfa55818..c8d7f2af 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 85.3.6 which includes Chromium 85.0.4183.102. +CEF4Delphi uses CEF 85.3.7 which includes Chromium 85.0.4183.102. The CEF binaries used by CEF4Delphi are available for download at spotify : -* [32 bits](http://opensource.spotify.com/cefbuilds/cef_binary_85.3.6%2Bgacfac2f%2Bchromium-85.0.4183.102_windows32.tar.bz2) -* [64 bits](http://opensource.spotify.com/cefbuilds/cef_binary_85.3.6%2Bgacfac2f%2Bchromium-85.0.4183.102_windows64.tar.bz2) +* [32 bits](http://opensource.spotify.com/cefbuilds/cef_binary_85.3.7%2Bg7de1243%2Bchromium-85.0.4183.102_windows32.tar.bz2) +* [64 bits](http://opensource.spotify.com/cefbuilds/cef_binary_85.3.7%2Bg7de1243%2Bchromium-85.0.4183.102_windows64.tar.bz2) CEF4Delphi was developed and tested on Delphi 10.4 and it has been tested in Delphi 7, Delphi XE, Delphi 10, Delphi 10.2, Delphi 10.3 and Lazarus 2.0.10/FPC 3.2.0. CEF4Delphi includes VCL, FireMonkey (FMX) and Lazarus components. diff --git a/demos/Delphi_VCL/MDIBrowser/MDIBrowser.dproj b/demos/Delphi_VCL/MDIBrowser/MDIBrowser.dproj index cca4881e..83f49366 100644 --- a/demos/Delphi_VCL/MDIBrowser/MDIBrowser.dproj +++ b/demos/Delphi_VCL/MDIBrowser/MDIBrowser.dproj @@ -4,7 +4,7 @@ MDIBrowser.dpr Debug DCC32 - 19.0 + 19.1 VCL True Win32 @@ -582,6 +582,32 @@ 0 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + 1 @@ -756,6 +782,56 @@ 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + 1 @@ -950,6 +1026,66 @@ 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + 1 diff --git a/demos/Delphi_VCL/MDIBrowser/uChildForm.pas b/demos/Delphi_VCL/MDIBrowser/uChildForm.pas index 70dbce32..1cca135d 100644 --- a/demos/Delphi_VCL/MDIBrowser/uChildForm.pas +++ b/demos/Delphi_VCL/MDIBrowser/uChildForm.pas @@ -203,6 +203,7 @@ end; procedure TChildForm.FormShow(Sender: TObject); var TempContext : ICefRequestContext; + TempCache : string; begin try // The new request context overrides several GlobalCEFApp properties like : @@ -215,7 +216,15 @@ begin // GlobalCEFApp.RootCache unless you use a blank cache (in-memory). if MainForm.NewContextChk.Checked then - TempContext := TCefRequestContextRef.New('', '', False, False, False) + begin + if MainForm.IncognitoChk.Checked then + TempCache := '' + else + TempCache := GlobalCEFApp.RootCache + '\cache' + inttostr(MainForm.BrowserCount); + + TempContext := TCefRequestContextRef.New(TempCache, '', False, False, False) + + end else TempContext := nil; diff --git a/demos/Delphi_VCL/MDIBrowser/uMainForm.dfm b/demos/Delphi_VCL/MDIBrowser/uMainForm.dfm index 3bca3c50..631fd5c3 100644 --- a/demos/Delphi_VCL/MDIBrowser/uMainForm.dfm +++ b/demos/Delphi_VCL/MDIBrowser/uMainForm.dfm @@ -79,5 +79,13 @@ object MainForm: TMainForm Caption = 'Create a new request context for new browsers' TabOrder = 0 end + object IncognitoChk: TCheckBox + Left = 568 + Top = 8 + Width = 305 + Height = 17 + Caption = 'Use incognito mode for child windows' + TabOrder = 1 + end end end diff --git a/demos/Delphi_VCL/MDIBrowser/uMainForm.pas b/demos/Delphi_VCL/MDIBrowser/uMainForm.pas index 7f5e0691..2f5a5fa6 100644 --- a/demos/Delphi_VCL/MDIBrowser/uMainForm.pas +++ b/demos/Delphi_VCL/MDIBrowser/uMainForm.pas @@ -65,6 +65,7 @@ type NewBtn: TSpeedButton; ExitBtn: TSpeedButton; NewContextChk: TCheckBox; + IncognitoChk: TCheckBox; procedure FormCreate(Sender: TObject); procedure NewBtnClick(Sender: TObject); procedure ExitBtnClick(Sender: TObject); @@ -115,8 +116,12 @@ end; procedure CreateGlobalCEFApp; begin + // GlobalCEFApp.RootCache must be the parent of all cache directories + // used by the browsers in the application. GlobalCEFApp := TCefApplication.Create; GlobalCEFApp.OnContextInitialized := GlobalCEFApp_OnContextInitialized; + GlobalCEFApp.RootCache := ExtractFileDir(ParamStr(0)); + GlobalCEFApp.cache := GlobalCEFApp.RootCache + '\cache'; end; procedure TMainForm.CreateMDIChild(const Name: string); diff --git a/packages/cef4delphi_lazarus.lpk b/packages/cef4delphi_lazarus.lpk index 6788e642..ded6d63d 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 508b2886..54be0843 100644 --- a/source/uCEFApplicationCore.pas +++ b/source/uCEFApplicationCore.pas @@ -59,7 +59,7 @@ uses const CEF_SUPPORTED_VERSION_MAJOR = 85; CEF_SUPPORTED_VERSION_MINOR = 3; - CEF_SUPPORTED_VERSION_RELEASE = 6; + CEF_SUPPORTED_VERSION_RELEASE = 7; CEF_SUPPORTED_VERSION_BUILD = 0; CEF_CHROMEELF_VERSION_MAJOR = 85; diff --git a/update_CEF4Delphi.json b/update_CEF4Delphi.json index 2313a740..67502f44 100644 --- a/update_CEF4Delphi.json +++ b/update_CEF4Delphi.json @@ -2,9 +2,9 @@ "UpdateLazPackages" : [ { "ForceNotify" : true, - "InternalVersion" : 181, + "InternalVersion" : 182, "Name" : "cef4delphi_lazarus.lpk", - "Version" : "85.3.6.0" + "Version" : "85.3.7.0" } ], "UpdatePackageData" : {