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

Removed unused interface and more pointer checks

Browse Source
This commit is contained in:
Salvador Díaz Fau
2017-10-02 17:56:56 +02:00
parent 045fe07e74
commit 659092bb37
8 changed files with 117 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
source/uCEFApplication.pas
View File

@@ -105,8 +105,7 @@ type
FExternalMessagePump : boolean;
FDeleteCache : boolean;
FDeleteCookies : boolean;
FApp : TInternalApp;
FAppIntf : ICefApp;
FInternalApp : TInternalApp;
FCustomCommandLines : TStringList;
FCustomCommandLineValues : TStringList;
FFlashEnabled : boolean;
@@ -353,8 +352,7 @@ begin
FExternalMessagePump := False;
FDeleteCache := False;
FDeleteCookies := False;
FApp := nil;
FAppIntf := nil;
FInternalApp := nil;
FFlashEnabled := True;
FEnableSpellingService := True;
FEnableMediaStream := True;
@@ -397,8 +395,7 @@ destructor TCefApplication.Destroy;
begin
ShutDown;
FAppIntf := nil;
FApp := nil;
FInternalApp := nil;
if (FCustomCommandLines <> nil) then FreeAndNil(FCustomCommandLines);
if (FCustomCommandLineValues <> nil) then FreeAndNil(FCustomCommandLineValues);
@@ -425,17 +422,16 @@ begin
Result := False;
try
if (FApp = nil) then
if (FInternalApp = nil) then
begin
FApp := TInternalApp.Create;
FApp.OnBeforeCommandLineProc := App_OnBeforeCommandLineProc;
FApp.OnRegCustomSchemes := App_OnRegCustomSchemes;
FApp.OnGetResourceBundleHandler := App_OnGetResourceBundleHandler;
FApp.OnGetBrowserProcessHandler := App_OnGetBrowserProcessHandler;
FApp.OnGetRenderProcessHandler := App_OnGetRenderProcessHandler;
FInternalApp := TInternalApp.Create;
FInternalApp.OnBeforeCommandLineProc := App_OnBeforeCommandLineProc;
FInternalApp.OnRegCustomSchemes := App_OnRegCustomSchemes;
FInternalApp.OnGetResourceBundleHandler := App_OnGetResourceBundleHandler;
FInternalApp.OnGetBrowserProcessHandler := App_OnGetBrowserProcessHandler;
FInternalApp.OnGetRenderProcessHandler := App_OnGetRenderProcessHandler;
FAppIntf := FApp as ICefApp;
Result := (FAppIntf <> nil);
Result := True;
end;
except
on e : exception do
@@ -672,10 +668,10 @@ function TCefApplication.ExecuteProcess : integer;
var
TempArgs : TCefMainArgs;
begin
if (FApp <> nil) then
if (FInternalApp <> nil) then
begin
TempArgs.instance := HINSTANCE;
Result := cef_execute_process(@TempArgs, FApp.Wrap, FWindowsSandboxInfo);
Result := cef_execute_process(@TempArgs, FInternalApp.Wrap, FWindowsSandboxInfo);
end
else
Result := 0;
@@ -724,8 +720,8 @@ begin
InitializeSettings(FAppSettings);
Result := (FApp <> nil) and
(cef_initialize(@HInstance, @FAppSettings, FApp.Wrap, FWindowsSandboxInfo) <> 0) and
Result := (FInternalApp <> nil) and
(cef_initialize(@HInstance, @FAppSettings, FInternalApp.Wrap, FWindowsSandboxInfo) <> 0) and
InitializeCookies;
except
on e : exception do