You've already forked CEF4Delphi
mirror of
https://github.com/salvadordf/CEF4Delphi.git
synced 2025-11-23 21:34:53 +02:00
Update to CEF 90.5.4
This commit is contained in:
Salvador Díaz Fau
@@ -36,8 +36,8 @@
|
||||
*)
|
||||
|
||||
unit uCEFBrowserProcessHandler;
|
||||
|
||||
{$IFDEF FPC}
|
||||
|
||||
{$IFDEF FPC}
|
||||
{$MODE OBJFPC}{$H+}
|
||||
{$ENDIF}
|
||||
|
||||
@@ -59,10 +59,8 @@ uses
|
||||
type
|
||||
TCefBrowserProcessHandlerOwn = class(TCefBaseRefCountedOwn, ICefBrowserProcessHandler)
|
||||
protected
|
||||
procedure GetCookieableSchemes(var schemes: TStringList; var include_defaults : boolean); virtual; abstract;
|
||||
procedure OnContextInitialized; virtual; abstract;
|
||||
procedure OnBeforeChildProcessLaunch(const commandLine: ICefCommandLine); virtual; abstract;
|
||||
procedure GetPrintHandler(var aHandler : ICefPrintHandler); virtual;
|
||||
procedure OnScheduleMessagePumpWork(const delayMs: Int64); virtual; abstract;
|
||||
procedure GetDefaultClient(var aClient : ICefClient); virtual;
|
||||
|
||||
@@ -73,80 +71,37 @@ type
|
||||
end;
|
||||
|
||||
TCefCustomBrowserProcessHandler = class(TCefBrowserProcessHandlerOwn)
|
||||
protected
|
||||
FCefApp : TCefApplicationCore;
|
||||
FPrintHandler : ICefPrintHandler;
|
||||
|
||||
procedure GetCookieableSchemes(var schemes: TStringList; var include_defaults : boolean); override;
|
||||
procedure OnContextInitialized; override;
|
||||
procedure OnBeforeChildProcessLaunch(const commandLine: ICefCommandLine); override;
|
||||
procedure GetPrintHandler(var aHandler : ICefPrintHandler); override;
|
||||
procedure OnScheduleMessagePumpWork(const delayMs: Int64); override;
|
||||
procedure GetDefaultClient(var aClient : ICefClient); override;
|
||||
|
||||
procedure RemoveReferences; override;
|
||||
|
||||
public
|
||||
constructor Create(const aCefApp : TCefApplicationCore); reintroduce;
|
||||
destructor Destroy; override;
|
||||
end;
|
||||
protected
|
||||
FCefApp : TCefApplicationCore;
|
||||
|
||||
procedure OnContextInitialized; override;
|
||||
procedure OnBeforeChildProcessLaunch(const commandLine: ICefCommandLine); override;
|
||||
procedure OnScheduleMessagePumpWork(const delayMs: Int64); override;
|
||||
procedure GetDefaultClient(var aClient : ICefClient); override;
|
||||
|
||||
procedure RemoveReferences; override;
|
||||
|
||||
public
|
||||
constructor Create(const aCefApp : TCefApplicationCore); reintroduce;
|
||||
destructor Destroy; override;
|
||||
end;
|
||||
|
||||
implementation
|
||||
|
||||
uses
|
||||
{$IFDEF DELPHI16_UP}
|
||||
System.SysUtils,
|
||||
{$ELSE}
|
||||
SysUtils,
|
||||
{$IFDEF DELPHI16_UP}
|
||||
System.SysUtils,
|
||||
{$ELSE}
|
||||
SysUtils,
|
||||
{$ENDIF}
|
||||
uCEFMiscFunctions, uCEFLibFunctions, uCEFCommandLine, uCEFListValue, uCEFConstants, uCEFStringList,
|
||||
uCEFPrintHandler;
|
||||
|
||||
procedure cef_browser_process_handler_get_cookieable_schemes(self : PCefBrowserProcessHandler;
|
||||
schemes : TCefStringList;
|
||||
include_defaults : PInteger); stdcall;
|
||||
var
|
||||
TempSL : TStringList;
|
||||
TempCefSL : ICefStringList;
|
||||
TempObject : TObject;
|
||||
TempIncDef : boolean;
|
||||
begin
|
||||
TempSL := nil;
|
||||
|
||||
try
|
||||
try
|
||||
TempObject := CefGetObject(self);
|
||||
|
||||
if (schemes <> nil) and (TempObject <> nil) and (TempObject is TCefBrowserProcessHandlerOwn) then
|
||||
begin
|
||||
TempIncDef := (include_defaults^ <> 0);
|
||||
TempSL := TStringList.Create;
|
||||
TempCefSL := TCefStringListRef.Create(schemes);
|
||||
TempCefSL.CopyToStrings(TempSL);
|
||||
|
||||
TCefBrowserProcessHandlerOwn(TempObject).GetCookieableSchemes(TempSL, TempIncDef);
|
||||
|
||||
TempCefSL.Clear;
|
||||
TempCefSL.AddStrings(TempSL);
|
||||
|
||||
include_defaults^ := ord(TempIncDef);
|
||||
end;
|
||||
except
|
||||
on e : exception do
|
||||
if CustomExceptionHandler('cef_browser_process_handler_get_cookieable_schemes', e) then raise;
|
||||
end;
|
||||
finally
|
||||
if (TempSL <> nil) then FreeAndNil(TempSL);
|
||||
TempCefSL := nil;
|
||||
end;
|
||||
end;
|
||||
uCEFMiscFunctions, uCEFLibFunctions, uCEFCommandLine, uCEFListValue, uCEFConstants, uCEFStringList;
|
||||
|
||||
procedure cef_browser_process_handler_on_context_initialized(self: PCefBrowserProcessHandler); stdcall;
|
||||
var
|
||||
TempObject : TObject;
|
||||
begin
|
||||
TempObject := CefGetObject(self);
|
||||
|
||||
TempObject := CefGetObject(self);
|
||||
|
||||
if (TempObject <> nil) and
|
||||
(TempObject is TCefBrowserProcessHandlerOwn) then
|
||||
TCefBrowserProcessHandlerOwn(TempObject).OnContextInitialized;
|
||||
@@ -157,39 +112,20 @@ procedure cef_browser_process_handler_on_before_child_process_launch(self
|
||||
var
|
||||
TempObject : TObject;
|
||||
begin
|
||||
TempObject := CefGetObject(self);
|
||||
|
||||
TempObject := CefGetObject(self);
|
||||
|
||||
if (TempObject <> nil) and
|
||||
(TempObject is TCefBrowserProcessHandlerOwn) then
|
||||
TCefBrowserProcessHandlerOwn(TempObject).OnBeforeChildProcessLaunch(TCefCommandLineRef.UnWrap(command_line));
|
||||
end;
|
||||
|
||||
function cef_browser_process_handler_get_print_handler(self: PCefBrowserProcessHandler): PCefPrintHandler; stdcall;
|
||||
var
|
||||
TempObject : TObject;
|
||||
TempHandler : ICefPrintHandler;
|
||||
begin
|
||||
Result := nil;
|
||||
TempObject := CefGetObject(self);
|
||||
|
||||
if (TempObject <> nil) and
|
||||
(TempObject is TCefBrowserProcessHandlerOwn) then
|
||||
try
|
||||
TempHandler := nil;
|
||||
TCefBrowserProcessHandlerOwn(TempObject).GetPrintHandler(TempHandler);
|
||||
if (TempHandler <> nil) then Result := TempHandler.Wrap;
|
||||
finally
|
||||
TempHandler := nil;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure cef_browser_process_handler_on_schedule_message_pump_work(self : PCefBrowserProcessHandler;
|
||||
delay_ms : Int64); stdcall;
|
||||
var
|
||||
TempObject : TObject;
|
||||
begin
|
||||
TempObject := CefGetObject(self);
|
||||
|
||||
TempObject := CefGetObject(self);
|
||||
|
||||
if (TempObject <> nil) and
|
||||
(TempObject is TCefBrowserProcessHandlerOwn) then
|
||||
TCefBrowserProcessHandlerOwn(TempObject).OnScheduleMessagePumpWork(delay_ms);
|
||||
@@ -201,16 +137,16 @@ var
|
||||
TempClient : ICefClient;
|
||||
begin
|
||||
Result := nil;
|
||||
TempObject := CefGetObject(self);
|
||||
|
||||
TempObject := CefGetObject(self);
|
||||
|
||||
if (TempObject <> nil) and
|
||||
(TempObject is TCefBrowserProcessHandlerOwn) then
|
||||
try
|
||||
TempClient := nil;
|
||||
TCefBrowserProcessHandlerOwn(TempObject).GetDefaultClient(TempClient);
|
||||
if (TempClient <> nil) then Result := TempClient.Wrap;
|
||||
finally
|
||||
TempClient := nil;
|
||||
if (TempClient <> nil) then Result := TempClient.Wrap;
|
||||
finally
|
||||
TempClient := nil;
|
||||
end;
|
||||
end;
|
||||
|
||||
@@ -220,114 +156,78 @@ begin
|
||||
|
||||
with PCefBrowserProcessHandler(FData)^ do
|
||||
begin
|
||||
get_cookieable_schemes := {$IFDEF FPC}@{$ENDIF}cef_browser_process_handler_get_cookieable_schemes;
|
||||
on_context_initialized := {$IFDEF FPC}@{$ENDIF}cef_browser_process_handler_on_context_initialized;
|
||||
on_before_child_process_launch := {$IFDEF FPC}@{$ENDIF}cef_browser_process_handler_on_before_child_process_launch;
|
||||
get_print_handler := {$IFDEF FPC}@{$ENDIF}cef_browser_process_handler_get_print_handler;
|
||||
on_schedule_message_pump_work := {$IFDEF FPC}@{$ENDIF}cef_browser_process_handler_on_schedule_message_pump_work;
|
||||
get_default_client := {$IFDEF FPC}@{$ENDIF}cef_browser_process_handler_get_default_client;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TCefBrowserProcessHandlerOwn.GetPrintHandler(var aHandler : ICefPrintHandler);
|
||||
begin
|
||||
aHandler := nil;
|
||||
end;
|
||||
|
||||
procedure TCefBrowserProcessHandlerOwn.GetDefaultClient(var aClient : ICefClient);
|
||||
begin
|
||||
aClient := nil;
|
||||
aClient := nil;
|
||||
end;
|
||||
|
||||
|
||||
// TCefCustomBrowserProcessHandler
|
||||
|
||||
|
||||
constructor TCefCustomBrowserProcessHandler.Create(const aCefApp : TCefApplicationCore);
|
||||
begin
|
||||
inherited Create;
|
||||
|
||||
FCefApp := aCefApp;
|
||||
|
||||
if (FCefApp <> nil) and FCefApp.MustCreatePrintHandler then
|
||||
FPrintHandler := TCustomPrintHandler.Create(FCefApp)
|
||||
else
|
||||
FPrintHandler := nil;
|
||||
end;
|
||||
|
||||
destructor TCefCustomBrowserProcessHandler.Destroy;
|
||||
begin
|
||||
RemoveReferences;
|
||||
|
||||
inherited Destroy;
|
||||
end;
|
||||
|
||||
|
||||
procedure TCefCustomBrowserProcessHandler.RemoveReferences;
|
||||
begin
|
||||
if (FPrintHandler <> nil) then
|
||||
FPrintHandler.RemoveReferences;
|
||||
|
||||
FCefApp := nil;
|
||||
FPrintHandler := nil;
|
||||
|
||||
|
||||
procedure TCefCustomBrowserProcessHandler.GetCookieableSchemes(var schemes : TStringList;
|
||||
constructor TCefCustomBrowserProcessHandler.Create(const aCefApp : TCefApplicationCore);
|
||||
begin
|
||||
begin
|
||||
try
|
||||
if (FCefApp <> nil) then FCefApp.Internal_GetCookieableSchemes(schemes, include_defaults);
|
||||
except
|
||||
on e : exception do
|
||||
if CustomExceptionHandler('TCefCustomBrowserProcessHandler.GetCookieableSchemes', e) then raise;
|
||||
inherited Create;
|
||||
|
||||
FCefApp := aCefApp;
|
||||
end;
|
||||
|
||||
destructor TCefCustomBrowserProcessHandler.Destroy;
|
||||
begin
|
||||
RemoveReferences;
|
||||
|
||||
inherited Destroy;
|
||||
end;
|
||||
procedure TCefCustomBrowserProcessHandler.RemoveReferences;
|
||||
begin
|
||||
FCefApp := nil;
|
||||
end;
|
||||
|
||||
procedure TCefCustomBrowserProcessHandler.OnContextInitialized;
|
||||
procedure TCefCustomBrowserProcessHandler.OnContextInitialized;
|
||||
begin
|
||||
try
|
||||
if (FCefApp <> nil) then FCefApp.Internal_OnContextInitialized;
|
||||
except
|
||||
on e : exception do
|
||||
if CustomExceptionHandler('TCefCustomBrowserProcessHandler.OnContextInitialized', e) then raise;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TCefCustomBrowserProcessHandler.OnBeforeChildProcessLaunch(const commandLine: ICefCommandLine);
|
||||
begin
|
||||
try
|
||||
if (FCefApp <> nil) then FCefApp.Internal_OnBeforeChildProcessLaunch(commandLine);
|
||||
except
|
||||
on e : exception do
|
||||
if CustomExceptionHandler('TCefCustomBrowserProcessHandler.OnBeforeChildProcessLaunch', e) then raise;
|
||||
end;
|
||||
end;
|
||||
|
||||
begin
|
||||
begin
|
||||
if (FPrintHandler <> nil) then
|
||||
aHandler := FPrintHandler
|
||||
else
|
||||
inherited GetPrintHandler(aHandler);
|
||||
end;
|
||||
|
||||
procedure TCefCustomBrowserProcessHandler.OnScheduleMessagePumpWork(const delayMs: Int64);
|
||||
begin
|
||||
try
|
||||
if (FCefApp <> nil) then FCefApp.Internal_OnScheduleMessagePumpWork(delayMs);
|
||||
except
|
||||
on e : exception do
|
||||
if CustomExceptionHandler('TCefCustomBrowserProcessHandler.OnScheduleMessagePumpWork', e) then raise;
|
||||
try
|
||||
if (FCefApp <> nil) then FCefApp.Internal_OnContextInitialized;
|
||||
except
|
||||
on e : exception do
|
||||
if CustomExceptionHandler('TCefCustomBrowserProcessHandler.OnContextInitialized', e) then raise;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TCefCustomBrowserProcessHandler.OnBeforeChildProcessLaunch(const commandLine: ICefCommandLine);
|
||||
begin
|
||||
try
|
||||
if (FCefApp <> nil) then FCefApp.Internal_OnBeforeChildProcessLaunch(commandLine);
|
||||
except
|
||||
on e : exception do
|
||||
if CustomExceptionHandler('TCefCustomBrowserProcessHandler.OnBeforeChildProcessLaunch', e) then raise;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TCefCustomBrowserProcessHandler.OnScheduleMessagePumpWork(const delayMs: Int64);
|
||||
begin
|
||||
try
|
||||
if (FCefApp <> nil) then FCefApp.Internal_OnScheduleMessagePumpWork(delayMs);
|
||||
except
|
||||
on e : exception do
|
||||
if CustomExceptionHandler('TCefCustomBrowserProcessHandler.OnScheduleMessagePumpWork', e) then raise;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TCefCustomBrowserProcessHandler.GetDefaultClient(var aClient : ICefClient);
|
||||
begin
|
||||
begin
|
||||
try
|
||||
if (FCefApp <> nil) then FCefApp.Internal_GetDefaultClient(aClient);
|
||||
except
|
||||
on e : exception do
|
||||
if CustomExceptionHandler('TCefCustomBrowserProcessHandler.GetDefaultClient', e) then raise;
|
||||
try
|
||||
if (FCefApp <> nil) then FCefApp.Internal_GetDefaultClient(aClient);
|
||||
except
|
||||
on e : exception do
|
||||
if CustomExceptionHandler('TCefCustomBrowserProcessHandler.GetDefaultClient', e) then raise;
|
||||
end;
|
||||
end;
|
||||
|
||||
end.
|
||||
|
||||
Reference in New Issue
Block a user