You've already forked CEF4Delphi
mirror of
https://github.com/salvadordf/CEF4Delphi.git
synced 2025-06-12 22:07:39 +02:00
Update to CEF 3.3359.1769.gd0bfc4d
This commit is contained in:
@ -57,7 +57,7 @@ uses
|
|||||||
const
|
const
|
||||||
CEF_SUPPORTED_VERSION_MAJOR = 3;
|
CEF_SUPPORTED_VERSION_MAJOR = 3;
|
||||||
CEF_SUPPORTED_VERSION_MINOR = 3359;
|
CEF_SUPPORTED_VERSION_MINOR = 3359;
|
||||||
CEF_SUPPORTED_VERSION_RELEASE = 1768;
|
CEF_SUPPORTED_VERSION_RELEASE = 1769;
|
||||||
CEF_SUPPORTED_VERSION_BUILD = 0;
|
CEF_SUPPORTED_VERSION_BUILD = 0;
|
||||||
|
|
||||||
CEF_CHROMEELF_VERSION_MAJOR = 66;
|
CEF_CHROMEELF_VERSION_MAJOR = 66;
|
||||||
|
@ -386,7 +386,7 @@ type
|
|||||||
function doOnClose(const browser: ICefBrowser): Boolean; virtual;
|
function doOnClose(const browser: ICefBrowser): Boolean; virtual;
|
||||||
|
|
||||||
// ICefRequestHandler
|
// ICefRequestHandler
|
||||||
function doOnBeforeBrowse(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; isRedirect: Boolean): Boolean; virtual;
|
function doOnBeforeBrowse(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; user_gesture, isRedirect: Boolean): Boolean; virtual;
|
||||||
function doOnOpenUrlFromTab(const browser: ICefBrowser; const frame: ICefFrame; const targetUrl: ustring; targetDisposition: TCefWindowOpenDisposition; userGesture: Boolean): Boolean; virtual;
|
function doOnOpenUrlFromTab(const browser: ICefBrowser; const frame: ICefFrame; const targetUrl: ustring; targetDisposition: TCefWindowOpenDisposition; userGesture: Boolean): Boolean; virtual;
|
||||||
function doOnBeforeResourceLoad(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const callback: ICefRequestCallback): TCefReturnValue; virtual;
|
function doOnBeforeResourceLoad(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const callback: ICefRequestCallback): TCefReturnValue; virtual;
|
||||||
function doOnGetResourceHandler(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest): ICefResourceHandler; virtual;
|
function doOnGetResourceHandler(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest): ICefResourceHandler; virtual;
|
||||||
@ -2976,13 +2976,14 @@ end;
|
|||||||
function TChromium.doOnBeforeBrowse(const browser : ICefBrowser;
|
function TChromium.doOnBeforeBrowse(const browser : ICefBrowser;
|
||||||
const frame : ICefFrame;
|
const frame : ICefFrame;
|
||||||
const request : ICefRequest;
|
const request : ICefRequest;
|
||||||
|
user_gesture : Boolean;
|
||||||
isRedirect : Boolean): Boolean;
|
isRedirect : Boolean): Boolean;
|
||||||
begin
|
begin
|
||||||
Result := False;
|
Result := False;
|
||||||
|
|
||||||
if FUpdatePreferences then doUpdatePreferences(browser);
|
if FUpdatePreferences then doUpdatePreferences(browser);
|
||||||
|
|
||||||
if Assigned(FOnBeforeBrowse) then FOnBeforeBrowse(Self, browser, frame, request, isRedirect, Result);
|
if Assigned(FOnBeforeBrowse) then FOnBeforeBrowse(Self, browser, frame, request, user_gesture, isRedirect, Result);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TChromium.doOnBeforeContextMenu(const browser : ICefBrowser;
|
procedure TChromium.doOnBeforeContextMenu(const browser : ICefBrowser;
|
||||||
|
@ -107,7 +107,7 @@ type
|
|||||||
TOnClose = procedure(Sender: TObject; const browser: ICefBrowser; out Result: Boolean) of object;
|
TOnClose = procedure(Sender: TObject; const browser: ICefBrowser; out Result: Boolean) of object;
|
||||||
|
|
||||||
// ICefRequestHandler
|
// ICefRequestHandler
|
||||||
TOnBeforeBrowse = procedure(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; isRedirect: Boolean; out Result: Boolean) of object;
|
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;
|
TOnOpenUrlFromTab = procedure(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; const targetUrl: ustring; targetDisposition: TCefWindowOpenDisposition; userGesture: Boolean; out Result: Boolean) of Object;
|
||||||
TOnBeforeResourceLoad = procedure(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const callback: ICefRequestCallback; out Result: TCefReturnValue) of object;
|
TOnBeforeResourceLoad = procedure(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const callback: ICefRequestCallback; out Result: TCefReturnValue) of object;
|
||||||
TOnGetResourceHandler = procedure(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; out Result: ICefResourceHandler) of object;
|
TOnGetResourceHandler = procedure(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; out Result: ICefResourceHandler) of object;
|
||||||
|
@ -282,7 +282,7 @@ type
|
|||||||
function doOnJsdialog(const browser: ICefBrowser; const originUrl: ustring; dialogType: TCefJsDialogType; const messageText, defaultPromptText: ustring; const callback: ICefJsDialogCallback; out suppressMessage: Boolean): Boolean;
|
function doOnJsdialog(const browser: ICefBrowser; const originUrl: ustring; dialogType: TCefJsDialogType; const messageText, defaultPromptText: ustring; const callback: ICefJsDialogCallback; out suppressMessage: Boolean): Boolean;
|
||||||
function doOnBeforeUnloadDialog(const browser: ICefBrowser; const messageText: ustring; isReload: Boolean; const callback: ICefJsDialogCallback): Boolean;
|
function doOnBeforeUnloadDialog(const browser: ICefBrowser; const messageText: ustring; isReload: Boolean; const callback: ICefJsDialogCallback): Boolean;
|
||||||
procedure doOnResetDialogState(const browser: ICefBrowser);
|
procedure doOnResetDialogState(const browser: ICefBrowser);
|
||||||
procedure doOnDialogClosed(const browser: ICefBrowser);
|
procedure doOnDialogClosed(const browser: ICefBrowser);
|
||||||
|
|
||||||
// ICefLifeSpanHandler
|
// ICefLifeSpanHandler
|
||||||
function doOnBeforePopup(const browser: ICefBrowser; const frame: ICefFrame; const targetUrl, targetFrameName: ustring; targetDisposition: TCefWindowOpenDisposition; userGesture: Boolean; const popupFeatures: TCefPopupFeatures; var windowInfo: TCefWindowInfo; var client: ICefClient; var settings: TCefBrowserSettings; var noJavascriptAccess: Boolean): Boolean;
|
function doOnBeforePopup(const browser: ICefBrowser; const frame: ICefFrame; const targetUrl, targetFrameName: ustring; targetDisposition: TCefWindowOpenDisposition; userGesture: Boolean; const popupFeatures: TCefPopupFeatures; var windowInfo: TCefWindowInfo; var client: ICefClient; var settings: TCefBrowserSettings; var noJavascriptAccess: Boolean): Boolean;
|
||||||
@ -1568,7 +1568,7 @@ type
|
|||||||
|
|
||||||
// TCefResponseFilter
|
// TCefResponseFilter
|
||||||
// /include/capi/cef_response_filter_capi.h (cef_response_filter_t)
|
// /include/capi/cef_response_filter_capi.h (cef_response_filter_t)
|
||||||
ICefResponseFilter = interface(ICefBaseRefCounted)
|
ICefResponseFilter = interface(ICefBaseRefCounted)
|
||||||
['{5013BC3C-F1AE-407A-A571-A4C6B1D6831E}']
|
['{5013BC3C-F1AE-407A-A571-A4C6B1D6831E}']
|
||||||
function InitFilter: Boolean;
|
function InitFilter: Boolean;
|
||||||
function Filter(data_in: Pointer; data_in_size: NativeUInt; var data_in_read: NativeUInt; data_out: Pointer; data_out_size : NativeUInt; var data_out_written: NativeUInt): TCefResponseFilterStatus;
|
function Filter(data_in: Pointer; data_in_size: NativeUInt; var data_in_read: NativeUInt; data_out: Pointer; data_out_size : NativeUInt; var data_out_written: NativeUInt): TCefResponseFilterStatus;
|
||||||
|
@ -52,7 +52,7 @@ uses
|
|||||||
type
|
type
|
||||||
TCefRequestHandlerOwn = class(TCefBaseRefCountedOwn, ICefRequestHandler)
|
TCefRequestHandlerOwn = class(TCefBaseRefCountedOwn, ICefRequestHandler)
|
||||||
protected
|
protected
|
||||||
function OnBeforeBrowse(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; isRedirect: Boolean): Boolean; virtual;
|
function OnBeforeBrowse(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; user_gesture, isRedirect: Boolean): Boolean; virtual;
|
||||||
function OnOpenUrlFromTab(const browser: ICefBrowser; const frame: ICefFrame; const targetUrl: ustring; targetDisposition: TCefWindowOpenDisposition; userGesture: Boolean): Boolean; virtual;
|
function OnOpenUrlFromTab(const browser: ICefBrowser; const frame: ICefFrame; const targetUrl: ustring; targetDisposition: TCefWindowOpenDisposition; userGesture: Boolean): Boolean; virtual;
|
||||||
function OnBeforeResourceLoad(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const callback: ICefRequestCallback): TCefReturnValue; virtual;
|
function OnBeforeResourceLoad(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const callback: ICefRequestCallback): TCefReturnValue; virtual;
|
||||||
function GetResourceHandler(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest): ICefResourceHandler; virtual;
|
function GetResourceHandler(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest): ICefResourceHandler; virtual;
|
||||||
@ -82,7 +82,7 @@ type
|
|||||||
protected
|
protected
|
||||||
FEvents : Pointer;
|
FEvents : Pointer;
|
||||||
|
|
||||||
function OnBeforeBrowse(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; isRedirect: Boolean): Boolean; override;
|
function OnBeforeBrowse(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; user_gesture, isRedirect: Boolean): Boolean; override;
|
||||||
function OnOpenUrlFromTab(const browser: ICefBrowser; const frame: ICefFrame; const targetUrl: ustring; targetDisposition: TCefWindowOpenDisposition; userGesture: Boolean): Boolean; override;
|
function OnOpenUrlFromTab(const browser: ICefBrowser; const frame: ICefFrame; const targetUrl: ustring; targetDisposition: TCefWindowOpenDisposition; userGesture: Boolean): Boolean; override;
|
||||||
function OnBeforeResourceLoad(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const callback: ICefRequestCallback): TCefReturnValue; override;
|
function OnBeforeResourceLoad(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const callback: ICefRequestCallback): TCefReturnValue; override;
|
||||||
function GetResourceHandler(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest): ICefResourceHandler; override;
|
function GetResourceHandler(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest): ICefResourceHandler; override;
|
||||||
@ -124,6 +124,7 @@ function cef_request_handler_on_before_browse(self : PCefRequestHandler;
|
|||||||
browser : PCefBrowser;
|
browser : PCefBrowser;
|
||||||
frame : PCefFrame;
|
frame : PCefFrame;
|
||||||
request : PCefRequest;
|
request : PCefRequest;
|
||||||
|
user_gesture : Integer;
|
||||||
isRedirect : Integer): Integer; stdcall;
|
isRedirect : Integer): Integer; stdcall;
|
||||||
var
|
var
|
||||||
TempObject : TObject;
|
TempObject : TObject;
|
||||||
@ -135,6 +136,7 @@ begin
|
|||||||
Result := Ord(TCefRequestHandlerOwn(TempObject).OnBeforeBrowse(TCefBrowserRef.UnWrap(browser),
|
Result := Ord(TCefRequestHandlerOwn(TempObject).OnBeforeBrowse(TCefBrowserRef.UnWrap(browser),
|
||||||
TCefFrameRef.UnWrap(frame),
|
TCefFrameRef.UnWrap(frame),
|
||||||
TCefRequestRef.UnWrap(request),
|
TCefRequestRef.UnWrap(request),
|
||||||
|
user_gesture <> 0,
|
||||||
isRedirect <> 0));
|
isRedirect <> 0));
|
||||||
end;
|
end;
|
||||||
|
|
||||||
@ -513,8 +515,13 @@ begin
|
|||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TCefRequestHandlerOwn.GetAuthCredentials(const browser: ICefBrowser; const frame: ICefFrame;
|
function TCefRequestHandlerOwn.GetAuthCredentials(const browser : ICefBrowser;
|
||||||
isProxy: Boolean; const host: ustring; port: Integer; const realm, scheme: ustring;
|
const frame : ICefFrame;
|
||||||
|
isProxy : Boolean;
|
||||||
|
const host : ustring;
|
||||||
|
port : Integer;
|
||||||
|
const realm : ustring;
|
||||||
|
const scheme : ustring;
|
||||||
const callback : ICefAuthCallback): Boolean;
|
const callback : ICefAuthCallback): Boolean;
|
||||||
begin
|
begin
|
||||||
Result := False;
|
Result := False;
|
||||||
@ -542,21 +549,26 @@ begin
|
|||||||
end;
|
end;
|
||||||
|
|
||||||
function TCefRequestHandlerOwn.OnBeforeBrowse(const browser : ICefBrowser;
|
function TCefRequestHandlerOwn.OnBeforeBrowse(const browser : ICefBrowser;
|
||||||
const frame: ICefFrame; const request: ICefRequest;
|
const frame : ICefFrame;
|
||||||
|
const request : ICefRequest;
|
||||||
|
user_gesture : Boolean;
|
||||||
isRedirect : Boolean): Boolean;
|
isRedirect : Boolean): Boolean;
|
||||||
begin
|
begin
|
||||||
Result := False;
|
Result := False;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TCefRequestHandlerOwn.OnBeforeResourceLoad(const browser : ICefBrowser;
|
function TCefRequestHandlerOwn.OnBeforeResourceLoad(const browser : ICefBrowser;
|
||||||
const frame: ICefFrame; const request: ICefRequest;
|
const frame : ICefFrame;
|
||||||
|
const request : ICefRequest;
|
||||||
const callback : ICefRequestCallback): TCefReturnValue;
|
const callback : ICefRequestCallback): TCefReturnValue;
|
||||||
begin
|
begin
|
||||||
Result := RV_CONTINUE;
|
Result := RV_CONTINUE;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TCefRequestHandlerOwn.OnCertificateError(const browser : ICefBrowser;
|
function TCefRequestHandlerOwn.OnCertificateError(const browser : ICefBrowser;
|
||||||
certError: TCefErrorcode; const requestUrl: ustring; const sslInfo: ICefSslInfo;
|
certError : TCefErrorcode;
|
||||||
|
const requestUrl : ustring;
|
||||||
|
const sslInfo : ICefSslInfo;
|
||||||
const callback : ICefRequestCallback): Boolean;
|
const callback : ICefRequestCallback): Boolean;
|
||||||
begin
|
begin
|
||||||
Result := False;
|
Result := False;
|
||||||
@ -574,14 +586,17 @@ begin
|
|||||||
end;
|
end;
|
||||||
|
|
||||||
function TCefRequestHandlerOwn.OnOpenUrlFromTab(const browser : ICefBrowser;
|
function TCefRequestHandlerOwn.OnOpenUrlFromTab(const browser : ICefBrowser;
|
||||||
const frame: ICefFrame; const targetUrl: ustring;
|
const frame : ICefFrame;
|
||||||
targetDisposition: TCefWindowOpenDisposition; userGesture: Boolean): Boolean;
|
const targetUrl : ustring;
|
||||||
|
targetDisposition : TCefWindowOpenDisposition;
|
||||||
|
userGesture : Boolean): Boolean;
|
||||||
begin
|
begin
|
||||||
Result := False;
|
Result := False;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TCefRequestHandlerOwn.GetResourceHandler(const browser : ICefBrowser;
|
function TCefRequestHandlerOwn.GetResourceHandler(const browser : ICefBrowser;
|
||||||
const frame: ICefFrame; const request: ICefRequest): ICefResourceHandler;
|
const frame : ICefFrame;
|
||||||
|
const request : ICefRequest): ICefResourceHandler;
|
||||||
begin
|
begin
|
||||||
Result := nil;
|
Result := nil;
|
||||||
end;
|
end;
|
||||||
@ -589,59 +604,68 @@ end;
|
|||||||
procedure TCefRequestHandlerOwn.OnPluginCrashed(const browser : ICefBrowser;
|
procedure TCefRequestHandlerOwn.OnPluginCrashed(const browser : ICefBrowser;
|
||||||
const pluginPath : ustring);
|
const pluginPath : ustring);
|
||||||
begin
|
begin
|
||||||
|
//
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TCefRequestHandlerOwn.OnProtocolExecution(const browser : ICefBrowser;
|
procedure TCefRequestHandlerOwn.OnProtocolExecution(const browser : ICefBrowser;
|
||||||
const url: ustring; out allowOsExecution: Boolean);
|
const url : ustring;
|
||||||
|
out allowOsExecution : Boolean);
|
||||||
begin
|
begin
|
||||||
|
//
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TCefRequestHandlerOwn.OnQuotaRequest(const browser : ICefBrowser;
|
function TCefRequestHandlerOwn.OnQuotaRequest(const browser : ICefBrowser;
|
||||||
const originUrl: ustring; newSize: Int64;
|
const originUrl : ustring;
|
||||||
|
newSize : Int64;
|
||||||
const callback : ICefRequestCallback): Boolean;
|
const callback : ICefRequestCallback): Boolean;
|
||||||
begin
|
begin
|
||||||
Result := False;
|
Result := False;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TCefRequestHandlerOwn.OnRenderProcessTerminated(
|
procedure TCefRequestHandlerOwn.OnRenderProcessTerminated(const browser : ICefBrowser;
|
||||||
const browser: ICefBrowser; status: TCefTerminationStatus);
|
status : TCefTerminationStatus);
|
||||||
begin
|
begin
|
||||||
|
//
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TCefRequestHandlerOwn.OnRenderViewReady(const browser: ICefBrowser);
|
procedure TCefRequestHandlerOwn.OnRenderViewReady(const browser: ICefBrowser);
|
||||||
begin
|
begin
|
||||||
|
//
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TCefRequestHandlerOwn.OnResourceRedirect(const browser : ICefBrowser;
|
procedure TCefRequestHandlerOwn.OnResourceRedirect(const browser : ICefBrowser;
|
||||||
const frame: ICefFrame; const request: ICefRequest; const response: ICefResponse; var newUrl: ustring);
|
const frame : ICefFrame;
|
||||||
|
const request : ICefRequest;
|
||||||
|
const response : ICefResponse;
|
||||||
|
var newUrl : ustring);
|
||||||
begin
|
begin
|
||||||
|
//
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TCefRequestHandlerOwn.OnResourceResponse(const browser : ICefBrowser;
|
function TCefRequestHandlerOwn.OnResourceResponse(const browser : ICefBrowser;
|
||||||
const frame: ICefFrame; const request: ICefRequest;
|
const frame : ICefFrame;
|
||||||
|
const request : ICefRequest;
|
||||||
const response : ICefResponse): Boolean;
|
const response : ICefResponse): Boolean;
|
||||||
begin
|
begin
|
||||||
Result := False;
|
Result := False;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TCefRequestHandlerOwn.GetResourceResponseFilter(
|
function TCefRequestHandlerOwn.GetResourceResponseFilter(const browser : ICefBrowser;
|
||||||
const browser: ICefBrowser; const frame: ICefFrame;
|
const frame : ICefFrame;
|
||||||
const request: ICefRequest; const response: ICefResponse): ICefResponseFilter;
|
const request : ICefRequest;
|
||||||
|
const response : ICefResponse): ICefResponseFilter;
|
||||||
begin
|
begin
|
||||||
Result := nil;
|
Result := nil;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TCefRequestHandlerOwn.OnResourceLoadComplete(
|
procedure TCefRequestHandlerOwn.OnResourceLoadComplete(const browser : ICefBrowser;
|
||||||
const browser: ICefBrowser; const frame: ICefFrame;
|
const frame : ICefFrame;
|
||||||
const request: ICefRequest; const response: ICefResponse;
|
const request : ICefRequest;
|
||||||
status: TCefUrlRequestStatus; receivedContentLength: Int64);
|
const response : ICefResponse;
|
||||||
|
status : TCefUrlRequestStatus;
|
||||||
|
receivedContentLength : Int64);
|
||||||
begin
|
begin
|
||||||
|
//
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TCefRequestHandlerOwn.RemoveReferences;
|
procedure TCefRequestHandlerOwn.RemoveReferences;
|
||||||
@ -719,12 +743,13 @@ end;
|
|||||||
function TCustomRequestHandler.OnBeforeBrowse(const browser : ICefBrowser;
|
function TCustomRequestHandler.OnBeforeBrowse(const browser : ICefBrowser;
|
||||||
const frame : ICefFrame;
|
const frame : ICefFrame;
|
||||||
const request : ICefRequest;
|
const request : ICefRequest;
|
||||||
|
user_gesture : Boolean;
|
||||||
isRedirect : Boolean): Boolean;
|
isRedirect : Boolean): Boolean;
|
||||||
begin
|
begin
|
||||||
if (FEvents <> nil) then
|
if (FEvents <> nil) then
|
||||||
Result := IChromiumEvents(FEvents).doOnBeforeBrowse(browser, frame, request, isRedirect)
|
Result := IChromiumEvents(FEvents).doOnBeforeBrowse(browser, frame, request, user_gesture, isRedirect)
|
||||||
else
|
else
|
||||||
Result := inherited OnBeforeBrowse(browser, frame, request, isRedirect);
|
Result := inherited OnBeforeBrowse(browser, frame, request, user_gesture, isRedirect);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TCustomRequestHandler.OnBeforeResourceLoad(const browser : ICefBrowser;
|
function TCustomRequestHandler.OnBeforeResourceLoad(const browser : ICefBrowser;
|
||||||
@ -847,7 +872,8 @@ procedure TCustomRequestHandler.OnResourceLoadComplete(const browser
|
|||||||
status : TCefUrlRequestStatus;
|
status : TCefUrlRequestStatus;
|
||||||
receivedContentLength : Int64);
|
receivedContentLength : Int64);
|
||||||
begin
|
begin
|
||||||
if (FEvents <> nil) then IChromiumEvents(FEvents).doOnResourceLoadComplete(browser, frame, request, response, status, receivedContentLength);
|
if (FEvents <> nil) then
|
||||||
|
IChromiumEvents(FEvents).doOnResourceLoadComplete(browser, frame, request, response, status, receivedContentLength);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
end.
|
end.
|
||||||
|
@ -1567,7 +1567,7 @@ type
|
|||||||
// /include/capi/cef_request_handler_capi.h (cef_request_handler_t)
|
// /include/capi/cef_request_handler_capi.h (cef_request_handler_t)
|
||||||
TCefRequestHandler = record
|
TCefRequestHandler = record
|
||||||
base : TCefBaseRefCounted;
|
base : TCefBaseRefCounted;
|
||||||
on_before_browse : function(self: PCefRequestHandler; browser: PCefBrowser; frame: PCefFrame; request: PCefRequest; isRedirect: Integer): Integer; stdcall;
|
on_before_browse : function(self: PCefRequestHandler; browser: PCefBrowser; frame: PCefFrame; request: PCefRequest; user_gesture, isRedirect: Integer): Integer; stdcall;
|
||||||
on_open_urlfrom_tab : function(self: PCefRequestHandler; browser:PCefBrowser; frame: PCefFrame; const target_url: PCefString; target_disposition: TCefWindowOpenDisposition; user_gesture: Integer): Integer; stdcall;
|
on_open_urlfrom_tab : function(self: PCefRequestHandler; browser:PCefBrowser; frame: PCefFrame; const target_url: PCefString; target_disposition: TCefWindowOpenDisposition; user_gesture: Integer): Integer; stdcall;
|
||||||
on_before_resource_load : function(self: PCefRequestHandler; browser: PCefBrowser; frame: PCefFrame; request: PCefRequest; callback: PCefRequestCallback): TCefReturnValue; stdcall;
|
on_before_resource_load : function(self: PCefRequestHandler; browser: PCefBrowser; frame: PCefFrame; request: PCefRequest; callback: PCefRequestCallback): TCefReturnValue; stdcall;
|
||||||
get_resource_handler : function(self: PCefRequestHandler; browser: PCefBrowser; frame: PCefFrame; request: PCefRequest): PCefResourceHandler; stdcall;
|
get_resource_handler : function(self: PCefRequestHandler; browser: PCefBrowser; frame: PCefFrame; request: PCefRequest): PCefResourceHandler; stdcall;
|
||||||
|
@ -376,7 +376,7 @@ type
|
|||||||
function doOnClose(const browser: ICefBrowser): Boolean; virtual;
|
function doOnClose(const browser: ICefBrowser): Boolean; virtual;
|
||||||
|
|
||||||
// ICefRequestHandler
|
// ICefRequestHandler
|
||||||
function doOnBeforeBrowse(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; isRedirect: Boolean): Boolean; virtual;
|
function doOnBeforeBrowse(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; user_gesture, isRedirect: Boolean): Boolean; virtual;
|
||||||
function doOnOpenUrlFromTab(const browser: ICefBrowser; const frame: ICefFrame; const targetUrl: ustring; targetDisposition: TCefWindowOpenDisposition; userGesture: Boolean): Boolean; virtual;
|
function doOnOpenUrlFromTab(const browser: ICefBrowser; const frame: ICefFrame; const targetUrl: ustring; targetDisposition: TCefWindowOpenDisposition; userGesture: Boolean): Boolean; virtual;
|
||||||
function doOnBeforeResourceLoad(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const callback: ICefRequestCallback): TCefReturnValue; virtual;
|
function doOnBeforeResourceLoad(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const callback: ICefRequestCallback): TCefReturnValue; virtual;
|
||||||
function doOnGetResourceHandler(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest): ICefResourceHandler; virtual;
|
function doOnGetResourceHandler(const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest): ICefResourceHandler; virtual;
|
||||||
@ -2669,13 +2669,14 @@ end;
|
|||||||
function TFMXChromium.doOnBeforeBrowse(const browser : ICefBrowser;
|
function TFMXChromium.doOnBeforeBrowse(const browser : ICefBrowser;
|
||||||
const frame : ICefFrame;
|
const frame : ICefFrame;
|
||||||
const request : ICefRequest;
|
const request : ICefRequest;
|
||||||
|
user_gesture : Boolean;
|
||||||
isRedirect : Boolean): Boolean;
|
isRedirect : Boolean): Boolean;
|
||||||
begin
|
begin
|
||||||
Result := False;
|
Result := False;
|
||||||
|
|
||||||
if FUpdatePreferences then doUpdatePreferences(browser);
|
if FUpdatePreferences then doUpdatePreferences(browser);
|
||||||
|
|
||||||
if Assigned(FOnBeforeBrowse) then FOnBeforeBrowse(Self, browser, frame, request, isRedirect, Result);
|
if Assigned(FOnBeforeBrowse) then FOnBeforeBrowse(Self, browser, frame, request, user_gesture, isRedirect, Result);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TFMXChromium.doOnBeforeContextMenu(const browser : ICefBrowser;
|
procedure TFMXChromium.doOnBeforeContextMenu(const browser : ICefBrowser;
|
||||||
|
Reference in New Issue
Block a user