pascal/CEF4Delphi
1
0
Fork 0
mirror of https://github.com/salvadordf/CEF4Delphi.git synced 2025-02-02 10:25:26 +02:00
Code Issues Actions Releases Activity

uCEFApplicationCore is a VCL-free implementation (no Controls/Forms units, no Application object).

Browse Source 
The old uCEFApplication.pas is renamed to uCEFApplicationCore.pas and a new uCEFApplication.pas is created that only contains the Controls/Forms unit related code and is backward compatible to existing code.

This allows the creation of a SubProcess executable that doesn't initialize the VCL with all its problems (GlobalAtom leak in Delphi 6-XE, Application.Handle, OleInitialize and other unnecessary init-code).

ujCEFMiscFunctions.GefCursorToWindowsCursor is renamed to >>C<<efCursorToWindowsCursor and moved to uCEFApplication.pas to prevent the inclusion of the Controls unit in Delphi 7-XE.
This commit is contained in:
Andreas Hausladen 2019-11-08 23:15:53 +01:00
parent 473170529e
commit 4cdb8207c6
34 changed files with 2848 additions and 2681 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/Delphi_FMX/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.pas
View File

@ -530,7 +530,7 @@ procedure TFMXExternalPumpBrowserFrm.chrmosrCursorChange(Sender : TObject;
cursorType : TCefCursorType;
const customCursorInfo : PCefCursorInfo);
begin
Panel1.Cursor := GefCursorToWindowsCursor(cursorType);
Panel1.Cursor := CefCursorToWindowsCursor(cursorType);
end;
procedure TFMXExternalPumpBrowserFrm.chrmosrGetScreenInfo(Sender : TObject;

2
demos/Delphi_VCL/ConsoleBrowser/uWebBrowser.pas
View File

@ -307,7 +307,7 @@ procedure TWebBrowserFrm.chrmosrCursorChange( Sender : TObject;
cursorType : TCefCursorType;
const customCursorInfo : PCefCursorInfo);
begin
Panel1.Cursor := GefCursorToWindowsCursor(cursorType);
Panel1.Cursor := CefCursorToWindowsCursor(cursorType);
end;
procedure TWebBrowserFrm.chrmosrGetScreenInfo( Sender : TObject;

2
demos/Delphi_VCL/KioskOSRBrowser/uKioskOSRBrowser.pas
View File

@ -365,7 +365,7 @@ procedure TForm1.chrmosrCursorChange( Sender : TObject;
cursorType : TCefCursorType;
const customCursorInfo : PCefCursorInfo);
begin
Panel1.Cursor := GefCursorToWindowsCursor(cursorType);
Panel1.Cursor := CefCursorToWindowsCursor(cursorType);
end;
procedure TForm1.chrmosrGetScreenInfo( Sender : TObject;

2
demos/Delphi_VCL/OSRExternalPumpBrowser/uOSRExternalPumpBrowser.pas
View File

@ -358,7 +358,7 @@ procedure TOSRExternalPumpBrowserFrm.chrmosrCursorChange(Sender : TObject;
cursorType : TCefCursorType;
const customCursorInfo : PCefCursorInfo);
begin
Panel1.Cursor := GefCursorToWindowsCursor(cursorType);
Panel1.Cursor := CefCursorToWindowsCursor(cursorType);
end;
procedure TOSRExternalPumpBrowserFrm.chrmosrGetScreenInfo(Sender : TObject;

2
demos/Delphi_VCL/PopupBrowser/uChildForm.pas
View File

@ -360,7 +360,7 @@ procedure TChildForm.Chromium1CursorChange(Sender : TObject;
cursorType : TCefCursorType;
const customCursorInfo : PCefCursorInfo);
begin
Panel1.Cursor := GefCursorToWindowsCursor(cursorType);
Panel1.Cursor := CefCursorToWindowsCursor(cursorType);
end;
procedure TChildForm.Chromium1GetScreenInfo(Sender : TObject;

2
demos/Delphi_VCL/SimpleOSRBrowser/uSimpleOSRBrowser.pas
View File

@ -358,7 +358,7 @@ procedure TForm1.chrmosrCursorChange(Sender : TObject;
cursorType : TCefCursorType;
const customCursorInfo : PCefCursorInfo);
begin
Panel1.Cursor := GefCursorToWindowsCursor(cursorType);
Panel1.Cursor := CefCursorToWindowsCursor(cursorType);
end;
procedure TForm1.chrmosrGetScreenInfo(Sender : TObject;

4
demos/Delphi_VCL/SubProcess/SubProcess.dpr
View File

@ -45,14 +45,14 @@ uses
{$ELSE}
Windows,
{$ENDIF}
uCEFApplication;
uCEFApplicationCore;
// CEF3 needs to set the LARGEADDRESSAWARE flag which allows 32-bit processes
// to use up to 3GB of RAM.
{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}
begin
GlobalCEFApp := TCefApplication.Create;
GlobalCEFApp := TCefApplicationCore.Create;
// The main process and the subprocess *MUST* have the same GlobalCEFApp
// properties and events, specially FrameworkDirPath, ResourcesDirPath,

2
demos/Lazarus/PopupBrowser/uChildForm.pas
View File

@ -290,7 +290,7 @@ procedure TChildForm.chrmosrCursorChange(Sender : TObject;
cursorType : TCefCursorType;
const customCursorInfo : PCefCursorInfo);
begin
Panel1.Cursor := GefCursorToWindowsCursor(cursorType);
Panel1.Cursor := CefCursorToWindowsCursor(cursorType);
end;
procedure TChildForm.chrmosrGetScreenInfo(Sender : TObject;

2
demos/Lazarus/SimpleOSRBrowser/usimplelazosrbrowser.pas
View File

@ -306,7 +306,7 @@ procedure TForm1.chrmosrCursorChange(Sender : TObject;
cursorType : TCefCursorType;
const customCursorInfo : PCefCursorInfo);
begin
Panel1.Cursor := GefCursorToWindowsCursor(cursorType);
Panel1.Cursor := CefCursorToWindowsCursor(cursorType);
end;
procedure TForm1.chrmosrGetScreenInfo(Sender : TObject;

4
demos/Lazarus/SubProcess/SubProcess.lpr
View File

@ -43,14 +43,14 @@ program SubProcess;
uses
LCLIntf, LCLType, LMessages, Forms, Interfaces,
uCEFApplication;
uCEFApplicationCore;
// CEF3 needs to set the LARGEADDRESSAWARE flag which allows 32-bit processes
// to use up to 3GB of RAM.
{$SetPEFlags $20}
begin
GlobalCEFApp := TCefApplication.Create;
GlobalCEFApp := TCefApplicationCore.Create;
// The main process and the subprocess *MUST* have the same GlobalCEFApp
// properties and events, specially FrameworkDirPath, ResourcesDirPath,

10
source/uCEFApp.pas
View File

@ -54,7 +54,7 @@ uses
{$ELSE}
Classes,
{$ENDIF}
uCEFTypes, uCEFInterfaces, uCEFBaseRefCounted, uCEFSchemeRegistrar, uCEFApplication;
uCEFTypes, uCEFInterfaces, uCEFBaseRefCounted, uCEFSchemeRegistrar, uCEFApplicationCore;
type
TCefAppOwn = class(TCefBaseRefCountedOwn, ICefApp)
@ -71,7 +71,7 @@ type
TCustomCefApp = class(TCefAppOwn)
protected
FCefApp : TCefApplication;
FCefApp : TCefApplicationCore;
FResourceBundleHandler : ICefResourceBundleHandler;
FBrowserProcessHandler : ICefBrowserProcessHandler;
FRenderProcessHandler : ICefRenderProcessHandler;
@ -85,7 +85,7 @@ type
procedure InitializeVars;
public
constructor Create(const aCefApp : TCefApplication); reintroduce;
constructor Create(const aCefApp : TCefApplicationCore); reintroduce;
procedure BeforeDestruction; override;
end;
@ -98,7 +98,7 @@ uses
{$ELSE}
SysUtils,
{$ENDIF}
uCEFLibFunctions, uCEFMiscFunctions, uCEFCommandLine, uCEFConstants,
uCEFMiscFunctions, uCEFCommandLine, uCEFConstants,
uCEFBrowserProcessHandler, uCEFResourceBundleHandler, uCEFRenderProcessHandler;
@ -212,7 +212,7 @@ end;
// TCustomCefApp
constructor TCustomCefApp.Create(const aCefApp : TCefApplication);
constructor TCustomCefApp.Create(const aCefApp : TCefApplicationCore);
begin
inherited Create;

2690
source/uCEFApplication.pas
View File

File diff suppressed because it is too large Load Diff

2678
source/uCEFApplicationCore.pas Normal file
View File

File diff suppressed because it is too large Load Diff

2
source/uCEFBaseRefCounted.pas
View File

@ -102,7 +102,7 @@ type
implementation
uses
uCEFTypes, uCEFMiscFunctions, uCEFConstants, uCEFApplication;
uCEFTypes, uCEFMiscFunctions;
// ***********************************************

8
source/uCEFBrowserProcessHandler.pas
View File

@ -49,7 +49,7 @@ unit uCEFBrowserProcessHandler;
interface
uses
uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes, uCEFApplication;
uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes, uCEFApplicationCore;
type
TCefBrowserProcessHandlerOwn = class(TCefBaseRefCountedOwn, ICefBrowserProcessHandler)
@ -66,7 +66,7 @@ type
TCefCustomBrowserProcessHandler = class(TCefBrowserProcessHandlerOwn)
protected
FCefApp : TCefApplication;
FCefApp : TCefApplicationCore;
procedure OnContextInitialized; override;
procedure OnBeforeChildProcessLaunch(const commandLine: ICefCommandLine); override;
@ -74,7 +74,7 @@ type
procedure OnScheduleMessagePumpWork(const delayMs: Int64); override;
public
constructor Create(const aCefApp : TCefApplication); reintroduce;
constructor Create(const aCefApp : TCefApplicationCore); reintroduce;
destructor Destroy; override;
end;
@ -171,7 +171,7 @@ end;
// TCefCustomBrowserProcessHandler
constructor TCefCustomBrowserProcessHandler.Create(const aCefApp : TCefApplication);
constructor TCefCustomBrowserProcessHandler.Create(const aCefApp : TCefApplicationCore);
begin
inherited Create;

2
source/uCEFBufferPanel.pas
View File

@ -234,7 +234,7 @@ procedure Register;
implementation
uses
uCEFMiscFunctions, uCEFApplication;
uCEFMiscFunctions, uCEFApplicationCore;
constructor TBufferPanel.Create(AOwner: TComponent);
begin

2
source/uCEFChromium.pas
View File

@ -899,7 +899,7 @@ uses
SysUtils, Math,
{$ENDIF}
uCEFBrowser, uCEFValue, uCEFDictionaryValue, uCEFStringMultimap, uCEFFrame,
uCEFApplication, uCEFProcessMessage, uCEFRequestContext, {$IFNDEF FPC}uCEFOLEDragAndDrop,{$ENDIF}
uCEFApplicationCore, uCEFProcessMessage, uCEFRequestContext, {$IFNDEF FPC}uCEFOLEDragAndDrop,{$ENDIF}
uCEFPDFPrintCallback, uCEFResolveCallback, uCEFDeleteCookiesCallback, uCEFStringVisitor,
uCEFListValue, uCEFNavigationEntryVisitor, uCEFDownloadImageCallBack, uCEFCookieManager,
uCEFRequestContextHandler, uCEFCookieVisitor, uCEFSetCookieCallback, uCEFResourceRequestHandler;

2
source/uCEFClient.pas
View File

@ -150,7 +150,7 @@ uses
uCEFFocusHandler, uCEFContextMenuHandler, uCEFDialogHandler, uCEFKeyboardHandler,
uCEFDisplayHandler, uCEFDownloadHandler, uCEFJsDialogHandler,
uCEFLifeSpanHandler, uCEFRequestHandler, uCEFRenderHandler, uCEFDragHandler,
uCEFFindHandler, uCEFConstants, uCEFApplication, uCEFFrame;
uCEFFindHandler, uCEFConstants, uCEFApplicationCore, uCEFFrame;
// ******************************************************

4
source/uCEFDragAndDropMgr.pas
View File

@ -48,10 +48,10 @@ interface
uses
{$IFDEF DELPHI16_UP}
{$IFDEF MSWINDOWS}WinApi.Windows, WinApi.ActiveX, WinApi.ShlObj, WinApi.ShellApi,{$ENDIF}
System.Classes, Vcl.Controls, System.SysUtils, System.Math, System.StrUtils, System.AnsiStrings,
System.Classes, System.SysUtils, System.Math, System.StrUtils, System.AnsiStrings,
{$ELSE}
{$IFDEF MSWINDOWS}Windows, ActiveX, ShlObj, Shellapi,{$ENDIF}
Classes, Controls, SysUtils, Math, StrUtils, {$IFDEF DELPHI12_UP}AnsiStrings,{$ENDIF}
Classes, SysUtils, Math, StrUtils, {$IFDEF DELPHI12_UP}AnsiStrings,{$ENDIF}
{$ENDIF}
uCEFDragData, uCEFInterfaces, uCEFTypes, uCEFOLEDragAndDrop;

2
source/uCEFFMXBufferPanel.pas
View File

@ -153,7 +153,7 @@ implementation
uses
System.SysUtils, System.Math,
FMX.Platform, uCEFMiscFunctions, uCEFApplication;
FMX.Platform, uCEFMiscFunctions, uCEFApplicationCore;
constructor TFMXBufferPanel.Create(AOwner: TComponent);
begin

2
source/uCEFFMXChromium.pas
View File

@ -848,7 +848,7 @@ implementation
uses
System.SysUtils, System.Math,
uCEFBrowser, uCEFValue, uCEFDictionaryValue, uCEFStringMultimap, uCEFFrame,
uCEFApplication, uCEFProcessMessage, uCEFRequestContext, uCEFCookieManager,
uCEFApplicationCore, uCEFProcessMessage, uCEFRequestContext, uCEFCookieManager,
uCEFPDFPrintCallback, uCEFResolveCallback, uCEFDeleteCookiesCallback, uCEFStringVisitor,
uCEFListValue, uCEFNavigationEntryVisitor, uCEFDownloadImageCallBack,
uCEFRequestContextHandler, uCEFCookieVisitor, uCEFSetCookieCallback,

2
source/uCEFFMXWorkScheduler.pas
View File

@ -110,7 +110,7 @@ implementation
uses
{$IFDEF MSWINDOWS}WinApi.Windows,{$ENDIF} System.SysUtils, System.Math,
FMX.Platform, FMX.Platform.Win, FMX.Forms,
uCEFMiscFunctions, uCEFApplication;
uCEFMiscFunctions, uCEFApplicationCore;
procedure DestroyGlobalFMXWorkScheduler;
begin

8
source/uCEFLoadHandler.pas
View File

@ -49,7 +49,7 @@ unit uCEFLoadHandler;
interface
uses
uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes, uCEFApplication;
uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes, uCEFApplicationCore;
type
TCefLoadHandlerOwn = class(TCefBaseRefCountedOwn, ICefLoadHandler)
@ -83,7 +83,7 @@ type
TCustomRenderLoadHandler = class(TCefLoadHandlerOwn)
protected
FCefApp : TCefApplication;
FCefApp : TCefApplicationCore;
procedure OnLoadingStateChange(const browser: ICefBrowser; isLoading, canGoBack, canGoForward: Boolean); override;
procedure OnLoadStart(const browser: ICefBrowser; const frame: ICefFrame; transitionType: TCefTransitionType); override;
@ -91,7 +91,7 @@ type
procedure OnLoadError(const browser: ICefBrowser; const frame: ICefFrame; errorCode: TCefErrorCode; const errorText, failedUrl: ustring); override;
public
constructor Create(const aCefApp : TCefApplication); reintroduce; virtual;
constructor Create(const aCefApp : TCefApplicationCore); reintroduce; virtual;
destructor Destroy; override;
end;
@ -264,7 +264,7 @@ end;
// TCustomRenderLoadHandler
constructor TCustomRenderLoadHandler.Create(const aCefApp : TCefApplication);
constructor TCustomRenderLoadHandler.Create(const aCefApp : TCefApplicationCore);
begin
inherited Create;

42
source/uCEFMiscFunctions.pas
View File

@ -52,8 +52,8 @@ uses
{$IFDEF DELPHI16_UP}
{$IFDEF MSWINDOWS}WinApi.Windows, WinApi.ActiveX,{$ENDIF} System.IOUtils, System.Classes, System.SysUtils, System.UITypes, System.Math,
{$ELSE}
{$IFDEF MSWINDOWS}Windows, ActiveX,{$ENDIF} {$IFDEF DELPHI14_UP}IOUtils,{$ENDIF} Classes, SysUtils, Controls, Graphics, Math,
{$IFDEF FPC}LCLType,{$IFNDEF MSWINDOWS}InterfaceBase, Forms,{$ENDIF}{$ENDIF}
{$IFDEF MSWINDOWS}Windows, ActiveX,{$ENDIF} {$IFDEF DELPHI14_UP}IOUtils,{$ENDIF} Classes, SysUtils, Math,
{$IFDEF FPC}LCLType,{$IFNDEF MSWINDOWS}InterfaceBase,{$ENDIF}{$ENDIF}
{$ENDIF}
uCEFTypes, uCEFInterfaces, uCEFLibFunctions, uCEFResourceHandler,
uCEFRegisterCDMCallback, uCEFConstants;
@ -223,7 +223,6 @@ function CefIsKeyToggled(aWparam : WPARAM) : boolean;
function GetCefMouseModifiers : TCefEventFlags; overload;
function GetCefMouseModifiers(awparam : WPARAM) : TCefEventFlags; overload;
function GetCefKeyboardModifiers(aWparam : WPARAM; aLparam : LPARAM) : TCefEventFlags;
function GefCursorToWindowsCursor(aCefCursor : TCefCursorType) : TCursor;
procedure DropEffectToDragOperation(aEffect : Longint; var aAllowedOps : TCefDragOperations);
procedure DragOperationToDropEffect(const aDragOperations : TCefDragOperations; var aEffect: Longint);
@ -248,7 +247,7 @@ function CefGetDataURI(aData : pointer; aSize : integer; const aMimeType : ustri
implementation
uses
uCEFApplication, uCEFSchemeHandlerFactory, uCEFValue,
uCEFApplicationCore, uCEFSchemeHandlerFactory, uCEFValue,
uCEFBinaryValue, uCEFStringList;
function CefColorGetA(color: TCefColor): Byte;
@ -1929,41 +1928,6 @@ begin
end;
end;
function GefCursorToWindowsCursor(aCefCursor : TCefCursorType) : TCursor;
begin
case aCefCursor of
CT_POINTER : Result := crArrow;
CT_CROSS : Result := crCross;
CT_HAND : Result := crHandPoint;
CT_IBEAM : Result := crIBeam;
CT_WAIT : Result := crHourGlass;
CT_HELP : Result := crHelp;
CT_EASTRESIZE : Result := crSizeWE;
CT_NORTHRESIZE : Result := crSizeNS;
CT_NORTHEASTRESIZE : Result := crSizeNESW;
CT_NORTHWESTRESIZE : Result := crSizeNWSE;
CT_SOUTHRESIZE : Result := crSizeNS;
CT_SOUTHEASTRESIZE : Result := crSizeNWSE;
CT_SOUTHWESTRESIZE : Result := crSizeNESW;
CT_WESTRESIZE : Result := crSizeWE;
CT_NORTHSOUTHRESIZE : Result := crSizeNS;
CT_EASTWESTRESIZE : Result := crSizeWE;
CT_NORTHEASTSOUTHWESTRESIZE : Result := crSizeNESW;
CT_NORTHWESTSOUTHEASTRESIZE : Result := crSizeNWSE;
CT_COLUMNRESIZE : Result := crHSplit;
CT_ROWRESIZE : Result := crVSplit;
CT_MOVE : Result := crSizeAll;
CT_PROGRESS : Result := crAppStart;
CT_NONE : Result := crNone;
CT_NODROP,
CT_NOTALLOWED : Result := crNo;
CT_GRAB,
CT_GRABBING : Result := crDrag;
else Result := crDefault;
end;
end;
procedure DropEffectToDragOperation(aEffect: Longint; var aAllowedOps : TCefDragOperations);
begin
aAllowedOps := DRAG_OPERATION_NONE;

8
source/uCEFRegisterCDMCallback.pas
View File

@ -49,7 +49,7 @@ unit uCEFRegisterCDMCallback;
interface
uses
uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes, uCEFApplication;
uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes, uCEFApplicationCore;
type
TCefRegisterCDMCallbackOwn = class(TCefBaseRefCountedOwn, ICefRegisterCDMCallback)
@ -72,12 +72,12 @@ type
TCefCustomRegisterCDMCallback = class(TCefRegisterCDMCallbackOwn)
protected
FCefApp : TCefApplication;
FCefApp : TCefApplicationCore;
procedure OnCDMRegistrationComplete(result: TCefCDMRegistrationError; const error_message: ustring); override;
public
constructor Create(const aCefApp : TCefApplication); reintroduce;
constructor Create(const aCefApp : TCefApplicationCore); reintroduce;
destructor Destroy; override;
end;
@ -147,7 +147,7 @@ end;
// ************************************************
constructor TCefCustomRegisterCDMCallback.Create(const aCefApp : TCefApplication);
constructor TCefCustomRegisterCDMCallback.Create(const aCefApp : TCefApplicationCore);
begin
inherited Create;

8
source/uCEFRenderProcessHandler.pas
View File

@ -55,7 +55,7 @@ uses
Classes,
{$ENDIF}
uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes, uCEFListValue, uCEFBrowser, uCEFFrame, uCEFRequest,
uCEFv8Context, uCEFv8Exception, uCEFv8StackTrace, uCEFDomNode, uCEFProcessMessage, uCEFApplication;
uCEFv8Context, uCEFv8Exception, uCEFv8StackTrace, uCEFDomNode, uCEFProcessMessage, uCEFApplicationCore;
type
TCefRenderProcessHandlerOwn = class(TCefBaseRefCountedOwn, ICefRenderProcessHandler)
@ -77,7 +77,7 @@ type
TCefCustomRenderProcessHandler = class(TCefRenderProcessHandlerOwn)
protected
FCefApp : TCefApplication;
FCefApp : TCefApplicationCore;
FLoadHandler : ICefLoadHandler;
procedure OnRenderThreadCreated(const extraInfo: ICefListValue); override;
@ -92,7 +92,7 @@ type
function OnProcessMessageReceived(const browser: ICefBrowser; const frame: ICefFrame; sourceProcess: TCefProcessId; const aMessage : ICefProcessMessage): Boolean; override;
public
constructor Create(const aCefApp : TCefApplication); reintroduce;
constructor Create(const aCefApp : TCefApplicationCore); reintroduce;
destructor Destroy; override;
end;
@ -284,7 +284,7 @@ end;
// TCefCustomRenderProcessHandler
constructor TCefCustomRenderProcessHandler.Create(const aCefApp : TCefApplication);
constructor TCefCustomRenderProcessHandler.Create(const aCefApp : TCefApplicationCore);
begin
inherited Create;

2
source/uCEFRequestHandler.pas
View File

@ -102,7 +102,7 @@ uses
{$ENDIF}
uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser, uCEFFrame, uCEFRequest, uCEFRequestCallback,
uCEFResponse, uCEFAuthCallback, uCEFSslInfo, uCEFSelectClientCertificateCallback, uCEFX509Certificate,
uCEFApplication;
uCEFApplicationCore;
function cef_request_handler_on_before_browse(self : PCefRequestHandler;
browser : PCefBrowser;

8
source/uCEFResourceBundleHandler.pas
View File

@ -49,7 +49,7 @@ unit uCEFResourceBundleHandler;
interface
uses
uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes, uCEFApplication;
uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes, uCEFApplicationCore;
type
TCefResourceBundleHandlerOwn = class(TCefBaseRefCountedOwn, ICefResourceBundleHandler)
@ -64,14 +64,14 @@ type
TCefCustomResourceBundleHandler = class(TCefResourceBundleHandlerOwn)
protected
FCefApp : TCefApplication;
FCefApp : TCefApplicationCore;
function GetLocalizedString(stringid: Integer; var stringVal: ustring): Boolean; override;
function GetDataResource(resourceId: Integer; var data: Pointer; var dataSize: NativeUInt): Boolean; override;
function GetDataResourceForScale(resourceId: Integer; scaleFactor: TCefScaleFactor; var data: Pointer; var dataSize: NativeUInt): Boolean; override;
public
constructor Create(const aCefApp : TCefApplication); reintroduce;
constructor Create(const aCefApp : TCefApplicationCore); reintroduce;
destructor Destroy; override;
end;
@ -149,7 +149,7 @@ end;
// TCefCustomResourceBundleHandler
constructor TCefCustomResourceBundleHandler.Create(const aCefApp : TCefApplication);
constructor TCefCustomResourceBundleHandler.Create(const aCefApp : TCefApplicationCore);
begin
inherited Create;

2
source/uCEFSentinel.pas
View File

@ -131,7 +131,7 @@ procedure Register;
implementation
uses
uCEFLibFunctions, uCEFApplication, uCEFMiscFunctions, uCEFConstants;
uCEFLibFunctions, uCEFApplicationCore, uCEFMiscFunctions, uCEFConstants;
constructor TCEFSentinel.Create(AOwner: TComponent);
begin

6
source/uCEFServerComponent.pas
View File

@ -51,9 +51,9 @@ interface
uses
{$IFDEF DELPHI16_UP}
{$IFDEF MSWINDOWS}WinApi.Windows, WinApi.Messages, WinApi.ActiveX,{$ENDIF}
System.Classes, Vcl.Controls, Vcl.Graphics, Vcl.Forms, System.Math,
System.Classes, System.Math,
{$ELSE}
{$IFDEF MSWINDOWS}Windows, ActiveX,{$ENDIF} Classes, Forms, Controls, Graphics, Math,
{$IFDEF MSWINDOWS}Windows, ActiveX,{$ENDIF} Classes, Math,
{$IFDEF FPC}
LCLProc, LCLType, LCLIntf, LResources, LMessages, InterfaceBase,
{$ELSE}
@ -167,7 +167,7 @@ procedure Register;
implementation
uses
uCEFLibFunctions, uCEFApplication, uCEFMiscFunctions;
uCEFLibFunctions, uCEFApplicationCore, uCEFMiscFunctions;
// For more information about the TCEFServerComponent properties and functions
// read the code comments in the CEF source file /include/capi/cef_server_cap.h

4
source/uCEFUrlRequestClientComponent.pas
View File

@ -51,9 +51,9 @@ interface
uses
{$IFDEF DELPHI16_UP}
{$IFDEF MSWINDOWS}WinApi.Windows, WinApi.Messages, WinApi.ActiveX,{$ENDIF}
System.Classes, Vcl.Controls, Vcl.Graphics, Vcl.Forms, System.Math,
System.Classes, System.Math,
{$ELSE}
{$IFDEF MSWINDOWS}Windows, ActiveX,{$ENDIF} Classes, Forms, Controls, Graphics, Math,
{$IFDEF MSWINDOWS}Windows, ActiveX,{$ENDIF} Classes, Math,
{$IFDEF FPC}
LCLProc, LCLType, LCLIntf, LResources, LMessages, InterfaceBase,
{$ELSE}

6
source/uCEFWorkScheduler.pas
View File

@ -50,9 +50,9 @@ interface
uses
{$IFDEF DELPHI16_UP}
{$IFDEF MSWINDOWS}WinApi.Windows, WinApi.Messages,{$ENDIF} System.Classes, Vcl.Controls, Vcl.Graphics, Vcl.Forms,
{$IFDEF MSWINDOWS}WinApi.Windows, WinApi.Messages,{$ENDIF} System.Classes,
{$ELSE}
{$IFDEF MSWINDOWS}Windows,{$ENDIF} Classes, Forms, Controls, Graphics,
{$IFDEF MSWINDOWS}Windows,{$ENDIF} Classes,
{$IFDEF FPC}
LCLProc, LCLType, LCLIntf, LResources, LMessages, InterfaceBase,
{$ELSE}
@ -133,7 +133,7 @@ uses
{$ELSE}
SysUtils, Math,
{$ENDIF}
uCEFMiscFunctions, uCEFApplication, uCEFTypes;
uCEFMiscFunctions, uCEFApplicationCore, uCEFTypes;
procedure DestroyGlobalCEFWorkScheduler;
begin

5
source/uCEFWorkSchedulerThread.pas
View File

@ -89,11 +89,10 @@ implementation
uses
{$IFDEF DELPHI16_UP}
System.SysUtils, System.Math,
System.SysUtils, System.Math;
{$ELSE}
SysUtils, Math,
SysUtils, Math;
{$ENDIF}
uCEFApplication;
constructor TCEFWorkSchedulerThread.Create;
begin

2
source/uCEFX509CertPrincipal.pas
View File

@ -81,7 +81,7 @@ uses
{$ELSE}
{$IFDEF MSWINDOWS}Windows,{$ENDIF} SysUtils,
{$ENDIF}
uCEFMiscFunctions, uCEFLibFunctions, uCEFApplication, uCEFStringList;
uCEFMiscFunctions, uCEFStringList;
function TCefX509CertPrincipalRef.GetDisplayName: ustring;
begin