pascal/CEF4Delphi
1
0
Fork 0
mirror of https://github.com/salvadordf/CEF4Delphi.git synced 2025-02-02 10:25:26 +02:00
Code Issues Actions Releases Activity

Update to CEF 3.3282.1732.g973997f

Browse Source
This commit is contained in:
Salvador Díaz Fau 2018-02-08 12:45:25 +01:00
parent ace189d104
commit 579b3a9457
9 changed files with 126 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
packages/CEF4Delphi_FMX.res
View File

Binary file not shown.

2
source/uCEFApplication.pas
View File

@ -57,7 +57,7 @@ uses
const
CEF_SUPPORTED_VERSION_MAJOR = 3;
CEF_SUPPORTED_VERSION_MINOR = 3282;
CEF_SUPPORTED_VERSION_RELEASE = 1731;
CEF_SUPPORTED_VERSION_RELEASE = 1732;
CEF_SUPPORTED_VERSION_BUILD = 0;
CEF_CHROMEELF_VERSION_MAJOR = 64;

27
source/uCEFChromium.pas
View File

@ -167,6 +167,8 @@ type
FOnGetResourceResponseFilter : TOnGetResourceResponseFilter;
FOnResourceLoadComplete : TOnResourceLoadComplete;
FOnGetAuthCredentials : TOnGetAuthCredentials;
FOnCanGetCookies : TOnCanGetCookies;
FOnCanSetCookie : TOnCanSetCookie;
FOnQuotaRequest : TOnQuotaRequest;
FOnProtocolExecution : TOnProtocolExecution;
FOnCertificateError : TOnCertificateError;
@ -374,6 +376,8 @@ type
function doOnGetResourceResponseFilter(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const response: ICefResponse): ICefResponseFilter; virtual;
procedure doOnResourceLoadComplete(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const response: ICefResponse; status: TCefUrlRequestStatus; receivedContentLength: Int64); virtual;
function doOnGetAuthCredentials(const browser: ICefBrowser; const frame: ICefFrame; isProxy: Boolean; const host: ustring; port: Integer; const realm, scheme: ustring; const callback: ICefAuthCallback): Boolean; virtual;
function doCanGetCookies(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest): boolean; virtual;
function doCanSetCookie(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const cookie : PCefCookie): boolean; virtual;
function doOnQuotaRequest(const browser: ICefBrowser; const originUrl: ustring; newSize: Int64; const callback: ICefRequestCallback): Boolean; virtual;
procedure doOnProtocolExecution(const browser: ICefBrowser; const url: ustring; out allowOsExecution: Boolean); virtual;
function doOnCertificateError(const browser: ICefBrowser; certError: TCefErrorcode; const requestUrl: ustring; const sslInfo: ICefSslInfo; const callback: ICefRequestCallback): Boolean; virtual;
@ -637,6 +641,8 @@ type
property OnGetResourceResponseFilter : TOnGetResourceResponseFilter read FOnGetResourceResponseFilter write FOnGetResourceResponseFilter;
property OnResourceLoadComplete : TOnResourceLoadComplete read FOnResourceLoadComplete write FOnResourceLoadComplete;
property OnGetAuthCredentials : TOnGetAuthCredentials read FOnGetAuthCredentials write FOnGetAuthCredentials;
property OnCanGetCookies : TOnCanGetCookies read FOnCanGetCookies write FOnCanGetCookies;
property OnCanSetCookie : TOnCanSetCookie read FOnCanSetCookie write FOnCanSetCookie;
property OnQuotaRequest : TOnQuotaRequest read FOnQuotaRequest write FOnQuotaRequest;
property OnProtocolExecution : TOnProtocolExecution read FOnProtocolExecution write FOnProtocolExecution;
property OnCertificateError : TOnCertificateError read FOnCertificateError write FOnCertificateError;
@ -920,6 +926,8 @@ begin
FOnGetResourceResponseFilter := nil;
FOnResourceLoadComplete := nil;
FOnGetAuthCredentials := nil;
FOnCanGetCookies := nil;
FOnCanSetCookie := nil;
FOnQuotaRequest := nil;
FOnProtocolExecution := nil;
FOnCertificateError := nil;
@ -3022,6 +3030,25 @@ begin
FOnGetAuthCredentials(Self, browser, frame, isProxy, host, port, realm, scheme, callback, Result);
end;
function TChromium.doCanGetCookies(const browser : ICefBrowser;
const frame : ICefFrame;
const request : ICefRequest): boolean;
begin
Result := True;
if assigned(FOnCanGetCookies) then FOnCanGetCookies(self, browser, frame, request, Result);
end;
function TChromium.doCanSetCookie(const browser : ICefBrowser;
const frame : ICefFrame;
const request : ICefRequest;
const cookie : PCefCookie): boolean;
begin
Result := True;
if assigned(FOnCanSetCookie) then FOnCanSetCookie(self, browser, frame, request, cookie, Result);
end;
function TChromium.doOnGetResourceHandler(const browser : ICefBrowser;
const frame : ICefFrame;
const request : ICefRequest): ICefResourceHandler;

2
source/uCEFChromiumEvents.pas
View File

@ -119,6 +119,8 @@ type
TOnGetResourceResponseFilter = procedure(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const response: ICefResponse; out Result: ICefResponseFilter) of object;
TOnResourceLoadComplete = procedure(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const response: ICefResponse; status: TCefUrlRequestStatus; receivedContentLength: Int64) of object;
TOnGetAuthCredentials = procedure(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; isProxy: Boolean; const host: ustring; port: Integer; const realm, scheme: ustring; const callback: ICefAuthCallback; out Result: Boolean) of object;
TOnCanGetCookies = procedure(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; var aResult: boolean) of object;
TOnCanSetCookie = procedure(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const cookie : PCefCookie; var aResult : boolean) of object;
TOnQuotaRequest = procedure(Sender: TObject; const browser: ICefBrowser; const originUrl: ustring; newSize: Int64; const callback: ICefRequestCallback; out Result: Boolean) of object;
TOnProtocolExecution = procedure(Sender: TObject; const browser: ICefBrowser; const url: ustring; out allowOsExecution: Boolean) of object;
TOnCertificateError = procedure(Sender: TObject; const browser: ICefBrowser; certError: TCefErrorcode; const requestUrl: ustring; const sslInfo: ICefSslInfo; const callback: ICefRequestCallback; out Result: Boolean) of Object;

4
source/uCEFInterfaces.pas
View File

@ -1281,6 +1281,8 @@ type
function GetResourceResponseFilter(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const response: ICefResponse): ICefResponseFilter;
procedure OnResourceLoadComplete(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const response: ICefResponse; status: TCefUrlRequestStatus; receivedContentLength: Int64);
function GetAuthCredentials(const browser: ICefBrowser; const frame: ICefFrame; isProxy: Boolean; const host: ustring; port: Integer; const realm, scheme: ustring; const callback: ICefAuthCallback): Boolean;
function CanGetCookies(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest): boolean;
function CanSetCookie(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const cookie : PCefCookie): boolean;
function OnQuotaRequest(const browser: ICefBrowser; const originUrl: ustring; newSize: Int64; const callback: ICefRequestCallback): Boolean;
procedure OnProtocolExecution(const browser: ICefBrowser; const url: ustring; out allowOsExecution: Boolean);
function OnCertificateError(const browser: ICefBrowser; certError: TCefErrorcode; const requestUrl: ustring; const sslInfo: ICefSslInfo; const callback: ICefRequestCallback): Boolean;
@ -1801,6 +1803,8 @@ type
function doOnGetResourceResponseFilter(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const response: ICefResponse): ICefResponseFilter;
procedure doOnResourceLoadComplete(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const response: ICefResponse; status: TCefUrlRequestStatus; receivedContentLength: Int64);
function doOnGetAuthCredentials(const browser: ICefBrowser; const frame: ICefFrame; isProxy: Boolean; const host: ustring; port: Integer; const realm, scheme: ustring; const callback: ICefAuthCallback): Boolean;
function doCanGetCookies(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest): boolean;
function doCanSetCookie(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const cookie : PCefCookie): boolean;
function doOnQuotaRequest(const browser: ICefBrowser; const originUrl: ustring; newSize: Int64; const callback: ICefRequestCallback): Boolean;
procedure doOnProtocolExecution(const browser: ICefBrowser; const url: ustring; out allowOsExecution: Boolean);
function doOnCertificateError(const browser: ICefBrowser; certError: TCefErrorcode; const requestUrl: ustring; const sslInfo: ICefSslInfo; const callback: ICefRequestCallback): Boolean;

61
source/uCEFRequestHandler.pas
View File

@ -61,6 +61,8 @@ type
function GetResourceResponseFilter(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const response: ICefResponse): ICefResponseFilter; virtual;
procedure OnResourceLoadComplete(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const response: ICefResponse; status: TCefUrlRequestStatus; receivedContentLength: Int64); virtual;
function GetAuthCredentials(const browser: ICefBrowser; const frame: ICefFrame; isProxy: Boolean; const host: ustring; port: Integer; const realm, scheme: ustring; const callback: ICefAuthCallback): Boolean; virtual;
function CanGetCookies(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest): boolean; virtual;
function CanSetCookie(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const cookie : PCefCookie): boolean; virtual;
function OnQuotaRequest(const browser: ICefBrowser; const originUrl: ustring; newSize: Int64; const callback: ICefRequestCallback): Boolean; virtual;
function GetCookieManager(const browser: ICefBrowser; const mainUrl: ustring): ICefCookieManager; virtual;
procedure OnProtocolExecution(const browser: ICefBrowser; const url: ustring; out allowOsExecution: Boolean); virtual;
@ -89,6 +91,8 @@ type
function GetResourceResponseFilter(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const response: ICefResponse): ICefResponseFilter; override;
procedure OnResourceLoadComplete(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const response: ICefResponse; status: TCefUrlRequestStatus; receivedContentLength: Int64); override;
function GetAuthCredentials(const browser: ICefBrowser; const frame: ICefFrame; isProxy: Boolean; const host: ustring; port: Integer; const realm, scheme: ustring; const callback: ICefAuthCallback): Boolean; override;
function CanGetCookies(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest): boolean; override;
function CanSetCookie(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const cookie : PCefCookie): boolean; override;
function OnQuotaRequest(const browser: ICefBrowser; const originUrl: ustring; newSize: Int64; const callback: ICefRequestCallback): Boolean; override;
procedure OnProtocolExecution(const browser: ICefBrowser; const url: ustring; out allowOsExecution: Boolean); override;
function OnCertificateError(const browser: ICefBrowser; certError: TCefErrorcode; const requestUrl: ustring; const sslInfo: ICefSslInfo; const callback: ICefRequestCallback): Boolean; override;
@ -204,6 +208,25 @@ begin
CefString(host), port, CefString(realm), CefString(scheme), TCefAuthCallbackRef.UnWrap(callback)));
end;
function cef_request_handler_can_get_cookies(self: PCefRequestHandler;
browser: PCefBrowser;
frame: PCefFrame;
request: PCefRequest): Integer; stdcall;
begin
with TCefRequestHandlerOwn(CefGetObject(self)) do
Result := Ord(CanGetCookies(TCefBrowserRef.UnWrap(browser), TCefFrameRef.UnWrap(frame), TCefRequestRef.UnWrap(request)));
end;
function cef_request_handler_can_set_cookie(self: PCefRequestHandler;
browser: PCefBrowser;
frame: PCefFrame;
request: PCefRequest;
const cookie: PCefCookie): Integer; stdcall;
begin
with TCefRequestHandlerOwn(CefGetObject(self)) do
Result := Ord(CanSetCookie(TCefBrowserRef.UnWrap(browser), TCefFrameRef.UnWrap(frame), TCefRequestRef.UnWrap(request), cookie));
end;
function cef_request_handler_on_quota_request(self: PCefRequestHandler; browser: PCefBrowser;
const origin_url: PCefString; new_size: Int64; callback: PCefRequestCallback): Integer; stdcall;
begin
@ -328,6 +351,8 @@ begin
get_resource_response_filter := cef_request_handler_get_resource_response_filter;
on_resource_load_complete := cef_request_handler_on_resource_load_complete;
get_auth_credentials := cef_request_handler_get_auth_credentials;
can_get_cookies := cef_request_handler_can_get_cookies;
can_set_cookie := cef_request_handler_can_set_cookie;
on_quota_request := cef_request_handler_on_quota_request;
on_protocol_execution := cef_request_handler_on_protocol_execution;
on_certificate_error := cef_request_handler_on_certificate_error;
@ -345,6 +370,21 @@ begin
Result := False;
end;
function TCefRequestHandlerOwn.CanGetCookies(const browser : ICefBrowser;
const frame : ICefFrame;
const request : ICefRequest): boolean;
begin
Result := True;
end;
function TCefRequestHandlerOwn.CanSetCookie(const browser : ICefBrowser;
const frame : ICefFrame;
const request : ICefRequest;
const cookie : PCefCookie): boolean;
begin
Result := True;
end;
function TCefRequestHandlerOwn.GetCookieManager(const browser: ICefBrowser;
const mainUrl: ustring): ICefCookieManager;
begin
@ -495,6 +535,27 @@ begin
Result := inherited GetAuthCredentials(browser, frame, isProxy, host, port, realm, scheme, callback);
end;
function TCustomRequestHandler.CanGetCookies(const browser : ICefBrowser;
const frame : ICefFrame;
const request : ICefRequest): boolean;
begin
if (FEvents <> nil) then
Result := IChromiumEvents(FEvents).doCanGetCookies(browser, frame, request)
else
Result := inherited CanGetCookies(browser, frame, request);
end;
function TCustomRequestHandler.CanSetCookie(const browser : ICefBrowser;
const frame : ICefFrame;
const request : ICefRequest;
const cookie : PCefCookie): boolean;
begin
if (FEvents <> nil) then
Result := IChromiumEvents(FEvents).doCanSetCookie(browser, frame, request, cookie)
else
Result := inherited CanSetCookie(browser, frame, request, cookie);
end;
function TCustomRequestHandler.GetResourceHandler(const browser : ICefBrowser;
const frame : ICefFrame;
const request : ICefRequest): ICefResourceHandler;

4
source/uCEFResourceHandler.pas
View File

@ -116,12 +116,12 @@ end;
function TCefResourceHandlerOwn.CanGetCookie(const cookie: PCefCookie): Boolean;
begin
Result := False;
Result := True;
end;
function TCefResourceHandlerOwn.CanSetCookie(const cookie: PCefCookie): Boolean;
begin
Result := False;
Result := True;
end;
constructor TCefResourceHandlerOwn.Create(const browser : ICefBrowser;

2
source/uCEFTypes.pas
View File

@ -1563,6 +1563,8 @@ type
get_resource_response_filter: function(self: PCefRequestHandler; browser: PCefBrowser; frame: PCefFrame; request: PCefRequest; response: PCefResponse): PCefResponseFilter; stdcall;
on_resource_load_complete: procedure(self: PCefRequestHandler; browser: PCefBrowser; frame: PCefFrame; request: PCefRequest; response: PCefResponse; status: TCefUrlRequestStatus; received_content_length: Int64); stdcall;
get_auth_credentials: function(self: PCefRequestHandler; browser: PCefBrowser; frame: PCefFrame; isProxy: Integer; const host: PCefString; port: Integer; const realm, scheme: PCefString; callback: PCefAuthCallback): Integer; stdcall;
can_get_cookies: function(self: PCefRequestHandler; browser: PCefBrowser; frame: PCefFrame; request: PCefRequest): Integer; stdcall;
can_set_cookie: function(self: PCefRequestHandler; browser: PCefBrowser; frame: PCefFrame; request: PCefRequest; const cookie: PCefCookie): Integer; stdcall;
on_quota_request: function(self: PCefRequestHandler; browser: PCefBrowser; const origin_url: PCefString; new_size: Int64; callback: PCefRequestCallback): Integer; stdcall;
on_protocol_execution: procedure(self: PCefRequestHandler; browser: PCefBrowser; const url: PCefString; allow_os_execution: PInteger); stdcall;
on_certificate_error: function(self: PCefRequestHandler; browser: PCefBrowser; cert_error: TCefErrorcode; const request_url: PCefString; ssl_info: PCefSslInfo; callback: PCefRequestCallback): Integer; stdcall;

27
source/uFMXChromium.pas
View File

@ -160,6 +160,8 @@ type
FOnGetResourceResponseFilter : TOnGetResourceResponseFilter;
FOnResourceLoadComplete : TOnResourceLoadComplete;
FOnGetAuthCredentials : TOnGetAuthCredentials;
FOnCanGetCookies : TOnCanGetCookies;
FOnCanSetCookie : TOnCanSetCookie;
FOnQuotaRequest : TOnQuotaRequest;
FOnProtocolExecution : TOnProtocolExecution;
FOnCertificateError : TOnCertificateError;
@ -354,6 +356,8 @@ type
function doOnGetResourceResponseFilter(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const response: ICefResponse): ICefResponseFilter; virtual;
procedure doOnResourceLoadComplete(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const response: ICefResponse; status: TCefUrlRequestStatus; receivedContentLength: Int64); virtual;
function doOnGetAuthCredentials(const browser: ICefBrowser; const frame: ICefFrame; isProxy: Boolean; const host: ustring; port: Integer; const realm, scheme: ustring; const callback: ICefAuthCallback): Boolean; virtual;
function doCanGetCookies(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest): boolean; virtual;
function doCanSetCookie(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const cookie : PCefCookie): boolean; virtual;
function doOnQuotaRequest(const browser: ICefBrowser; const originUrl: ustring; newSize: Int64; const callback: ICefRequestCallback): Boolean; virtual;
procedure doOnProtocolExecution(const browser: ICefBrowser; const url: ustring; out allowOsExecution: Boolean); virtual;
function doOnCertificateError(const browser: ICefBrowser; certError: TCefErrorcode; const requestUrl: ustring; const sslInfo: ICefSslInfo; const callback: ICefRequestCallback): Boolean; virtual;
@ -606,6 +610,8 @@ type
property OnGetResourceResponseFilter : TOnGetResourceResponseFilter read FOnGetResourceResponseFilter write FOnGetResourceResponseFilter;
property OnResourceLoadComplete : TOnResourceLoadComplete read FOnResourceLoadComplete write FOnResourceLoadComplete;
property OnGetAuthCredentials : TOnGetAuthCredentials read FOnGetAuthCredentials write FOnGetAuthCredentials;
property OnCanGetCookies : TOnCanGetCookies read FOnCanGetCookies write FOnCanGetCookies;
property OnCanSetCookie : TOnCanSetCookie read FOnCanSetCookie write FOnCanSetCookie;
property OnQuotaRequest : TOnQuotaRequest read FOnQuotaRequest write FOnQuotaRequest;
property OnProtocolExecution : TOnProtocolExecution read FOnProtocolExecution write FOnProtocolExecution;
property OnCertificateError : TOnCertificateError read FOnCertificateError write FOnCertificateError;
@ -869,6 +875,8 @@ begin
FOnGetResourceResponseFilter := nil;
FOnResourceLoadComplete := nil;
FOnGetAuthCredentials := nil;
FOnCanGetCookies := nil;
FOnCanSetCookie := nil;
FOnQuotaRequest := nil;
FOnProtocolExecution := nil;
FOnCertificateError := nil;
@ -2722,6 +2730,25 @@ begin
FOnGetAuthCredentials(Self, browser, frame, isProxy, host, port, realm, scheme, callback, Result);
end;
function TFMXChromium.doCanGetCookies(const browser : ICefBrowser;
const frame : ICefFrame;
const request : ICefRequest): boolean;
begin
Result := True;
if assigned(FOnCanGetCookies) then FOnCanGetCookies(self, browser, frame, request, Result);
end;
function TFMXChromium.doCanSetCookie(const browser : ICefBrowser;
const frame : ICefFrame;
const request : ICefRequest;
const cookie : PCefCookie): boolean;
begin
Result := True;
if assigned(FOnCanSetCookie) then FOnCanSetCookie(self, browser, frame, request, cookie, Result);
end;
function TFMXChromium.doOnGetResourceHandler(const browser : ICefBrowser;
const frame : ICefFrame;
const request : ICefRequest): ICefResourceHandler;