pascal/CEF4Delphi
1
0
Fork 0
mirror of https://github.com/salvadordf/CEF4Delphi.git synced 2025-11-23 21:34:53 +02:00
Code Issues Actions Releases Activity

Library initialization changes

Browse Source 
Now CEF files are checked and the dll functions are loaded when the
application runs, not when the component is loaded in delphi
This commit is contained in:
Salvador Diaz Fau
2017-02-04 18:53:29 +01:00
parent 1e5af60899
commit 894a3e4109
8 changed files with 1311 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/uCEFClient.pas
View File

@@ -112,6 +112,7 @@ type
TVCLClientHandler = class(TCustomClientHandler)
protected
function GetMultithreadApp : boolean;
function GetExternalMessagePump : boolean;
public
constructor Create(const crm: IChromiumEvents; renderer: Boolean); reintroduce;
@@ -119,6 +120,7 @@ type
procedure ReleaseOtherInstances;
property MultithreadApp : boolean read GetMultithreadApp;
property ExternalMessagePump : boolean read GetExternalMessagePump;
end;
implementation
@@ -474,7 +476,7 @@ constructor TVCLClientHandler.Create(const crm: IChromiumEvents; renderer : Bool
begin
inherited Create(crm, renderer);
if not(MultithreadApp) then
if not(MultithreadApp) and not(ExternalMessagePump) then
begin
if (CefInstances = 0) then CefTimer := SetTimer(0, 0, USER_TIMER_MINIMUM, @TimerProc);
InterlockedIncrement(CefInstances);
@@ -483,10 +485,15 @@ end;
destructor TVCLClientHandler.Destroy;
begin
if not(MultithreadApp) then
if not(MultithreadApp) and not(ExternalMessagePump) then
begin
InterlockedDecrement(CefInstances);
if (CefInstances = 0) then KillTimer(0, CefTimer);
if (CefInstances = 0) and (CefTimer <> 0) then
begin
KillTimer(0, CefTimer);
CefTimer := 0;
end;
end;
inherited Destroy;
@@ -521,4 +528,20 @@ begin
end;
end;
function TVCLClientHandler.GetExternalMessagePump : boolean;
begin
Result := True;
try
if (GlobalCEFApp <> nil) then Result := GlobalCEFApp.ExternalMessagePump;
except
on e : exception do
begin
{$IFDEF DEBUG}
OutputDebugString(PWideChar('TVCLClientHandler.GetExternalMessagePump error: ' + e.Message + chr(0)));
{$ENDIF}
end;
end;
end;
end.