diff --git a/README.md b/README.md index 67e87bee..482d637e 100644 --- a/README.md +++ b/README.md @@ -3,15 +3,15 @@ CEF4Delphi is an open source project created by Salvador Díaz Fau to embed Chro CEF4Delphi is based on DCEF3 and fpCEF3. The original license of those projects still applies to CEF4Delphi. Read the license terms in the first lines of any *.pas file. -CEF4Delphi uses CEF 108.4.13 which includes Chromium 108.0.5359.125. +CEF4Delphi uses CEF 109.1.8 which includes Chromium 109.0.5414.87. The CEF binaries used by CEF4Delphi are available for download at Spotify : -* [Windows 32 bits](https://cef-builds.spotifycdn.com/cef_binary_108.4.13%2Bga98cd4c%2Bchromium-108.0.5359.125_windows32.tar.bz2) -* [Windows 64 bits](https://cef-builds.spotifycdn.com/cef_binary_108.4.13%2Bga98cd4c%2Bchromium-108.0.5359.125_windows64.tar.bz2) -* [Linux x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_108.4.13%2Bga98cd4c%2Bchromium-108.0.5359.125_linux64.tar.bz2) -* [Linux ARM 32 bits](https://cef-builds.spotifycdn.com/cef_binary_108.4.13%2Bga98cd4c%2Bchromium-108.0.5359.125_linuxarm.tar.bz2) -* [Linux ARM 64 bits](https://cef-builds.spotifycdn.com/cef_binary_108.4.13%2Bga98cd4c%2Bchromium-108.0.5359.125_linuxarm64.tar.bz2) -* [MacOS x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_108.4.13%2Bga98cd4c%2Bchromium-108.0.5359.125_macosx64.tar.bz2) +* [Windows 32 bits](https://cef-builds.spotifycdn.com/cef_binary_109.1.8%2Bg44ba3e7%2Bchromium-109.0.5414.87_windows32.tar.bz2) +* [Windows 64 bits](https://cef-builds.spotifycdn.com/cef_binary_109.1.8%2Bg44ba3e7%2Bchromium-109.0.5414.87_windows64.tar.bz2) +* [Linux x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_109.1.8%2Bg44ba3e7%2Bchromium-109.0.5414.87_linux64.tar.bz2) +* [Linux ARM 32 bits](https://cef-builds.spotifycdn.com/cef_binary_109.1.8%2Bg44ba3e7%2Bchromium-109.0.5414.87_linuxarm.tar.bz2) +* [Linux ARM 64 bits](https://cef-builds.spotifycdn.com/cef_binary_109.1.8%2Bg44ba3e7%2Bchromium-109.0.5414.87_linuxarm64.tar.bz2) +* [MacOS x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_109.1.8%2Bg44ba3e7%2Bchromium-109.0.5414.87_macosx64.tar.bz2) CEF4Delphi was developed and tested on Delphi 11.2 and it has been tested in Delphi 7, Delphi XE, Delphi 10, Delphi 10.2, Delphi 10.3, Delphi 10.4 and Lazarus 2.2.4/FPC 3.2.2. CEF4Delphi includes VCL, FireMonkey (FMX) and Lazarus components. diff --git a/demos/Delphi_FMX_Linux/FMXExternalPumpBrowser2/cef.inc b/demos/Delphi_FMX_Linux/FMXExternalPumpBrowser2/cef.inc index 17a4cdb9..af4e9092 100644 --- a/demos/Delphi_FMX_Linux/FMXExternalPumpBrowser2/cef.inc +++ b/demos/Delphi_FMX_Linux/FMXExternalPumpBrowser2/cef.inc @@ -505,3 +505,11 @@ {$DEFINE MACOSX} {$ENDIF} {$ENDIF} + +{$IFDEF LINUX} + {$IFDEF FPC} + {$DEFINE LINUXFPC} + {$ELSE} + {$DEFINE LINUXFMX} + {$ENDIF} +{$ENDIF} diff --git a/demos/Lazarus_Linux_GTK2/ExternalPumpBrowser/cef.inc b/demos/Lazarus_Linux_GTK2/ExternalPumpBrowser/cef.inc index 17a4cdb9..af4e9092 100644 --- a/demos/Lazarus_Linux_GTK2/ExternalPumpBrowser/cef.inc +++ b/demos/Lazarus_Linux_GTK2/ExternalPumpBrowser/cef.inc @@ -505,3 +505,11 @@ {$DEFINE MACOSX} {$ENDIF} {$ENDIF} + +{$IFDEF LINUX} + {$IFDEF FPC} + {$DEFINE LINUXFPC} + {$ELSE} + {$DEFINE LINUXFMX} + {$ENDIF} +{$ENDIF} diff --git a/demos/Lazarus_Linux_GTK2/MiniBrowser/cef.inc b/demos/Lazarus_Linux_GTK2/MiniBrowser/cef.inc index 17a4cdb9..af4e9092 100644 --- a/demos/Lazarus_Linux_GTK2/MiniBrowser/cef.inc +++ b/demos/Lazarus_Linux_GTK2/MiniBrowser/cef.inc @@ -505,3 +505,11 @@ {$DEFINE MACOSX} {$ENDIF} {$ENDIF} + +{$IFDEF LINUX} + {$IFDEF FPC} + {$DEFINE LINUXFPC} + {$ELSE} + {$DEFINE LINUXFMX} + {$ENDIF} +{$ENDIF} diff --git a/demos/Lazarus_Linux_GTK2/MobileBrowser/cef.inc b/demos/Lazarus_Linux_GTK2/MobileBrowser/cef.inc index 17a4cdb9..af4e9092 100644 --- a/demos/Lazarus_Linux_GTK2/MobileBrowser/cef.inc +++ b/demos/Lazarus_Linux_GTK2/MobileBrowser/cef.inc @@ -505,3 +505,11 @@ {$DEFINE MACOSX} {$ENDIF} {$ENDIF} + +{$IFDEF LINUX} + {$IFDEF FPC} + {$DEFINE LINUXFPC} + {$ELSE} + {$DEFINE LINUXFMX} + {$ENDIF} +{$ENDIF} diff --git a/demos/Lazarus_Linux_GTK2/OSRExternalPumpBrowser/cef.inc b/demos/Lazarus_Linux_GTK2/OSRExternalPumpBrowser/cef.inc index 17a4cdb9..af4e9092 100644 --- a/demos/Lazarus_Linux_GTK2/OSRExternalPumpBrowser/cef.inc +++ b/demos/Lazarus_Linux_GTK2/OSRExternalPumpBrowser/cef.inc @@ -505,3 +505,11 @@ {$DEFINE MACOSX} {$ENDIF} {$ENDIF} + +{$IFDEF LINUX} + {$IFDEF FPC} + {$DEFINE LINUXFPC} + {$ELSE} + {$DEFINE LINUXFMX} + {$ENDIF} +{$ENDIF} diff --git a/demos/Lazarus_Linux_GTK2/OSRExternalPumpBrowser2/cef.inc b/demos/Lazarus_Linux_GTK2/OSRExternalPumpBrowser2/cef.inc index 17a4cdb9..af4e9092 100644 --- a/demos/Lazarus_Linux_GTK2/OSRExternalPumpBrowser2/cef.inc +++ b/demos/Lazarus_Linux_GTK2/OSRExternalPumpBrowser2/cef.inc @@ -505,3 +505,11 @@ {$DEFINE MACOSX} {$ENDIF} {$ENDIF} + +{$IFDEF LINUX} + {$IFDEF FPC} + {$DEFINE LINUXFPC} + {$ELSE} + {$DEFINE LINUXFMX} + {$ENDIF} +{$ENDIF} diff --git a/demos/Lazarus_Linux_GTK2/PopupBrowser2/cef.inc b/demos/Lazarus_Linux_GTK2/PopupBrowser2/cef.inc index 17a4cdb9..af4e9092 100644 --- a/demos/Lazarus_Linux_GTK2/PopupBrowser2/cef.inc +++ b/demos/Lazarus_Linux_GTK2/PopupBrowser2/cef.inc @@ -505,3 +505,11 @@ {$DEFINE MACOSX} {$ENDIF} {$ENDIF} + +{$IFDEF LINUX} + {$IFDEF FPC} + {$DEFINE LINUXFPC} + {$ELSE} + {$DEFINE LINUXFMX} + {$ENDIF} +{$ENDIF} diff --git a/demos/Lazarus_Linux_GTK2/SimpleBrowser/cef.inc b/demos/Lazarus_Linux_GTK2/SimpleBrowser/cef.inc index 17a4cdb9..af4e9092 100644 --- a/demos/Lazarus_Linux_GTK2/SimpleBrowser/cef.inc +++ b/demos/Lazarus_Linux_GTK2/SimpleBrowser/cef.inc @@ -505,3 +505,11 @@ {$DEFINE MACOSX} {$ENDIF} {$ENDIF} + +{$IFDEF LINUX} + {$IFDEF FPC} + {$DEFINE LINUXFPC} + {$ELSE} + {$DEFINE LINUXFMX} + {$ENDIF} +{$ENDIF} diff --git a/demos/Lazarus_Linux_GTK2/SimpleBrowser2/cef.inc b/demos/Lazarus_Linux_GTK2/SimpleBrowser2/cef.inc index 17a4cdb9..af4e9092 100644 --- a/demos/Lazarus_Linux_GTK2/SimpleBrowser2/cef.inc +++ b/demos/Lazarus_Linux_GTK2/SimpleBrowser2/cef.inc @@ -505,3 +505,11 @@ {$DEFINE MACOSX} {$ENDIF} {$ENDIF} + +{$IFDEF LINUX} + {$IFDEF FPC} + {$DEFINE LINUXFPC} + {$ELSE} + {$DEFINE LINUXFMX} + {$ENDIF} +{$ENDIF} diff --git a/demos/Lazarus_Linux_GTK2/SimpleOSRBrowser/cef.inc b/demos/Lazarus_Linux_GTK2/SimpleOSRBrowser/cef.inc index 17a4cdb9..af4e9092 100644 --- a/demos/Lazarus_Linux_GTK2/SimpleOSRBrowser/cef.inc +++ b/demos/Lazarus_Linux_GTK2/SimpleOSRBrowser/cef.inc @@ -505,3 +505,11 @@ {$DEFINE MACOSX} {$ENDIF} {$ENDIF} + +{$IFDEF LINUX} + {$IFDEF FPC} + {$DEFINE LINUXFPC} + {$ELSE} + {$DEFINE LINUXFMX} + {$ENDIF} +{$ENDIF} diff --git a/demos/Lazarus_Linux_GTK2/SubProcess/cef.inc b/demos/Lazarus_Linux_GTK2/SubProcess/cef.inc index 17a4cdb9..af4e9092 100644 --- a/demos/Lazarus_Linux_GTK2/SubProcess/cef.inc +++ b/demos/Lazarus_Linux_GTK2/SubProcess/cef.inc @@ -505,3 +505,11 @@ {$DEFINE MACOSX} {$ENDIF} {$ENDIF} + +{$IFDEF LINUX} + {$IFDEF FPC} + {$DEFINE LINUXFPC} + {$ELSE} + {$DEFINE LINUXFMX} + {$ENDIF} +{$ENDIF} diff --git a/demos/Lazarus_Linux_GTK2/TabbedBrowser2/cef.inc b/demos/Lazarus_Linux_GTK2/TabbedBrowser2/cef.inc index 17a4cdb9..af4e9092 100644 --- a/demos/Lazarus_Linux_GTK2/TabbedBrowser2/cef.inc +++ b/demos/Lazarus_Linux_GTK2/TabbedBrowser2/cef.inc @@ -505,3 +505,11 @@ {$DEFINE MACOSX} {$ENDIF} {$ENDIF} + +{$IFDEF LINUX} + {$IFDEF FPC} + {$DEFINE LINUXFPC} + {$ELSE} + {$DEFINE LINUXFMX} + {$ENDIF} +{$ENDIF} diff --git a/demos/Lazarus_Linux_GTK2/TinyBrowser/cef.inc b/demos/Lazarus_Linux_GTK2/TinyBrowser/cef.inc index 17a4cdb9..af4e9092 100644 --- a/demos/Lazarus_Linux_GTK2/TinyBrowser/cef.inc +++ b/demos/Lazarus_Linux_GTK2/TinyBrowser/cef.inc @@ -505,3 +505,11 @@ {$DEFINE MACOSX} {$ENDIF} {$ENDIF} + +{$IFDEF LINUX} + {$IFDEF FPC} + {$DEFINE LINUXFPC} + {$ELSE} + {$DEFINE LINUXFMX} + {$ENDIF} +{$ENDIF} diff --git a/demos/Lazarus_Linux_GTK2/TinyBrowser2/cef.inc b/demos/Lazarus_Linux_GTK2/TinyBrowser2/cef.inc index 17a4cdb9..af4e9092 100644 --- a/demos/Lazarus_Linux_GTK2/TinyBrowser2/cef.inc +++ b/demos/Lazarus_Linux_GTK2/TinyBrowser2/cef.inc @@ -505,3 +505,11 @@ {$DEFINE MACOSX} {$ENDIF} {$ENDIF} + +{$IFDEF LINUX} + {$IFDEF FPC} + {$DEFINE LINUXFPC} + {$ELSE} + {$DEFINE LINUXFMX} + {$ENDIF} +{$ENDIF} diff --git a/demos/Lazarus_Linux_GTK3/OSRExternalPumpBrowser/cef.inc b/demos/Lazarus_Linux_GTK3/OSRExternalPumpBrowser/cef.inc index 17a4cdb9..af4e9092 100644 --- a/demos/Lazarus_Linux_GTK3/OSRExternalPumpBrowser/cef.inc +++ b/demos/Lazarus_Linux_GTK3/OSRExternalPumpBrowser/cef.inc @@ -505,3 +505,11 @@ {$DEFINE MACOSX} {$ENDIF} {$ENDIF} + +{$IFDEF LINUX} + {$IFDEF FPC} + {$DEFINE LINUXFPC} + {$ELSE} + {$DEFINE LINUXFMX} + {$ENDIF} +{$ENDIF} diff --git a/demos/Lazarus_Linux_GTK3/TinyBrowser/cef.inc b/demos/Lazarus_Linux_GTK3/TinyBrowser/cef.inc index 17a4cdb9..af4e9092 100644 --- a/demos/Lazarus_Linux_GTK3/TinyBrowser/cef.inc +++ b/demos/Lazarus_Linux_GTK3/TinyBrowser/cef.inc @@ -505,3 +505,11 @@ {$DEFINE MACOSX} {$ENDIF} {$ENDIF} + +{$IFDEF LINUX} + {$IFDEF FPC} + {$DEFINE LINUXFPC} + {$ELSE} + {$DEFINE LINUXFMX} + {$ENDIF} +{$ENDIF} diff --git a/demos/Lazarus_Linux_GTK3/TinyBrowser2/cef.inc b/demos/Lazarus_Linux_GTK3/TinyBrowser2/cef.inc index 17a4cdb9..af4e9092 100644 --- a/demos/Lazarus_Linux_GTK3/TinyBrowser2/cef.inc +++ b/demos/Lazarus_Linux_GTK3/TinyBrowser2/cef.inc @@ -505,3 +505,11 @@ {$DEFINE MACOSX} {$ENDIF} {$ENDIF} + +{$IFDEF LINUX} + {$IFDEF FPC} + {$DEFINE LINUXFPC} + {$ELSE} + {$DEFINE LINUXFMX} + {$ENDIF} +{$ENDIF} diff --git a/packages/cef.inc b/packages/cef.inc index 17a4cdb9..af4e9092 100644 --- a/packages/cef.inc +++ b/packages/cef.inc @@ -505,3 +505,11 @@ {$DEFINE MACOSX} {$ENDIF} {$ENDIF} + +{$IFDEF LINUX} + {$IFDEF FPC} + {$DEFINE LINUXFPC} + {$ELSE} + {$DEFINE LINUXFMX} + {$ENDIF} +{$ENDIF} diff --git a/packages/cef4delphi_lazarus.lpk b/packages/cef4delphi_lazarus.lpk index 72de8fff..ab347a18 100644 --- a/packages/cef4delphi_lazarus.lpk +++ b/packages/cef4delphi_lazarus.lpk @@ -21,7 +21,7 @@ - + diff --git a/source/cef.inc b/source/cef.inc index 17a4cdb9..af4e9092 100644 --- a/source/cef.inc +++ b/source/cef.inc @@ -505,3 +505,11 @@ {$DEFINE MACOSX} {$ENDIF} {$ENDIF} + +{$IFDEF LINUX} + {$IFDEF FPC} + {$DEFINE LINUXFPC} + {$ELSE} + {$DEFINE LINUXFMX} + {$ENDIF} +{$ENDIF} diff --git a/source/uCEFApplicationCore.pas b/source/uCEFApplicationCore.pas index f3d4ab75..b6794b46 100644 --- a/source/uCEFApplicationCore.pas +++ b/source/uCEFApplicationCore.pas @@ -67,15 +67,15 @@ uses uCEFSchemeRegistrar, uCEFPreferenceRegistrar; const - CEF_SUPPORTED_VERSION_MAJOR = 108; - CEF_SUPPORTED_VERSION_MINOR = 4; - CEF_SUPPORTED_VERSION_RELEASE = 13; + CEF_SUPPORTED_VERSION_MAJOR = 109; + CEF_SUPPORTED_VERSION_MINOR = 1; + CEF_SUPPORTED_VERSION_RELEASE = 8; CEF_SUPPORTED_VERSION_BUILD = 0; CEF_CHROMEELF_VERSION_MAJOR = CEF_SUPPORTED_VERSION_MAJOR; CEF_CHROMEELF_VERSION_MINOR = 0; - CEF_CHROMEELF_VERSION_RELEASE = 5359; - CEF_CHROMEELF_VERSION_BUILD = 125; + CEF_CHROMEELF_VERSION_RELEASE = 5414; + CEF_CHROMEELF_VERSION_BUILD = 87; {$IFDEF MSWINDOWS} LIBCEF_DLL = 'libcef.dll'; diff --git a/source/uCEFChromiumCore.pas b/source/uCEFChromiumCore.pas index eb6816b7..2e9dec98 100644 --- a/source/uCEFChromiumCore.pas +++ b/source/uCEFChromiumCore.pas @@ -221,7 +221,6 @@ type FOnBeforeBrowse : TOnBeforeBrowse; FOnOpenUrlFromTab : TOnOpenUrlFromTab; FOnGetAuthCredentials : TOnGetAuthCredentials; - FOnQuotaRequest : TOnQuotaRequest; FOnCertificateError : TOnCertificateError; FOnSelectClientCertificate : TOnSelectClientCertificate; FOnRenderViewReady : TOnRenderViewReady; @@ -571,7 +570,6 @@ type function doOnOpenUrlFromTab(const browser: ICefBrowser; const frame: ICefFrame; const targetUrl: ustring; targetDisposition: TCefWindowOpenDisposition; userGesture: Boolean): Boolean; virtual; procedure doGetResourceRequestHandler_ReqHdlr(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; is_navigation, is_download: boolean; const request_initiator: ustring; var disable_default_handling: boolean; var aResourceRequestHandler : ICefResourceRequestHandler); virtual; function doOnGetAuthCredentials(const browser: ICefBrowser; const originUrl: ustring; isProxy: Boolean; const host: ustring; port: Integer; const realm, scheme: ustring; const callback: ICefAuthCallback): Boolean; virtual; - function doOnQuotaRequest(const browser: ICefBrowser; const originUrl: ustring; newSize: Int64; const callback: ICefCallback): Boolean; virtual; function doOnCertificateError(const browser: ICefBrowser; certError: TCefErrorcode; const requestUrl: ustring; const sslInfo: ICefSslInfo; const callback: ICefCallback): Boolean; virtual; function doOnSelectClientCertificate(const browser: ICefBrowser; isProxy: boolean; const host: ustring; port: integer; certificatesCount: NativeUInt; const certificates: TCefX509CertificateArray; const callback: ICefSelectClientCertificateCallback): boolean; virtual; procedure doOnRenderViewReady(const browser: ICefBrowser); virtual; @@ -1072,7 +1070,6 @@ type property OnBeforeBrowse : TOnBeforeBrowse read FOnBeforeBrowse write FOnBeforeBrowse; property OnOpenUrlFromTab : TOnOpenUrlFromTab read FOnOpenUrlFromTab write FOnOpenUrlFromTab; property OnGetAuthCredentials : TOnGetAuthCredentials read FOnGetAuthCredentials write FOnGetAuthCredentials; - property OnQuotaRequest : TOnQuotaRequest read FOnQuotaRequest write FOnQuotaRequest; property OnCertificateError : TOnCertificateError read FOnCertificateError write FOnCertificateError; property OnSelectClientCertificate : TOnSelectClientCertificate read FOnSelectClientCertificate write FOnSelectClientCertificate; property OnRenderViewReady : TOnRenderViewReady read FOnRenderViewReady write FOnRenderViewReady; @@ -1811,7 +1808,6 @@ begin FOnBeforeBrowse := nil; FOnOpenUrlFromTab := nil; FOnGetAuthCredentials := nil; - FOnQuotaRequest := nil; FOnCertificateError := nil; FOnSelectClientCertificate := nil; FOnRenderViewReady := nil; @@ -6282,17 +6278,6 @@ begin FOnProtocolExecution(Self, browser, frame, request, allowOsExecution); end; -function TChromiumCore.doOnQuotaRequest(const browser : ICefBrowser; - const originUrl : ustring; - newSize : Int64; - const callback : ICefCallback): Boolean; -begin - Result := False; - - if assigned(FOnQuotaRequest) then - FOnQuotaRequest(Self, browser, originUrl, newSize, callback, Result); -end; - procedure TChromiumCore.doOnRenderProcessTerminated(const browser: ICefBrowser; status: TCefTerminationStatus); begin if assigned(FOnRenderProcessTerminated) then diff --git a/source/uCEFChromiumEvents.pas b/source/uCEFChromiumEvents.pas index 9c295c4b..7ce40e00 100644 --- a/source/uCEFChromiumEvents.pas +++ b/source/uCEFChromiumEvents.pas @@ -118,7 +118,6 @@ type TOnBeforeBrowse = procedure(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; user_gesture, isRedirect: Boolean; out Result: Boolean) of object; TOnOpenUrlFromTab = procedure(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; const targetUrl: ustring; targetDisposition: TCefWindowOpenDisposition; userGesture: Boolean; out Result: Boolean) of object; TOnGetAuthCredentials = procedure(Sender: TObject; const browser: ICefBrowser; const originUrl: ustring; isProxy: Boolean; const host: ustring; port: Integer; const realm, scheme: ustring; const callback: ICefAuthCallback; out Result: Boolean) of object; - TOnQuotaRequest = procedure(Sender: TObject; const browser: ICefBrowser; const originUrl: ustring; newSize: Int64; const callback: ICefCallback; out Result: Boolean) of object; TOnCertificateError = procedure(Sender: TObject; const browser: ICefBrowser; certError: TCefErrorcode; const requestUrl: ustring; const sslInfo: ICefSslInfo; const callback: ICefCallback; out Result: Boolean) of object; TOnSelectClientCertificate = procedure(Sender: TObject; const browser: ICefBrowser; isProxy: boolean; const host: ustring; port: integer; certificatesCount: NativeUInt; const certificates: TCefX509CertificateArray; const callback: ICefSelectClientCertificateCallback; var aResult : boolean) of object; TOnRenderViewReady = procedure(Sender: Tobject; const browser: ICefBrowser) of object; diff --git a/source/uCEFInterfaces.pas b/source/uCEFInterfaces.pas index 861bef3c..03ec890a 100644 --- a/source/uCEFInterfaces.pas +++ b/source/uCEFInterfaces.pas @@ -350,7 +350,6 @@ type function doOnOpenUrlFromTab(const browser: ICefBrowser; const frame: ICefFrame; const targetUrl: ustring; targetDisposition: TCefWindowOpenDisposition; userGesture: Boolean): Boolean; procedure doGetResourceRequestHandler_ReqHdlr(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; is_navigation, is_download: boolean; const request_initiator: ustring; var disable_default_handling: boolean; var aResourceRequestHandler : ICefResourceRequestHandler); function doOnGetAuthCredentials(const browser: ICefBrowser; const originUrl: ustring; isProxy: Boolean; const host: ustring; port: Integer; const realm, scheme: ustring; const callback: ICefAuthCallback): Boolean; - function doOnQuotaRequest(const browser: ICefBrowser; const originUrl: ustring; newSize: Int64; const callback: ICefCallback): Boolean; function doOnCertificateError(const browser: ICefBrowser; certError: TCefErrorcode; const requestUrl: ustring; const sslInfo: ICefSslInfo; const callback: ICefCallback): Boolean; function doOnSelectClientCertificate(const browser: ICefBrowser; isProxy: boolean; const host: ustring; port: integer; certificatesCount: NativeUInt; const certificates: TCefX509CertificateArray; const callback: ICefSelectClientCertificateCallback): boolean; procedure doOnRenderViewReady(const browser: ICefBrowser); @@ -1916,7 +1915,6 @@ type function OnOpenUrlFromTab(const browser: ICefBrowser; const frame: ICefFrame; const targetUrl: ustring; targetDisposition: TCefWindowOpenDisposition; userGesture: Boolean): Boolean; procedure GetResourceRequestHandler(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; is_navigation, is_download: boolean; const request_initiator: ustring; var disable_default_handling: boolean; var aResourceRequestHandler : ICefResourceRequestHandler); function GetAuthCredentials(const browser: ICefBrowser; const originUrl: ustring; isProxy: Boolean; const host: ustring; port: Integer; const realm, scheme: ustring; const callback: ICefAuthCallback): Boolean; - function OnQuotaRequest(const browser: ICefBrowser; const originUrl: ustring; newSize: Int64; const callback: ICefCallback): Boolean; function OnCertificateError(const browser: ICefBrowser; certError: TCefErrorcode; const requestUrl: ustring; const sslInfo: ICefSslInfo; const callback: ICefCallback): Boolean; function OnSelectClientCertificate(const browser: ICefBrowser; isProxy: boolean; const host: ustring; port: integer; certificatesCount: NativeUInt; const certificates: TCefX509CertificateArray; const callback: ICefSelectClientCertificateCallback): boolean; procedure OnRenderViewReady(const browser: ICefBrowser); diff --git a/source/uCEFRequestHandler.pas b/source/uCEFRequestHandler.pas index a5a67389..cdb58e95 100644 --- a/source/uCEFRequestHandler.pas +++ b/source/uCEFRequestHandler.pas @@ -58,7 +58,6 @@ type function OnOpenUrlFromTab(const browser: ICefBrowser; const frame: ICefFrame; const targetUrl: ustring; targetDisposition: TCefWindowOpenDisposition; userGesture: Boolean): Boolean; virtual; procedure GetResourceRequestHandler(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; is_navigation, is_download: boolean; const request_initiator: ustring; var disable_default_handling: boolean; var aResourceRequestHandler : ICefResourceRequestHandler); virtual; function GetAuthCredentials(const browser: ICefBrowser; const originUrl: ustring; isProxy: Boolean; const host: ustring; port: Integer; const realm, scheme: ustring; const callback: ICefAuthCallback): Boolean; virtual; - function OnQuotaRequest(const browser: ICefBrowser; const originUrl: ustring; newSize: Int64; const callback: ICefCallback): Boolean; virtual; function OnCertificateError(const browser: ICefBrowser; certError: TCefErrorcode; const requestUrl: ustring; const sslInfo: ICefSslInfo; const callback: ICefCallback): Boolean; virtual; function OnSelectClientCertificate(const browser: ICefBrowser; isProxy: boolean; const host: ustring; port: integer; certificatesCount: NativeUInt; const certificates: TCefX509CertificateArray; const callback: ICefSelectClientCertificateCallback): boolean; virtual; procedure OnRenderViewReady(const browser: ICefBrowser); virtual; @@ -79,7 +78,6 @@ type function OnOpenUrlFromTab(const browser: ICefBrowser; const frame: ICefFrame; const targetUrl: ustring; targetDisposition: TCefWindowOpenDisposition; userGesture: Boolean): Boolean; override; procedure GetResourceRequestHandler(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; is_navigation, is_download: boolean; const request_initiator: ustring; var disable_default_handling: boolean; var aResourceRequestHandler : ICefResourceRequestHandler); override; function GetAuthCredentials(const browser: ICefBrowser; const originUrl: ustring; isProxy: Boolean; const host: ustring; port: Integer; const realm, scheme: ustring; const callback: ICefAuthCallback): Boolean; override; - function OnQuotaRequest(const browser: ICefBrowser; const originUrl: ustring; newSize: Int64; const callback: ICefCallback): Boolean; override; function OnCertificateError(const browser: ICefBrowser; certError: TCefErrorcode; const requestUrl: ustring; const sslInfo: ICefSslInfo; const callback: ICefCallback): Boolean; override; function OnSelectClientCertificate(const browser: ICefBrowser; isProxy: boolean; const host: ustring; port: integer; certificatesCount: NativeUInt; const certificates: TCefX509CertificateArray; const callback: ICefSelectClientCertificateCallback): boolean; override; procedure OnRenderViewReady(const browser: ICefBrowser); override; @@ -206,24 +204,6 @@ begin TCefAuthCallbackRef.UnWrap(callback))); end; -function cef_request_handler_on_quota_request( self : PCefRequestHandler; - browser : PCefBrowser; - const origin_url : PCefString; - new_size : Int64; - callback : PCefCallback): Integer; stdcall; -var - TempObject : TObject; -begin - Result := Ord(False); - TempObject := CefGetObject(self); - - if (TempObject <> nil) and (TempObject is TCefRequestHandlerOwn) then - Result := Ord(TCefRequestHandlerOwn(TempObject).OnQuotaRequest(TCefBrowserRef.UnWrap(browser), - CefString(origin_url), - new_size, - TCefCallbackRef.UnWrap(callback))); -end; - function cef_request_handler_on_certificate_error( self : PCefRequestHandler; browser : PCefBrowser; cert_error : TCefErrorcode; @@ -349,7 +329,6 @@ begin on_open_urlfrom_tab := {$IFDEF FPC}@{$ENDIF}cef_request_handler_on_open_urlfrom_tab; get_resource_request_handler := {$IFDEF FPC}@{$ENDIF}cef_request_handler_get_resource_request_handler; get_auth_credentials := {$IFDEF FPC}@{$ENDIF}cef_request_handler_get_auth_credentials; - on_quota_request := {$IFDEF FPC}@{$ENDIF}cef_request_handler_on_quota_request; on_certificate_error := {$IFDEF FPC}@{$ENDIF}cef_request_handler_on_certificate_error; on_select_client_certificate := {$IFDEF FPC}@{$ENDIF}cef_request_handler_on_select_client_certificate; on_render_view_ready := {$IFDEF FPC}@{$ENDIF}cef_request_handler_on_render_view_ready; @@ -420,14 +399,6 @@ begin aResourceRequestHandler := nil; end; -function TCefRequestHandlerOwn.OnQuotaRequest(const browser : ICefBrowser; - const originUrl : ustring; - newSize : Int64; - const callback : ICefCallback): Boolean; -begin - Result := False; -end; - procedure TCefRequestHandlerOwn.OnRenderProcessTerminated(const browser : ICefBrowser; status : TCefTerminationStatus); begin @@ -564,17 +535,6 @@ begin Result := inherited OnSelectClientCertificate(browser, isProxy, host, port, certificatesCount, certificates, callback); end; -function TCustomRequestHandler.OnQuotaRequest(const browser : ICefBrowser; - const originUrl : ustring; - newSize : Int64; - const callback : ICefCallback): Boolean; -begin - if (FEvents <> nil) then - Result := IChromiumEvents(FEvents).doOnQuotaRequest(browser, originUrl, newSize, callback) - else - Result := inherited OnQuotaRequest(browser, originUrl, newSize, callback); -end; - procedure TCustomRequestHandler.OnRenderProcessTerminated(const browser: ICefBrowser; status: TCefTerminationStatus); begin if (FEvents <> nil) then diff --git a/source/uCEFTypes.pas b/source/uCEFTypes.pas index 807e589e..69e4d895 100644 --- a/source/uCEFTypes.pas +++ b/source/uCEFTypes.pas @@ -2029,7 +2029,6 @@ type on_open_urlfrom_tab : function(self: PCefRequestHandler; browser: PCefBrowser; frame: PCefFrame; const target_url: PCefString; target_disposition: TCefWindowOpenDisposition; user_gesture: Integer): Integer; stdcall; get_resource_request_handler : function(self: PCefRequestHandler; browser: PCefBrowser; frame: PCefFrame; request: PCefRequest; is_navigation, is_download: Integer; const request_initiator: PCefString; disable_default_handling: PInteger): PCefResourceRequestHandler; stdcall; get_auth_credentials : function(self: PCefRequestHandler; browser: PCefBrowser; const origin_url: PCefString; isProxy: Integer; const host: PCefString; port: Integer; const realm, scheme: PCefString; callback: PCefAuthCallback): Integer; stdcall; - on_quota_request : function(self: PCefRequestHandler; browser: PCefBrowser; const origin_url: PCefString; new_size: Int64; callback: PCefCallback): Integer; stdcall; on_certificate_error : function(self: PCefRequestHandler; browser: PCefBrowser; cert_error: TCefErrorcode; const request_url: PCefString; ssl_info: PCefSslInfo; callback: PCefCallback): Integer; stdcall; on_select_client_certificate : function(self: PCefRequestHandler; browser: PCefBrowser; isProxy: integer; const host: PCefString; port: integer; certificatesCount: NativeUInt; const certificates: PPCefX509Certificate; callback: PCefSelectClientCertificateCallback): integer; stdcall; on_render_view_ready : procedure(self: PCefRequestHandler; browser: PCefBrowser); stdcall; diff --git a/update_CEF4Delphi.json b/update_CEF4Delphi.json index 18ae961e..78957834 100644 --- a/update_CEF4Delphi.json +++ b/update_CEF4Delphi.json @@ -2,9 +2,9 @@ "UpdateLazPackages" : [ { "ForceNotify" : true, - "InternalVersion" : 453, + "InternalVersion" : 454, "Name" : "cef4delphi_lazarus.lpk", - "Version" : "108.4.13" + "Version" : "109.1.8" } ], "UpdatePackageData" : {