You've already forked CEF4Delphi
mirror of
https://github.com/salvadordf/CEF4Delphi.git
synced 2025-12-23 21:51:09 +02:00
Update to CEF 3.3325.1755.g7c74b17
This commit is contained in:
Salvador Díaz Fau
@@ -1,4 +1,4 @@
|
||||
// ************************************************************************
|
||||
// ************************************************************************
|
||||
// ***************************** CEF4Delphi *******************************
|
||||
// ************************************************************************
|
||||
//
|
||||
@@ -42,14 +42,14 @@ unit uCEFExtensionHandler;
|
||||
{$MINENUMSIZE 4}
|
||||
{$ENDIF}
|
||||
|
||||
{$I cef.inc}
|
||||
|
||||
interface
|
||||
|
||||
uses
|
||||
uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes;
|
||||
|
||||
type
|
||||
{$I cef.inc}
|
||||
|
||||
interface
|
||||
|
||||
uses
|
||||
uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes;
|
||||
|
||||
type
|
||||
TCefExtensionHandlerRef = class(TCefBaseRefCountedRef, ICefExtensionHandler)
|
||||
protected
|
||||
procedure OnExtensionLoadFailed(result: TCefErrorcode);
|
||||
@@ -63,9 +63,9 @@ type
|
||||
|
||||
public
|
||||
class function UnWrap(data: Pointer): ICefExtensionHandler;
|
||||
end;
|
||||
|
||||
TCefExtensionHandlerOwn = class(TCefBaseRefCountedOwn, ICefExtensionHandler)
|
||||
end;
|
||||
|
||||
TCefExtensionHandlerOwn = class(TCefBaseRefCountedOwn, ICefExtensionHandler)
|
||||
protected
|
||||
procedure OnExtensionLoadFailed(result: TCefErrorcode); virtual;
|
||||
procedure OnExtensionLoaded(const extension: ICefExtension); virtual;
|
||||
@@ -78,40 +78,40 @@ type
|
||||
|
||||
public
|
||||
constructor Create; virtual;
|
||||
end;
|
||||
|
||||
implementation
|
||||
|
||||
uses
|
||||
uCEFMiscFunctions, uCEFLibFunctions, uCEFGetExtensionResourceCallback, uCEFExtension, uCEFBrowser, uCEFClient;
|
||||
|
||||
|
||||
// ***************************************************************************
|
||||
// ************************ TCefExtensionHandlerRef **************************
|
||||
// ***************************************************************************
|
||||
|
||||
procedure TCefExtensionHandlerRef.OnExtensionLoadFailed(result: TCefErrorcode);
|
||||
begin
|
||||
|
||||
end;
|
||||
|
||||
end;
|
||||
|
||||
implementation
|
||||
|
||||
uses
|
||||
uCEFMiscFunctions, uCEFLibFunctions, uCEFGetExtensionResourceCallback, uCEFExtension, uCEFBrowser, uCEFClient;
|
||||
|
||||
|
||||
// ***************************************************************************
|
||||
// ************************ TCefExtensionHandlerRef **************************
|
||||
// ***************************************************************************
|
||||
|
||||
procedure TCefExtensionHandlerRef.OnExtensionLoadFailed(result: TCefErrorcode);
|
||||
begin
|
||||
|
||||
end;
|
||||
|
||||
procedure TCefExtensionHandlerRef.OnExtensionLoaded(const extension: ICefExtension);
|
||||
begin
|
||||
|
||||
end;
|
||||
begin
|
||||
|
||||
end;
|
||||
|
||||
procedure TCefExtensionHandlerRef.OnExtensionUnloaded(const extension: ICefExtension);
|
||||
begin
|
||||
|
||||
end;
|
||||
begin
|
||||
|
||||
end;
|
||||
|
||||
function TCefExtensionHandlerRef.OnBeforeBackgroundBrowser(const extension : ICefExtension;
|
||||
const url : ustring;
|
||||
var client : ICefClient;
|
||||
var settings : TCefBrowserSettings) : boolean;
|
||||
begin
|
||||
Result := False;
|
||||
end;
|
||||
begin
|
||||
Result := False;
|
||||
end;
|
||||
|
||||
function TCefExtensionHandlerRef.OnBeforeBrowser(const extension : ICefExtension;
|
||||
const browser : ICefBrowser;
|
||||
@@ -123,143 +123,176 @@ function TCefExtensionHandlerRef.OnBeforeBrowser(const extension : ICefExte
|
||||
var client : ICefClient;
|
||||
var settings : TCefBrowserSettings) : boolean;
|
||||
begin
|
||||
Result := True;
|
||||
Result := True;
|
||||
end;
|
||||
|
||||
function TCefExtensionHandlerRef.GetActiveBrowser(const extension : ICefExtension;
|
||||
const browser : ICefBrowser;
|
||||
include_incognito : boolean): ICefBrowser;
|
||||
begin
|
||||
Result := TCefBrowserRef.UnWrap(PCefExtensionHandler(FData).get_active_browser(PCefExtensionHandler(FData),
|
||||
CefGetData(extension),
|
||||
CefGetData(browser),
|
||||
Ord(include_incognito)));
|
||||
end;
|
||||
begin
|
||||
Result := TCefBrowserRef.UnWrap(PCefExtensionHandler(FData).get_active_browser(PCefExtensionHandler(FData),
|
||||
CefGetData(extension),
|
||||
CefGetData(browser),
|
||||
Ord(include_incognito)));
|
||||
end;
|
||||
|
||||
function TCefExtensionHandlerRef.CanAccessBrowser(const extension : ICefExtension;
|
||||
const browser : ICefBrowser;
|
||||
include_incognito : boolean;
|
||||
const target_browser : ICefBrowser): boolean;
|
||||
begin
|
||||
Result := PCefExtensionHandler(FData).can_access_browser(PCefExtensionHandler(FData),
|
||||
CefGetData(extension),
|
||||
CefGetData(browser),
|
||||
Ord(include_incognito),
|
||||
CefGetData(target_browser)) <> 0;
|
||||
end;
|
||||
begin
|
||||
Result := PCefExtensionHandler(FData).can_access_browser(PCefExtensionHandler(FData),
|
||||
CefGetData(extension),
|
||||
CefGetData(browser),
|
||||
Ord(include_incognito),
|
||||
CefGetData(target_browser)) <> 0;
|
||||
end;
|
||||
|
||||
function TCefExtensionHandlerRef.GetExtensionResource(const extension : ICefExtension;
|
||||
const browser : ICefBrowser;
|
||||
const file_ : ustring;
|
||||
const callback : ICefGetExtensionResourceCallback): boolean;
|
||||
var
|
||||
TempFile : TCefString;
|
||||
begin
|
||||
TempFile := CefString(file_);
|
||||
Result := PCefExtensionHandler(FData).get_extension_resource(PCefExtensionHandler(FData),
|
||||
CefGetData(extension),
|
||||
CefGetData(browser),
|
||||
@TempFile,
|
||||
CefGetData(callback)) <> 0;
|
||||
end;
|
||||
var
|
||||
TempFile : TCefString;
|
||||
begin
|
||||
TempFile := CefString(file_);
|
||||
Result := PCefExtensionHandler(FData).get_extension_resource(PCefExtensionHandler(FData),
|
||||
CefGetData(extension),
|
||||
CefGetData(browser),
|
||||
@TempFile,
|
||||
CefGetData(callback)) <> 0;
|
||||
end;
|
||||
|
||||
class function TCefExtensionHandlerRef.UnWrap(data: Pointer): ICefExtensionHandler;
|
||||
class function TCefExtensionHandlerRef.UnWrap(data: Pointer): ICefExtensionHandler;
|
||||
begin
|
||||
if (data <> nil) then
|
||||
Result := Create(data) as ICefExtensionHandler
|
||||
else
|
||||
Result := nil;
|
||||
end;
|
||||
|
||||
|
||||
// ***************************************************************************
|
||||
// ************************ TCefExtensionHandlerOwn **************************
|
||||
// ***************************************************************************
|
||||
|
||||
procedure cef_extension_handler_on_extension_load_failed(self : PCefExtensionHandler;
|
||||
result : TCefErrorcode); stdcall;
|
||||
end;
|
||||
|
||||
|
||||
// ***************************************************************************
|
||||
// ************************ TCefExtensionHandlerOwn **************************
|
||||
// ***************************************************************************
|
||||
|
||||
procedure cef_extension_handler_on_extension_load_failed(self : PCefExtensionHandler;
|
||||
result : TCefErrorcode); stdcall;
|
||||
var
|
||||
TempObject : TObject;
|
||||
begin
|
||||
TCefExtensionHandlerOwn(CefGetObject(self)).OnExtensionLoadFailed(result);
|
||||
end;
|
||||
|
||||
TempObject := CefGetObject(self);
|
||||
|
||||
if (TempObject <> nil) and (TempObject is TCefExtensionHandlerOwn) then
|
||||
TCefExtensionHandlerOwn(TempObject).OnExtensionLoadFailed(result);
|
||||
end;
|
||||
|
||||
procedure cef_extension_handler_on_extension_loaded(self : PCefExtensionHandler;
|
||||
extension : PCefExtension); stdcall;
|
||||
var
|
||||
TempObject : TObject;
|
||||
begin
|
||||
TCefExtensionHandlerOwn(CefGetObject(self)).OnExtensionLoaded(TCefExtensionRef.UnWrap(extension));
|
||||
TempObject := CefGetObject(self);
|
||||
|
||||
if (TempObject <> nil) and (TempObject is TCefExtensionHandlerOwn) then
|
||||
TCefExtensionHandlerOwn(TempObject).OnExtensionLoaded(TCefExtensionRef.UnWrap(extension));
|
||||
end;
|
||||
|
||||
procedure cef_extension_handler_on_extension_unloaded(self : PCefExtensionHandler;
|
||||
extension : PCefExtension); stdcall;
|
||||
var
|
||||
TempObject : TObject;
|
||||
begin
|
||||
TCefExtensionHandlerOwn(CefGetObject(self)).OnExtensionUnloaded(TCefExtensionRef.UnWrap(extension));
|
||||
TempObject := CefGetObject(self);
|
||||
|
||||
if (TempObject <> nil) and (TempObject is TCefExtensionHandlerOwn) then
|
||||
TCefExtensionHandlerOwn(TempObject).OnExtensionUnloaded(TCefExtensionRef.UnWrap(extension));
|
||||
end;
|
||||
|
||||
function cef_extension_handler_on_before_background_browser(self : PCefExtensionHandler;
|
||||
extension : PCefExtension;
|
||||
const url : PCefString;
|
||||
var client : PCefClient;
|
||||
settings : PCefBrowserSettings) : Integer; stdcall;
|
||||
function cef_extension_handler_on_before_background_browser( self : PCefExtensionHandler;
|
||||
extension : PCefExtension;
|
||||
const url : PCefString;
|
||||
var client : PCefClient;
|
||||
settings : PCefBrowserSettings) : Integer; stdcall;
|
||||
var
|
||||
TempClient : ICefClient;
|
||||
TempOldCli : pointer;
|
||||
TempObject : TObject;
|
||||
begin
|
||||
TempClient := TCefClientRef.UnWrap(client);
|
||||
TempOldCli := pointer(TempClient);
|
||||
try
|
||||
Result := Ord(True);
|
||||
TempObject := CefGetObject(self);
|
||||
TempClient := TCefClientRef.UnWrap(client);
|
||||
|
||||
Result := Ord(TCefExtensionHandlerOwn(CefGetObject(self)).OnBeforeBackgroundBrowser(TCefExtensionRef.UnWrap(extension),
|
||||
CefString(url),
|
||||
TempClient,
|
||||
settings^));
|
||||
|
||||
if (TempClient = nil) then
|
||||
client := nil
|
||||
else
|
||||
if (TempOldCli <> pointer(TempClient)) then
|
||||
client := CefGetData(TempClient);
|
||||
|
||||
if (TempObject <> nil) and (TempObject is TCefExtensionHandlerOwn) then
|
||||
Result := Ord(TCefExtensionHandlerOwn(TempObject).OnBeforeBackgroundBrowser(TCefExtensionRef.UnWrap(extension),
|
||||
CefString(url),
|
||||
TempClient,
|
||||
settings^));
|
||||
|
||||
if (TempClient = nil) then
|
||||
client := nil
|
||||
else
|
||||
if not(TempClient.SameAs(client)) then
|
||||
client := TempClient.Wrap;
|
||||
finally
|
||||
TempClient := nil;
|
||||
end;
|
||||
end;
|
||||
function cef_extension_handler_on_before_browser(self : PCefExtensionHandler;
|
||||
extension : PCefExtension;
|
||||
browser : PCefBrowser;
|
||||
active_browser : PCefBrowser;
|
||||
index : Integer;
|
||||
const url : PCefString;
|
||||
active : Integer;
|
||||
windowInfo : PCefWindowInfo;
|
||||
var client : PCefClient;
|
||||
settings : PCefBrowserSettings) : Integer; stdcall;
|
||||
|
||||
function cef_extension_handler_on_before_browser( self : PCefExtensionHandler;
|
||||
extension : PCefExtension;
|
||||
browser : PCefBrowser;
|
||||
active_browser : PCefBrowser;
|
||||
index : Integer;
|
||||
const url : PCefString;
|
||||
active : Integer;
|
||||
windowInfo : PCefWindowInfo;
|
||||
var client : PCefClient;
|
||||
settings : PCefBrowserSettings) : Integer; stdcall;
|
||||
var
|
||||
TempOldCli : pointer;
|
||||
TempClient : ICefClient;
|
||||
TempObject : TObject;
|
||||
TempClient := TCefClientRef.UnWrap(client);
|
||||
TempOldCli := pointer(TempClient);
|
||||
begin
|
||||
try
|
||||
Result := Ord(True);
|
||||
TempObject := CefGetObject(self);
|
||||
TempClient := TCefClientRef.UnWrap(client);
|
||||
Result := Ord(TCefExtensionHandlerOwn(CefGetObject(self)).OnBeforeBrowser(TCefExtensionRef.UnWrap(extension),
|
||||
TCefBrowserRef.UnWrap(browser),
|
||||
TCefBrowserRef.UnWrap(active_browser),
|
||||
index,
|
||||
CefString(url),
|
||||
active <> 0,
|
||||
windowInfo^,
|
||||
TempClient,
|
||||
settings^));
|
||||
|
||||
if (TempClient = nil) then
|
||||
client := nil
|
||||
else
|
||||
if (TempOldCli <> pointer(TempClient)) then
|
||||
client := CefGetData(TempClient);
|
||||
|
||||
if (TempObject <> nil) and (TempObject is TCefExtensionHandlerOwn) then
|
||||
Result := Ord(TCefExtensionHandlerOwn(TempObject).OnBeforeBrowser(TCefExtensionRef.UnWrap(extension),
|
||||
TCefBrowserRef.UnWrap(browser),
|
||||
TCefBrowserRef.UnWrap(active_browser),
|
||||
index,
|
||||
CefString(url),
|
||||
active <> 0,
|
||||
windowInfo^,
|
||||
TempClient,
|
||||
settings^));
|
||||
|
||||
if (TempClient = nil) then
|
||||
client := nil
|
||||
else
|
||||
if not(TempClient.SameAs(client)) then
|
||||
client := TempClient.Wrap;
|
||||
finally
|
||||
TempClient := nil;
|
||||
end;
|
||||
end;
|
||||
|
||||
function cef_extension_handler_get_active_browser(self : PCefExtensionHandler;
|
||||
extension : PCefExtension;
|
||||
browser : PCefBrowser;
|
||||
include_incognito : Integer): PCefBrowser; stdcall;
|
||||
var
|
||||
TempObject : TObject;
|
||||
Result := CefGetData(TCefExtensionHandlerOwn(CefGetObject(self)).GetActiveBrowser(TCefExtensionRef.UnWrap(extension),
|
||||
TCefBrowserRef.UnWrap(browser),
|
||||
include_incognito <> 0));
|
||||
begin
|
||||
Result := nil;
|
||||
TempObject := CefGetObject(self);
|
||||
|
||||
if (TempObject <> nil) and (TempObject is TCefExtensionHandlerOwn) then
|
||||
Result := CefGetData(TCefExtensionHandlerOwn(TempObject).GetActiveBrowser(TCefExtensionRef.UnWrap(extension),
|
||||
TCefBrowserRef.UnWrap(browser),
|
||||
include_incognito <> 0));
|
||||
end;
|
||||
|
||||
@@ -267,28 +300,40 @@ function cef_extension_handler_can_access_browser(self : PCefExtens
|
||||
extension : PCefExtension;
|
||||
browser : PCefBrowser;
|
||||
include_incognito : Integer;
|
||||
target_browser : PCefBrowser): Integer; stdcall;
|
||||
var
|
||||
TempObject : TObject;
|
||||
Result := Ord(TCefExtensionHandlerOwn(CefGetObject(self)).CanAccessBrowser(TCefExtensionRef.UnWrap(extension),
|
||||
TCefBrowserRef.UnWrap(browser),
|
||||
include_incognito <> 0,
|
||||
TCefBrowserRef.UnWrap(target_browser)));
|
||||
begin
|
||||
Result := Ord(True);
|
||||
TempObject := CefGetObject(self);
|
||||
|
||||
if (TempObject <> nil) and (TempObject is TCefExtensionHandlerOwn) then
|
||||
Result := Ord(TCefExtensionHandlerOwn(TempObject).CanAccessBrowser(TCefExtensionRef.UnWrap(extension),
|
||||
TCefBrowserRef.UnWrap(browser),
|
||||
include_incognito <> 0,
|
||||
TCefBrowserRef.UnWrap(target_browser)));
|
||||
end;
|
||||
function cef_extension_handler_get_extension_resource(self : PCefExtensionHandler;
|
||||
extension : PCefExtension;
|
||||
browser : PCefBrowser;
|
||||
const file_ : PCefString;
|
||||
callback : PCefGetExtensionResourceCallback): Integer; stdcall;
|
||||
|
||||
function cef_extension_handler_get_extension_resource( self : PCefExtensionHandler;
|
||||
extension : PCefExtension;
|
||||
browser : PCefBrowser;
|
||||
const file_ : PCefString;
|
||||
callback : PCefGetExtensionResourceCallback): Integer; stdcall;
|
||||
var
|
||||
TempObject : TObject;
|
||||
Result := Ord(TCefExtensionHandlerOwn(CefGetObject(self)).GetExtensionResource(TCefExtensionRef.UnWrap(extension),
|
||||
TCefBrowserRef.UnWrap(browser),
|
||||
CefString(file_),
|
||||
TCefGetExtensionResourceCallbackRef.UnWrap(callback)));
|
||||
begin
|
||||
Result := Ord(False);
|
||||
TempObject := CefGetObject(self);
|
||||
|
||||
if (TempObject <> nil) and (TempObject is TCefExtensionHandlerOwn) then
|
||||
Result := Ord(TCefExtensionHandlerOwn(TempObject).GetExtensionResource(TCefExtensionRef.UnWrap(extension),
|
||||
TCefBrowserRef.UnWrap(browser),
|
||||
CefString(file_),
|
||||
TCefGetExtensionResourceCallbackRef.UnWrap(callback)));
|
||||
|
||||
constructor TCefExtensionHandlerOwn.Create;
|
||||
begin
|
||||
inherited CreateData(SizeOf(TCefExtensionHandler));
|
||||
end;
|
||||
|
||||
constructor TCefExtensionHandlerOwn.Create;
|
||||
begin
|
||||
inherited CreateData(SizeOf(TCefExtensionHandler));
|
||||
|
||||
with PCefExtensionHandler(FData)^ do
|
||||
@@ -301,21 +346,21 @@ begin
|
||||
get_active_browser := cef_extension_handler_get_active_browser;
|
||||
can_access_browser := cef_extension_handler_can_access_browser;
|
||||
get_extension_resource := cef_extension_handler_get_extension_resource;
|
||||
end;
|
||||
|
||||
procedure TCefExtensionHandlerOwn.OnExtensionLoadFailed(result: TCefErrorcode);
|
||||
begin
|
||||
|
||||
end;
|
||||
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TCefExtensionHandlerOwn.OnExtensionLoadFailed(result: TCefErrorcode);
|
||||
begin
|
||||
|
||||
end;
|
||||
|
||||
procedure TCefExtensionHandlerOwn.OnExtensionLoaded(const extension: ICefExtension);
|
||||
|
||||
begin
|
||||
|
||||
end;
|
||||
|
||||
procedure TCefExtensionHandlerOwn.OnExtensionUnloaded(const extension: ICefExtension);
|
||||
|
||||
begin
|
||||
|
||||
end;
|
||||
|
||||
@@ -323,7 +368,7 @@ function TCefExtensionHandlerOwn.OnBeforeBackgroundBrowser(const extension : ICe
|
||||
const url : ustring;
|
||||
var client : ICefClient;
|
||||
var settings : TCefBrowserSettings) : boolean;
|
||||
Result := True;
|
||||
begin
|
||||
Result := True;
|
||||
end;
|
||||
|
||||
@@ -336,14 +381,14 @@ function TCefExtensionHandlerOwn.OnBeforeBrowser(const extension : ICefExte
|
||||
var windowInfo : TCefWindowInfo;
|
||||
var client : ICefClient;
|
||||
var settings : TCefBrowserSettings) : boolean;
|
||||
Result := True;
|
||||
begin
|
||||
Result := True;
|
||||
end;
|
||||
|
||||
function TCefExtensionHandlerOwn.GetActiveBrowser(const extension : ICefExtension;
|
||||
const browser : ICefBrowser;
|
||||
include_incognito : boolean): ICefBrowser;
|
||||
Result := nil;
|
||||
begin
|
||||
Result := nil;
|
||||
end;
|
||||
|
||||
@@ -351,15 +396,15 @@ function TCefExtensionHandlerOwn.CanAccessBrowser(const extension : ICef
|
||||
const browser : ICefBrowser;
|
||||
include_incognito : boolean;
|
||||
const target_browser : ICefBrowser): boolean;
|
||||
Result := True;
|
||||
begin
|
||||
Result := True;
|
||||
end;
|
||||
|
||||
function TCefExtensionHandlerOwn.GetExtensionResource(const extension : ICefExtension;
|
||||
const browser : ICefBrowser;
|
||||
const file_ : ustring;
|
||||
begin
|
||||
Result := False;
|
||||
end;
|
||||
|
||||
end.
|
||||
const callback : ICefGetExtensionResourceCallback): boolean;
|
||||
begin
|
||||
Result := False;
|
||||
end;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user