diff --git a/README.md b/README.md index 63ce7bbc..72c6fd15 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,10 @@ CEF4Delphi is an open source project created by Salvador D CEF4Delphi is based on DCEF3, made by Henri Gourvest. The original license of DCEF3 still applies to CEF4Delphi. Read the license terms in the first lines of any *.pas file. -CEF4Delphi uses CEF 78.3.1 which includes Chromium 78.0.3904.87. +CEF4Delphi uses CEF 78.3.4 which includes Chromium 78.0.3904.108. The CEF binaries used by CEF4Delphi are available for download at spotify : -* [32 bits](http://opensource.spotify.com/cefbuilds/cef_binary_78.3.1%2Bg8819d2e%2Bchromium-78.0.3904.87_windows32.tar.bz2) -* [64 bits](http://opensource.spotify.com/cefbuilds/cef_binary_78.3.1%2Bg8819d2e%2Bchromium-78.0.3904.87_windows64.tar.bz2) +* [32 bits](http://opensource.spotify.com/cefbuilds/cef_binary_78.3.4%2Bge17bba6%2Bchromium-78.0.3904.108_windows32.tar.bz2) +* [64 bits](http://opensource.spotify.com/cefbuilds/cef_binary_78.3.4%2Bge17bba6%2Bchromium-78.0.3904.108_windows64.tar.bz2) CEF4Delphi was developed and tested on Delphi 10.3 Rio and it has been tested in Delphi 7, Delphi XE, Delphi 10, Delphi 10.2 and Lazarus 2.0.6/FPC 3.0.4. CEF4Delphi includes VCL, FireMonkey (FMX) and Lazarus components. diff --git a/packages/cef4delphi_lazarus.lpk b/packages/cef4delphi_lazarus.lpk index 83893a83..bc653e33 100644 --- a/packages/cef4delphi_lazarus.lpk +++ b/packages/cef4delphi_lazarus.lpk @@ -21,7 +21,7 @@ - + diff --git a/source/uCEFApplicationCore.pas b/source/uCEFApplicationCore.pas index 0eef890d..27dd1d2c 100644 --- a/source/uCEFApplicationCore.pas +++ b/source/uCEFApplicationCore.pas @@ -62,13 +62,13 @@ uses const CEF_SUPPORTED_VERSION_MAJOR = 78; CEF_SUPPORTED_VERSION_MINOR = 3; - CEF_SUPPORTED_VERSION_RELEASE = 1; + CEF_SUPPORTED_VERSION_RELEASE = 4; CEF_SUPPORTED_VERSION_BUILD = 0; CEF_CHROMEELF_VERSION_MAJOR = 78; CEF_CHROMEELF_VERSION_MINOR = 0; CEF_CHROMEELF_VERSION_RELEASE = 3904; - CEF_CHROMEELF_VERSION_BUILD = 87; + CEF_CHROMEELF_VERSION_BUILD = 108; {$IFDEF MSWINDOWS} LIBCEF_DLL = 'libcef.dll'; diff --git a/source/uCEFChromiumCore.pas b/source/uCEFChromiumCore.pas index f2563c73..0e586b0b 100644 --- a/source/uCEFChromiumCore.pas +++ b/source/uCEFChromiumCore.pas @@ -474,8 +474,8 @@ type function doOnGetScreenInfo(const browser: ICefBrowser; var screenInfo: TCefScreenInfo): Boolean; virtual; procedure doOnPopupShow(const browser: ICefBrowser; show: Boolean); virtual; procedure doOnPopupSize(const browser: ICefBrowser; const rect: PCefRect); virtual; - procedure doOnPaint(const browser: ICefBrowser; kind: TCefPaintElementType; dirtyRectsCount: NativeUInt; const dirtyRects: PCefRectArray; const buffer: Pointer; width, height: Integer); virtual; - procedure doOnAcceleratedPaint(const browser: ICefBrowser; kind: TCefPaintElementType; dirtyRectsCount: NativeUInt; const dirtyRects: PCefRectArray; shared_handle: Pointer); virtual; + procedure doOnPaint(const browser: ICefBrowser; type_: TCefPaintElementType; dirtyRectsCount: NativeUInt; const dirtyRects: PCefRectArray; const buffer: Pointer; width, height: Integer); virtual; + procedure doOnAcceleratedPaint(const browser: ICefBrowser; type_: TCefPaintElementType; dirtyRectsCount: NativeUInt; const dirtyRects: PCefRectArray; shared_handle: Pointer); virtual; procedure doOnCursorChange(const browser: ICefBrowser; cursor: TCefCursorHandle; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo); virtual; function doOnStartDragging(const browser: ICefBrowser; const dragData: ICefDragData; allowedOps: TCefDragOperations; x, y: Integer): Boolean; virtual; procedure doOnUpdateDragCursor(const browser: ICefBrowser; operation: TCefDragOperation); virtual; @@ -486,7 +486,7 @@ type // ICefDragHandler function doOnDragEnter(const browser: ICefBrowser; const dragData: ICefDragData; mask: TCefDragOperations): Boolean; virtual; - procedure doOnDraggableRegionsChanged(const browser: ICefBrowser; const frame: ICefFrame; regionsCount: NativeUInt; regions: PCefDraggableRegionArray); virtual; + procedure doOnDraggableRegionsChanged(const browser: ICefBrowser; const frame: ICefFrame; regionsCount: NativeUInt; const regions: PCefDraggableRegionArray); virtual; // ICefFindHandler procedure doOnFindResult(const browser: ICefBrowser; identifier, count: Integer; const selectionRect: PCefRect; activeMatchOrdinal: Integer; finalUpdate: Boolean); virtual; @@ -1390,11 +1390,11 @@ begin {$ENDIF} end; -function TChromiumCore.CreateBrowser( aParentHandle : TCefWindowHandle; - aParentRect : TRect; - const aWindowName : ustring; - const aContext : ICefRequestContext; - const aExtraInfo : ICefDictionaryValue) : boolean; +function TChromiumCore.CreateBrowser( aParentHandle : TCefWindowHandle; + aParentRect : TRect; + const aWindowName : ustring; + const aContext : ICefRequestContext; + const aExtraInfo : ICefDictionaryValue) : boolean; var TempNewContext, TempGlobalContext : ICefRequestContext; begin @@ -1450,9 +1450,9 @@ begin end; end; -procedure TChromiumCore.InitializeWindowInfo( aParentHandle : TCefWindowHandle; - aParentRect : TRect; - const aWindowName : ustring); +procedure TChromiumCore.InitializeWindowInfo( aParentHandle : TCefWindowHandle; + aParentRect : TRect; + const aWindowName : ustring); begin {$IFDEF MSWINDOWS} if FIsOSR then @@ -1467,9 +1467,9 @@ begin {$ENDIF} end; -procedure TChromiumCore.DefaultInitializeDevToolsWindowInfo(aDevToolsWnd: TCefWindowHandle; - const aClientRect: TRect; - const aWindowName: ustring); +procedure TChromiumCore.DefaultInitializeDevToolsWindowInfo( aDevToolsWnd : TCefWindowHandle; + const aClientRect : TRect; + const aWindowName : ustring); begin {$IFDEF MSWINDOWS} if (aDevToolsWnd <> 0) then @@ -1619,11 +1619,11 @@ begin if Initialized then FBrowser.Host.CloseBrowser(aForceClose); end; -function TChromiumCore.CreateBrowserHost( aWindowInfo : PCefWindowInfo; - const aURL : ustring; - const aSettings : PCefBrowserSettings; - const aExtraInfo : ICefDictionaryValue; - const aContext : ICefRequestContext): boolean; +function TChromiumCore.CreateBrowserHost( aWindowInfo : PCefWindowInfo; + const aURL : ustring; + const aSettings : PCefBrowserSettings; + const aExtraInfo : ICefDictionaryValue; + const aContext : ICefRequestContext): boolean; var TempURL : TCefString; begin @@ -1631,11 +1631,11 @@ begin Result := cef_browser_host_create_browser(aWindowInfo, FHandler.Wrap, @TempURL, aSettings, CefGetData(aExtraInfo), CefGetData(aContext)) <> 0; end; -function TChromiumCore.CreateBrowserHostSync( aWindowInfo : PCefWindowInfo; - const aURL : ustring; - const aSettings : PCefBrowserSettings; - const aExtraInfo : ICefDictionaryValue; - const aContext : ICefRequestContext): boolean; +function TChromiumCore.CreateBrowserHostSync( aWindowInfo : PCefWindowInfo; + const aURL : ustring; + const aSettings : PCefBrowserSettings; + const aExtraInfo : ICefDictionaryValue; + const aContext : ICefRequestContext): boolean; var TempURL : TCefString; begin @@ -2027,9 +2027,9 @@ end; // Use the OnDownloadImageFinished event to receive the image procedure TChromiumCore.DownloadImage(const imageUrl : ustring; - isFavicon : boolean; - maxImageSize : cardinal; - bypassCache : boolean); + isFavicon : boolean; + maxImageSize : cardinal; + bypassCache : boolean); var TempCallback : ICefDownloadImageCallback; begin @@ -3525,9 +3525,9 @@ begin end; function TChromiumCore.doNavigationVisitorResultAvailable(const entry : ICefNavigationEntry; - current : Boolean; - index : Integer; - total : Integer) : boolean; + current : Boolean; + index : Integer; + total : Integer) : boolean; begin Result := False; @@ -3536,8 +3536,8 @@ begin end; procedure TChromiumCore.doDownloadImageFinished(const imageUrl : ustring; - httpStatusCode : Integer; - const image : ICefImage); + httpStatusCode : Integer; + const image : ICefImage); begin if assigned(FOnDownloadImageFinished) then FOnDownloadImageFinished(self, imageUrl, httpStatusCode, image); @@ -3569,10 +3569,10 @@ begin end; procedure TChromiumCore.doOnCookiesVisited(const name_, value, domain, path: ustring; - secure, httponly, hasExpires: Boolean; - const creation, lastAccess, expires: TDateTime; - count, total, aID : Integer; - var aDeleteCookie, aResult : Boolean); + secure, httponly, hasExpires: Boolean; + const creation, lastAccess, expires: TDateTime; + count, total, aID : Integer; + var aDeleteCookie, aResult : Boolean); begin if assigned(FOnCookiesVisited) then FOnCookiesVisited(self, name_, value, domain, path, @@ -3985,10 +3985,10 @@ begin end; function TChromiumCore.doOnBeforeBrowse(const browser : ICefBrowser; - const frame : ICefFrame; - const request : ICefRequest; - user_gesture : Boolean; - isRedirect : Boolean): Boolean; + const frame : ICefFrame; + const request : ICefRequest; + user_gesture : Boolean; + isRedirect : Boolean): Boolean; begin Result := False; @@ -3998,18 +3998,18 @@ begin end; procedure TChromiumCore.doOnBeforeContextMenu(const browser : ICefBrowser; - const frame : ICefFrame; - const params : ICefContextMenuParams; - const model : ICefMenuModel); + const frame : ICefFrame; + const params : ICefContextMenuParams; + const model : ICefMenuModel); begin if Assigned(FOnBeforeContextMenu) then FOnBeforeContextMenu(Self, browser, frame, params, model); end; function TChromiumCore.doRunContextMenu(const browser : ICefBrowser; - const frame : ICefFrame; - const params : ICefContextMenuParams; - const model : ICefMenuModel; - const callback : ICefRunContextMenuCallback): Boolean; + const frame : ICefFrame; + const params : ICefContextMenuParams; + const model : ICefMenuModel; + const callback : ICefRunContextMenuCallback): Boolean; begin Result := False; @@ -4017,25 +4017,25 @@ begin end; procedure TChromiumCore.doOnBeforeDownload(const browser : ICefBrowser; - const downloadItem : ICefDownloadItem; - const suggestedName : ustring; - const callback : ICefBeforeDownloadCallback); + const downloadItem : ICefDownloadItem; + const suggestedName : ustring; + const callback : ICefBeforeDownloadCallback); begin if Assigned(FOnBeforeDownload) then FOnBeforeDownload(Self, browser, downloadItem, suggestedName, callback); end; function TChromiumCore.doOnBeforePopup(const browser : ICefBrowser; - const frame : ICefFrame; - const targetUrl : ustring; - const targetFrameName : ustring; - targetDisposition : TCefWindowOpenDisposition; - userGesture : Boolean; - const popupFeatures : TCefPopupFeatures; - var windowInfo : TCefWindowInfo; - var client : ICefClient; - var settings : TCefBrowserSettings; - var extra_info : ICefDictionaryValue; - var noJavascriptAccess : Boolean): Boolean; + const frame : ICefFrame; + const targetUrl : ustring; + const targetFrameName : ustring; + targetDisposition : TCefWindowOpenDisposition; + userGesture : Boolean; + const popupFeatures : TCefPopupFeatures; + var windowInfo : TCefWindowInfo; + var client : ICefClient; + var settings : TCefBrowserSettings; + var extra_info : ICefDictionaryValue; + var noJavascriptAccess : Boolean): Boolean; begin Result := False; @@ -4046,9 +4046,9 @@ begin end; function TChromiumCore.doOnBeforeResourceLoad(const browser : ICefBrowser; - const frame : ICefFrame; - const request : ICefRequest; - const callback : ICefRequestCallback): TCefReturnValue; + const frame : ICefFrame; + const request : ICefRequest; + const callback : ICefRequestCallback): TCefReturnValue; var TempHeaderMap : ICefStringMultimap; begin @@ -4070,9 +4070,9 @@ begin end; function TChromiumCore.doOnBeforeUnloadDialog(const browser : ICefBrowser; - const messageText : ustring; - isReload : Boolean; - const callback : ICefJsDialogCallback): Boolean; + const messageText : ustring; + isReload : Boolean; + const callback : ICefJsDialogCallback): Boolean; begin Result := False; @@ -4080,10 +4080,10 @@ begin end; function TChromiumCore.doOnCertificateError(const browser : ICefBrowser; - certError : TCefErrorcode; - const requestUrl : ustring; - const sslInfo : ICefSslInfo; - const callback : ICefRequestCallback): Boolean; + certError : TCefErrorcode; + const requestUrl : ustring; + const sslInfo : ICefSslInfo; + const callback : ICefRequestCallback): Boolean; begin Result := False; @@ -4092,10 +4092,10 @@ begin end; function TChromiumCore.doOnConsoleMessage(const browser : ICefBrowser; - level : TCefLogSeverity; - const aMessage : ustring; - const source : ustring; - line : Integer): Boolean; + level : TCefLogSeverity; + const aMessage : ustring; + const source : ustring; + line : Integer): Boolean; begin Result := False; @@ -4103,7 +4103,7 @@ begin end; function TChromiumCore.doOnAutoResize(const browser : ICefBrowser; - const new_size : PCefSize): Boolean; + const new_size : PCefSize): Boolean; begin Result := False; @@ -4116,10 +4116,10 @@ begin end; function TChromiumCore.doOnContextMenuCommand(const browser : ICefBrowser; - const frame : ICefFrame; - const params : ICefContextMenuParams; - commandId : Integer; - eventFlags : TCefEventFlags): Boolean; + const frame : ICefFrame; + const params : ICefContextMenuParams; + commandId : Integer; + eventFlags : TCefEventFlags): Boolean; begin Result := False; @@ -4133,9 +4133,9 @@ begin end; procedure TChromiumCore.doOnCursorChange(const browser : ICefBrowser; - cursor : TCefCursorHandle; - cursorType : TCefCursorType; - const customCursorInfo : PCefCursorInfo); + cursor : TCefCursorHandle; + cursorType : TCefCursorType; + const customCursorInfo : PCefCursorInfo); begin if assigned(FOnCursorChange) then FOnCursorChange(self, browser, cursor, cursorType, customCursorInfo); end; @@ -4146,15 +4146,15 @@ begin end; procedure TChromiumCore.doOnDownloadUpdated(const browser : ICefBrowser; - const downloadItem : ICefDownloadItem; - const callback : ICefDownloadItemCallback); + const downloadItem : ICefDownloadItem; + const callback : ICefDownloadItemCallback); begin if Assigned(FOnDownloadUpdated) then FOnDownloadUpdated(Self, browser, downloadItem, callback); end; function TChromiumCore.doOnDragEnter(const browser : ICefBrowser; - const dragData : ICefDragData; - mask : TCefDragOperations): Boolean; + const dragData : ICefDragData; + mask : TCefDragOperations): Boolean; begin Result := False; @@ -4162,9 +4162,9 @@ begin end; procedure TChromiumCore.doOnDraggableRegionsChanged(const browser : ICefBrowser; - const frame : ICefFrame; - regionsCount : NativeUInt; - regions : PCefDraggableRegionArray); + const frame : ICefFrame; + regionsCount : NativeUInt; + const regions : PCefDraggableRegionArray); begin if Assigned(FOnDraggableRegionsChanged) then FOnDraggableRegionsChanged(Self, browser, frame, regionsCount, regions); end; @@ -4175,12 +4175,12 @@ begin end; function TChromiumCore.doOnFileDialog(const browser : ICefBrowser; - mode : TCefFileDialogMode; - const title : ustring; - const defaultFilePath : ustring; - const acceptFilters : TStrings; - selectedAcceptFilter : Integer; - const callback : ICefFileDialogCallback): Boolean; + mode : TCefFileDialogMode; + const title : ustring; + const defaultFilePath : ustring; + const acceptFilters : TStrings; + selectedAcceptFilter : Integer; + const callback : ICefFileDialogCallback): Boolean; begin Result := False; @@ -4190,11 +4190,11 @@ begin end; procedure TChromiumCore.doOnFindResult(const browser : ICefBrowser; - identifier : integer; - count : Integer; - const selectionRect : PCefRect; - activeMatchOrdinal : Integer; - finalUpdate : Boolean); + identifier : integer; + count : Integer; + const selectionRect : PCefRect; + activeMatchOrdinal : Integer; + finalUpdate : Boolean); begin if Assigned(FOnFindResult) then FOnFindResult(Self, browser, identifier, count, selectionRect, activeMatchOrdinal, finalUpdate); @@ -4206,11 +4206,11 @@ begin end; function TChromiumCore.doOnBeforePluginLoad(const mimeType : ustring; - const pluginUrl : ustring; - isMainFrame : boolean; - const topOriginUrl : ustring; - const pluginInfo : ICefWebPluginInfo; - var pluginPolicy : TCefPluginPolicy): Boolean; + const pluginUrl : ustring; + isMainFrame : boolean; + const topOriginUrl : ustring; + const pluginInfo : ICefWebPluginInfo; + var pluginPolicy : TCefPluginPolicy): Boolean; begin Result := False; @@ -4219,13 +4219,13 @@ begin end; procedure TChromiumCore.doGetResourceRequestHandler_ReqCtxHdlr(const browser : ICefBrowser; - const frame : ICefFrame; - const request : ICefRequest; - is_navigation : boolean; - is_download : boolean; - const request_initiator : ustring; - var disable_default_handling : boolean; - var aResourceRequestHandler : ICefResourceRequestHandler); + const frame : ICefFrame; + const request : ICefRequest; + is_navigation : boolean; + is_download : boolean; + const request_initiator : ustring; + var disable_default_handling : boolean; + var aResourceRequestHandler : ICefResourceRequestHandler); begin if (FResourceRequestHandler <> nil) then aResourceRequestHandler := FResourceRequestHandler; @@ -4242,13 +4242,13 @@ begin end; function TChromiumCore.doOnGetAuthCredentials(const browser : ICefBrowser; - const originUrl : ustring; - isProxy : Boolean; - const host : ustring; - port : Integer; - const realm : ustring; - const scheme : ustring; - const callback : ICefAuthCallback): Boolean; + const originUrl : ustring; + isProxy : Boolean; + const host : ustring; + port : Integer; + const realm : ustring; + const scheme : ustring; + const callback : ICefAuthCallback): Boolean; begin Result := False; @@ -4266,9 +4266,9 @@ begin end; function TChromiumCore.doCanSendCookie(const browser : ICefBrowser; - const frame : ICefFrame; - const request : ICefRequest; - const cookie : PCefCookie): boolean; + const frame : ICefFrame; + const request : ICefRequest; + const cookie : PCefCookie): boolean; begin Result := True; @@ -4276,10 +4276,10 @@ begin end; function TChromiumCore.doCanSaveCookie(const browser : ICefBrowser; - const frame : ICefFrame; - const request : ICefRequest; - const response : ICefResponse; - const cookie : PCefCookie): boolean; + const frame : ICefFrame; + const request : ICefRequest; + const response : ICefResponse; + const cookie : PCefCookie): boolean; begin Result := True; @@ -4287,9 +4287,9 @@ begin end; procedure TChromiumCore.doOnGetResourceHandler(const browser : ICefBrowser; - const frame : ICefFrame; - const request : ICefRequest; - var aResourceHandler : ICefResourceHandler); + const frame : ICefFrame; + const request : ICefRequest; + var aResourceHandler : ICefResourceHandler); begin aResourceHandler := nil; @@ -4334,12 +4334,12 @@ begin end; function TChromiumCore.doOnJsdialog(const browser : ICefBrowser; - const originUrl : ustring; - dialogType : TCefJsDialogType; - const messageText : ustring; - const defaultPromptText : ustring; - const callback : ICefJsDialogCallback; - out suppressMessage : Boolean): Boolean; + const originUrl : ustring; + dialogType : TCefJsDialogType; + const messageText : ustring; + const defaultPromptText : ustring; + const callback : ICefJsDialogCallback; + out suppressMessage : Boolean): Boolean; begin Result := False; @@ -4356,8 +4356,8 @@ begin end; function TChromiumCore.doOnKeyEvent(const browser : ICefBrowser; - const event : PCefKeyEvent; - osEvent : TCefEventHandle): Boolean; + const event : PCefKeyEvent; + osEvent : TCefEventHandle): Boolean; begin Result := False; @@ -4365,17 +4365,17 @@ begin end; procedure TChromiumCore.doOnLoadEnd(const browser : ICefBrowser; - const frame : ICefFrame; - httpStatusCode : Integer); + const frame : ICefFrame; + httpStatusCode : Integer); begin if Assigned(FOnLoadEnd) then FOnLoadEnd(Self, browser, frame, httpStatusCode); end; procedure TChromiumCore.doOnLoadError(const browser : ICefBrowser; - const frame : ICefFrame; - errorCode : TCefErrorCode; - const errorText : ustring; - const failedUrl : ustring); + const frame : ICefFrame; + errorCode : TCefErrorCode; + const errorText : ustring; + const failedUrl : ustring); begin if Assigned(FOnLoadError) then FOnLoadError(Self, browser, frame, errorCode, errorText, failedUrl); end; @@ -4391,10 +4391,10 @@ begin end; function TChromiumCore.doOnOpenUrlFromTab(const browser : ICefBrowser; - const frame : ICefFrame; - const targetUrl : ustring; - targetDisposition : TCefWindowOpenDisposition; - userGesture : Boolean): Boolean; + const frame : ICefFrame; + const targetUrl : ustring; + targetDisposition : TCefWindowOpenDisposition; + userGesture : Boolean): Boolean; begin Result := False; @@ -4403,13 +4403,13 @@ begin end; procedure TChromiumCore.doGetResourceRequestHandler_ReqHdlr(const browser : ICefBrowser; - const frame : ICefFrame; - const request : ICefRequest; - is_navigation : boolean; - is_download : boolean; - const request_initiator : ustring; - var disable_default_handling : boolean; - var aResourceRequestHandler : ICefResourceRequestHandler); + const frame : ICefFrame; + const request : ICefRequest; + is_navigation : boolean; + is_download : boolean; + const request_initiator : ustring; + var disable_default_handling : boolean; + var aResourceRequestHandler : ICefResourceRequestHandler); begin if (FResourceRequestHandler <> nil) then aResourceRequestHandler := FResourceRequestHandler; @@ -4421,32 +4421,32 @@ begin end; procedure TChromiumCore.doOnPaint(const browser : ICefBrowser; - kind : TCefPaintElementType; - dirtyRectsCount : NativeUInt; - const dirtyRects : PCefRectArray; - const buffer : Pointer; - width : Integer; - height : Integer); + type_ : TCefPaintElementType; + dirtyRectsCount : NativeUInt; + const dirtyRects : PCefRectArray; + const buffer : Pointer; + width : Integer; + height : Integer); begin - if Assigned(FOnPaint) then FOnPaint(Self, browser, kind, dirtyRectsCount, dirtyRects, buffer, width, height); + if Assigned(FOnPaint) then FOnPaint(Self, browser, type_, dirtyRectsCount, dirtyRects, buffer, width, height); end; procedure TChromiumCore.doOnAcceleratedPaint(const browser : ICefBrowser; - kind : TCefPaintElementType; - dirtyRectsCount : NativeUInt; - const dirtyRects : PCefRectArray; - shared_handle : Pointer); + type_ : TCefPaintElementType; + dirtyRectsCount : NativeUInt; + const dirtyRects : PCefRectArray; + shared_handle : Pointer); begin - if Assigned(FOnAcceleratedPaint) then FOnAcceleratedPaint(Self, browser, kind, dirtyRectsCount, dirtyRects, shared_handle); + if Assigned(FOnAcceleratedPaint) then FOnAcceleratedPaint(Self, browser, type_, dirtyRectsCount, dirtyRects, shared_handle); end; function TChromiumCore.doOnSelectClientCertificate(const browser : ICefBrowser; - isProxy : boolean; - const host : ustring; - port : integer; - certificatesCount : NativeUInt; - const certificates : TCefX509CertificateArray; - const callback : ICefSelectClientCertificateCallback): boolean; + isProxy : boolean; + const host : ustring; + port : integer; + certificatesCount : NativeUInt; + const certificates : TCefX509CertificateArray; + const callback : ICefSelectClientCertificateCallback): boolean; begin Result := False; @@ -4499,9 +4499,9 @@ begin end; function TChromiumCore.doOnQuotaRequest(const browser : ICefBrowser; - const originUrl : ustring; - newSize : Int64; - const callback : ICefRequestCallback): Boolean; + const originUrl : ustring; + newSize : Int64; + const callback : ICefRequestCallback): Boolean; begin Result := False; @@ -4597,18 +4597,18 @@ begin end; procedure TChromiumCore.doOnResourceRedirect(const browser : ICefBrowser; - const frame : ICefFrame; - const request : ICefRequest; - const response : ICefResponse; - var newUrl : ustring); + const frame : ICefFrame; + const request : ICefRequest; + const response : ICefResponse; + var newUrl : ustring); begin if Assigned(FOnResourceRedirect) then FOnResourceRedirect(Self, browser, frame, request, response, newUrl); end; function TChromiumCore.doOnResourceResponse(const browser : ICefBrowser; - const frame : ICefFrame; - const request : ICefRequest; - const response : ICefResponse): Boolean; + const frame : ICefFrame; + const request : ICefRequest; + const response : ICefResponse): Boolean; begin Result := False; @@ -4616,10 +4616,10 @@ begin end; procedure TChromiumCore.doOnGetResourceResponseFilter(const browser : ICefBrowser; - const frame : ICefFrame; - const request : ICefRequest; - const response : ICefResponse; - var aResponseFilter : ICefResponseFilter); + const frame : ICefFrame; + const request : ICefRequest; + const response : ICefResponse; + var aResponseFilter : ICefResponseFilter); begin aResponseFilter := nil; @@ -4628,11 +4628,11 @@ begin end; procedure TChromiumCore.doOnResourceLoadComplete(const browser : ICefBrowser; - const frame : ICefFrame; - const request : ICefRequest; - const response : ICefResponse; - status : TCefUrlRequestStatus; - receivedContentLength : Int64); + const frame : ICefFrame; + const request : ICefRequest; + const response : ICefResponse; + status : TCefUrlRequestStatus; + receivedContentLength : Int64); begin if Assigned(FOnResourceLoadComplete) then FOnResourceLoadComplete(self, browser, frame, request, response, status, receivedContentLength); @@ -4644,24 +4644,24 @@ begin end; procedure TChromiumCore.doOnIMECompositionRangeChanged(const browser : ICefBrowser; - const selected_range : PCefRange; - character_boundsCount : NativeUInt; - const character_bounds : PCefRect); + const selected_range : PCefRange; + character_boundsCount : NativeUInt; + const character_bounds : PCefRect); begin if assigned(FOnIMECompositionRangeChanged) then FOnIMECompositionRangeChanged(self, browser, selected_range, character_boundsCount, character_bounds); end; procedure TChromiumCore.doOnTextSelectionChanged(const browser : ICefBrowser; - const selected_text : ustring; - const selected_range : PCefRange); + const selected_text : ustring; + const selected_range : PCefRange); begin if assigned(FOnTextSelectionChanged) then FOnTextSelectionChanged(self, browser, selected_text, selected_range); end; procedure TChromiumCore.doOnVirtualKeyboardRequested(const browser : ICefBrowser; - input_mode : TCefTextInpuMode); + input_mode : TCefTextInpuMode); begin if assigned(FOnVirtualKeyboardRequested) then FOnVirtualKeyboardRequested(self, browser, input_mode); @@ -4675,10 +4675,10 @@ begin end; function TChromiumCore.doOnStartDragging(const browser : ICefBrowser; - const dragData : ICefDragData; - allowedOps : TCefDragOperations; - x : integer; - y : Integer): Boolean; + const dragData : ICefDragData; + allowedOps : TCefDragOperations; + x : integer; + y : Integer): Boolean; begin Result := False; {$IFDEF MSWINDOWS} @@ -4886,7 +4886,7 @@ begin end; end; -function TChromiumCore.CreateUrlRequest(const request: ICefRequest; const client: ICefUrlrequestClient; const aFrameName : ustring = ''): ICefUrlRequest; +function TChromiumCore.CreateUrlRequest(const request: ICefRequest; const client: ICefUrlrequestClient; const aFrameName : ustring): ICefUrlRequest; var TempFrame : ICefFrame; begin @@ -4976,17 +4976,17 @@ begin end; procedure TChromiumCore.IMESetComposition(const text : ustring; - const underlines : TCefCompositionUnderlineDynArray; - const replacement_range : PCefRange; - const selection_range : PCefRange); + const underlines : TCefCompositionUnderlineDynArray; + const replacement_range : PCefRange; + const selection_range : PCefRange); begin if Initialized then FBrowser.Host.IMESetComposition(text, underlines, replacement_range, selection_range); end; procedure TChromiumCore.IMECommitText(const text : ustring; - const replacement_range : PCefRange; - relative_cursor_pos : integer); + const replacement_range : PCefRange; + relative_cursor_pos : integer); begin if Initialized then FBrowser.Host.IMECommitText(text, replacement_range, relative_cursor_pos); diff --git a/source/uCEFChromiumEvents.pas b/source/uCEFChromiumEvents.pas index b360843a..6b725817 100644 --- a/source/uCEFChromiumEvents.pas +++ b/source/uCEFChromiumEvents.pas @@ -144,8 +144,8 @@ type TOnGetScreenInfo = procedure(Sender: TObject; const browser: ICefBrowser; var screenInfo: TCefScreenInfo; out Result: Boolean) of Object; TOnPopupShow = procedure(Sender: TObject; const browser: ICefBrowser; show: Boolean) of Object; TOnPopupSize = procedure(Sender: TObject; const browser: ICefBrowser; const rect: PCefRect) of Object; - TOnPaint = procedure(Sender: TObject; const browser: ICefBrowser; kind: TCefPaintElementType; dirtyRectsCount: NativeUInt; const dirtyRects: PCefRectArray; const buffer: Pointer; width, height: Integer) of Object; - TOnAcceleratedPaint = procedure(Sender: TObject; const browser: ICefBrowser; kind: TCefPaintElementType; dirtyRectsCount: NativeUInt; const dirtyRects: PCefRectArray; shared_handle: Pointer) of Object; + TOnPaint = procedure(Sender: TObject; const browser: ICefBrowser; type_: TCefPaintElementType; dirtyRectsCount: NativeUInt; const dirtyRects: PCefRectArray; const buffer: Pointer; width, height: Integer) of Object; + TOnAcceleratedPaint = procedure(Sender: TObject; const browser: ICefBrowser; type_: TCefPaintElementType; dirtyRectsCount: NativeUInt; const dirtyRects: PCefRectArray; shared_handle: Pointer) of Object; TOnCursorChange = procedure(Sender: TObject; const browser: ICefBrowser; cursor: TCefCursorHandle; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo) of Object; TOnStartDragging = procedure(Sender: TObject; const browser: ICefBrowser; const dragData: ICefDragData; allowedOps: TCefDragOperations; x, y: Integer; out Result: Boolean) of Object; TOnUpdateDragCursor = procedure(Sender: TObject; const browser: ICefBrowser; operation: TCefDragOperation) of Object; @@ -156,7 +156,7 @@ type // ICefDragHandler TOnDragEnter = procedure(Sender: TObject; const browser: ICefBrowser; const dragData: ICefDragData; mask: TCefDragOperations; out Result: Boolean) of Object; - TOnDraggableRegionsChanged = procedure(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; regionsCount: NativeUInt; regions: PCefDraggableRegionArray)of Object; + TOnDraggableRegionsChanged = procedure(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; regionsCount: NativeUInt; const regions: PCefDraggableRegionArray) of Object; // ICefFindHandler TOnFindResult = procedure(Sender: TObject; const browser: ICefBrowser; identifier, count: Integer; const selectionRect: PCefRect; activeMatchOrdinal: Integer; finalUpdate: Boolean) of Object; diff --git a/source/uCEFCookieManager.pas b/source/uCEFCookieManager.pas index b9735c92..2224fd3f 100644 --- a/source/uCEFCookieManager.pas +++ b/source/uCEFCookieManager.pas @@ -69,7 +69,7 @@ type function SetCookieProc(const url: ustring; const name, value, domain, path: ustring; secure, httponly, hasExpires: Boolean; const creation, lastAccess, expires: TDateTime; const callback: TCefSetCookieCallbackProc): Boolean; function DeleteCookies(const url, cookieName: ustring; const callback: ICefDeleteCookiesCallback): Boolean; function DeleteCookiesProc(const url, cookieName: ustring; const callback: TCefDeleteCookiesCallbackProc): Boolean; - function FlushStore(const handler: ICefCompletionCallback): Boolean; + function FlushStore(const callback: ICefCompletionCallback): Boolean; function FlushStoreProc(const proc: TCefCompletionCallbackProc): Boolean; public @@ -108,9 +108,9 @@ begin Result := DeleteCookies(url, cookieName, TCefFastDeleteCookiesCallback.Create(callback)); end; -function TCefCookieManagerRef.FlushStore(const handler: ICefCompletionCallback): Boolean; +function TCefCookieManagerRef.FlushStore(const callback: ICefCompletionCallback): Boolean; begin - Result := PCefCookieManager(FData)^.flush_store(PCefCookieManager(FData), CefGetData(handler)) <> 0; + Result := PCefCookieManager(FData)^.flush_store(PCefCookieManager(FData), CefGetData(callback)) <> 0; end; function TCefCookieManagerRef.FlushStoreProc(const proc: TCefCompletionCallbackProc): Boolean; @@ -133,26 +133,26 @@ function TCefCookieManagerRef.SetCookie(const url, name, value, domain, path: us const creation, lastAccess, expires: TDateTime; const callback: ICefSetCookieCallback): Boolean; var - str : TCefString; - cook : TCefCookie; + TempURL : TCefString; + TempCookie : TCefCookie; begin - str := CefString(url); - cook.name := CefString(name); - cook.value := CefString(value); - cook.domain := CefString(domain); - cook.path := CefString(path); - cook.secure := Ord(secure); - cook.httponly := Ord(httponly); - cook.creation := DateTimeToCefTime(creation); - cook.last_access := DateTimeToCefTime(lastAccess); - cook.has_expires := Ord(hasExpires); + TempURL := CefString(url); + TempCookie.name := CefString(name); + TempCookie.value := CefString(value); + TempCookie.domain := CefString(domain); + TempCookie.path := CefString(path); + TempCookie.secure := Ord(secure); + TempCookie.httponly := Ord(httponly); + TempCookie.creation := DateTimeToCefTime(creation); + TempCookie.last_access := DateTimeToCefTime(lastAccess); + TempCookie.has_expires := Ord(hasExpires); if hasExpires then - cook.expires := DateTimeToCefTime(expires) + TempCookie.expires := DateTimeToCefTime(expires) else - FillChar(cook.expires, SizeOf(TCefTime), 0); + FillChar(TempCookie.expires, SizeOf(TCefTime), 0); - Result := PCefCookieManager(FData)^.set_cookie(PCefCookieManager(FData), @str, @cook, CefGetData(callback)) <> 0; + Result := PCefCookieManager(FData)^.set_cookie(PCefCookieManager(FData), @TempURL, @TempCookie, CefGetData(callback)) <> 0; end; function TCefCookieManagerRef.SetCookieProc(const url, name, value, domain, path: ustring; diff --git a/source/uCEFDragHandler.pas b/source/uCEFDragHandler.pas index 31f59faa..8de51e1e 100644 --- a/source/uCEFDragHandler.pas +++ b/source/uCEFDragHandler.pas @@ -55,7 +55,7 @@ type TCefDragHandlerOwn = class(TCefBaseRefCountedOwn, ICefDragHandler) protected function OnDragEnter(const browser: ICefBrowser; const dragData: ICefDragData; mask: TCefDragOperations): Boolean; virtual; - procedure OnDraggableRegionsChanged(const browser: ICefBrowser; const frame: ICefFrame; regionsCount: NativeUInt; regions: PCefDraggableRegionArray); virtual; + procedure OnDraggableRegionsChanged(const browser: ICefBrowser; const frame: ICefFrame; regionsCount: NativeUInt; const regions: PCefDraggableRegionArray); virtual; procedure RemoveReferences; virtual; @@ -68,7 +68,7 @@ type FEvents : Pointer; function OnDragEnter(const browser: ICefBrowser; const dragData: ICefDragData; mask: TCefDragOperations): Boolean; override; - procedure OnDraggableRegionsChanged(const browser: ICefBrowser; const frame: ICefFrame; regionsCount: NativeUInt; regions: PCefDraggableRegionArray); override; + procedure OnDraggableRegionsChanged(const browser: ICefBrowser; const frame: ICefFrame; regionsCount: NativeUInt; const regions: PCefDraggableRegionArray); override; procedure RemoveReferences; override; @@ -103,11 +103,11 @@ begin mask)); end; -procedure cef_drag_handler_on_draggable_regions_changed(self : PCefDragHandler; - browser : PCefBrowser; - frame : PCefFrame; - regionsCount : NativeUInt; - regions : PCefDraggableRegionArray); stdcall; +procedure cef_drag_handler_on_draggable_regions_changed( self : PCefDragHandler; + browser : PCefBrowser; + frame : PCefFrame; + regionsCount : NativeUInt; + const regions : PCefDraggableRegionArray); stdcall; var TempObject : TObject; begin @@ -141,7 +141,7 @@ end; procedure TCefDragHandlerOwn.OnDraggableRegionsChanged(const browser : ICefBrowser; const frame : ICefFrame; regionsCount : NativeUInt; - regions : PCefDraggableRegionArray); + const regions : PCefDraggableRegionArray); begin // end; @@ -185,7 +185,7 @@ end; procedure TCustomDragHandler.OnDraggableRegionsChanged(const browser : ICefBrowser; const frame : ICefFrame; regionsCount : NativeUInt; - regions : PCefDraggableRegionArray); + const regions : PCefDraggableRegionArray); begin if (FEvents <> nil) then IChromiumEvents(FEvents).doOnDraggableRegionsChanged(browser, frame, regionsCount, regions); end; diff --git a/source/uCEFInterfaces.pas b/source/uCEFInterfaces.pas index 502a5342..a05ab988 100644 --- a/source/uCEFInterfaces.pas +++ b/source/uCEFInterfaces.pas @@ -357,8 +357,8 @@ type function doOnGetScreenInfo(const browser: ICefBrowser; var screenInfo: TCefScreenInfo): Boolean; procedure doOnPopupShow(const browser: ICefBrowser; show: Boolean); procedure doOnPopupSize(const browser: ICefBrowser; const rect: PCefRect); - procedure doOnPaint(const browser: ICefBrowser; kind: TCefPaintElementType; dirtyRectsCount: NativeUInt; const dirtyRects: PCefRectArray; const buffer: Pointer; width, height: Integer); - procedure doOnAcceleratedPaint(const browser: ICefBrowser; kind: TCefPaintElementType; dirtyRectsCount: NativeUInt; const dirtyRects: PCefRectArray; shared_handle: Pointer); + procedure doOnPaint(const browser: ICefBrowser; type_: TCefPaintElementType; dirtyRectsCount: NativeUInt; const dirtyRects: PCefRectArray; const buffer: Pointer; width, height: Integer); + procedure doOnAcceleratedPaint(const browser: ICefBrowser; type_: TCefPaintElementType; dirtyRectsCount: NativeUInt; const dirtyRects: PCefRectArray; shared_handle: Pointer); procedure doOnCursorChange(const browser: ICefBrowser; cursor: TCefCursorHandle; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo); function doOnStartDragging(const browser: ICefBrowser; const dragData: ICefDragData; allowedOps: TCefDragOperations; x, y: Integer): Boolean; procedure doOnUpdateDragCursor(const browser: ICefBrowser; operation: TCefDragOperation); @@ -369,7 +369,7 @@ type // ICefDragHandler function doOnDragEnter(const browser: ICefBrowser; const dragData: ICefDragData; mask: TCefDragOperations): Boolean; - procedure doOnDraggableRegionsChanged(const browser: ICefBrowser; const frame: ICefFrame; regionsCount: NativeUInt; regions: PCefDraggableRegionArray); + procedure doOnDraggableRegionsChanged(const browser: ICefBrowser; const frame: ICefFrame; regionsCount: NativeUInt; const regions: PCefDraggableRegionArray); // ICefFindHandler procedure doOnFindResult(const browser: ICefBrowser; identifier, count: Integer; const selectionRect: PCefRect; activeMatchOrdinal: Integer; finalUpdate: Boolean); @@ -1306,7 +1306,7 @@ type function SetCookieProc(const url: ustring; const name, value, domain, path: ustring; secure, httponly, hasExpires: Boolean; const creation, lastAccess, expires: TDateTime; const callback: TCefSetCookieCallbackProc): Boolean; function DeleteCookies(const url, cookieName: ustring; const callback: ICefDeleteCookiesCallback): Boolean; function DeleteCookiesProc(const url, cookieName: ustring; const callback: TCefDeleteCookiesCallbackProc): Boolean; - function FlushStore(const handler: ICefCompletionCallback): Boolean; + function FlushStore(const callback: ICefCompletionCallback): Boolean; function FlushStoreProc(const proc: TCefCompletionCallbackProc): Boolean; end; @@ -1961,7 +1961,7 @@ type ICefDragHandler = interface(ICefBaseRefCounted) ['{59A89579-5B18-489F-A25C-5CC25FF831FC}'] function OnDragEnter(const browser: ICefBrowser; const dragData: ICefDragData; mask: TCefDragOperations): Boolean; - procedure OnDraggableRegionsChanged(const browser: ICefBrowser; const frame: ICefFrame; regionsCount: NativeUInt; regions: PCefDraggableRegionArray); + procedure OnDraggableRegionsChanged(const browser: ICefBrowser; const frame: ICefFrame; regionsCount: NativeUInt; const regions: PCefDraggableRegionArray); procedure RemoveReferences; // custom procedure to clear all references end; diff --git a/source/uCEFTypes.pas b/source/uCEFTypes.pas index 0240cfdd..e3f54326 100644 --- a/source/uCEFTypes.pas +++ b/source/uCEFTypes.pas @@ -308,6 +308,20 @@ type {$ENDIF} {$ENDIF} + {$IFDEF MSWINDOWS} + TMyMemoryStatusEx = record + dwLength : DWORD; + dwMemoryLoad : DWORD; + ullTotalPhys : uint64; + ullAvailPhys : uint64; + ullTotalPageFile : uint64; + ullAvailPageFile : uint64; + ullTotalVirtual : uint64; + ullAvailVirtual : uint64; + ullAvailExtendedVirtual : uint64; + end; + {$ENDIF} + PPSingle = ^PSingle; Char16 = WideChar; @@ -1380,7 +1394,7 @@ type TCefDragHandler = record base : TCefBaseRefCounted; on_drag_enter : function(self: PCefDragHandler; browser: PCefBrowser; dragData: PCefDragData; mask: TCefDragOperations): Integer; stdcall; - on_draggable_regions_changed : procedure(self: PCefDragHandler; browser: PCefBrowser; frame: PCefFrame; regionsCount: NativeUInt; regions: PCefDraggableRegionArray); stdcall; + on_draggable_regions_changed : procedure(self: PCefDragHandler; browser: PCefBrowser; frame: PCefFrame; regionsCount: NativeUInt; const regions: PCefDraggableRegionArray); stdcall; end; // /include/capi/cef_find_handler_capi.h (cef_find_handler_t) @@ -1480,8 +1494,8 @@ type get_screen_info : function(self: PCefRenderHandler; browser: PCefBrowser; screen_info: PCefScreenInfo): Integer; stdcall; on_popup_show : procedure(self: PCefRenderHandler; browser: PCefBrowser; show: Integer); stdcall; on_popup_size : procedure(self: PCefRenderHandler; browser: PCefBrowser; const rect: PCefRect); stdcall; - on_paint : procedure(self: PCefRenderHandler; browser: PCefBrowser; kind: TCefPaintElementType; dirtyRectsCount: NativeUInt; const dirtyRects: PCefRectArray; const buffer: Pointer; width, height: Integer); stdcall; - on_accelerated_paint : procedure(self: PCefRenderHandler; browser: PCefBrowser; kind: TCefPaintElementType; dirtyRectsCount: NativeUInt; const dirtyRects: PCefRectArray; shared_handle: Pointer); stdcall; + on_paint : procedure(self: PCefRenderHandler; browser: PCefBrowser; type_: TCefPaintElementType; dirtyRectsCount: NativeUInt; const dirtyRects: PCefRectArray; const buffer: Pointer; width, height: Integer); stdcall; + on_accelerated_paint : procedure(self: PCefRenderHandler; browser: PCefBrowser; type_: TCefPaintElementType; dirtyRectsCount: NativeUInt; const dirtyRects: PCefRectArray; shared_handle: Pointer); stdcall; on_cursor_change : procedure(self: PCefRenderHandler; browser: PCefBrowser; cursor: TCefCursorHandle; type_: TCefCursorType; const custom_cursor_info: PCefCursorInfo); stdcall; start_dragging : function(self: PCefRenderHandler; browser: PCefBrowser; drag_data: PCefDragData; allowed_ops: TCefDragOperations; x, y: Integer): Integer; stdcall; update_drag_cursor : procedure(self: PCefRenderHandler; browser: PCefBrowser; operation: TCefDragOperation); stdcall; @@ -1718,7 +1732,7 @@ type TCefRequestHandler = record base : TCefBaseRefCounted; on_before_browse : function(self: PCefRequestHandler; browser: PCefBrowser; frame: PCefFrame; request: PCefRequest; user_gesture, isRedirect: Integer): Integer; stdcall; - on_open_urlfrom_tab : function(self: PCefRequestHandler; browser:PCefBrowser; frame: PCefFrame; const target_url: PCefString; target_disposition: TCefWindowOpenDisposition; user_gesture: Integer): Integer; stdcall; + on_open_urlfrom_tab : function(self: PCefRequestHandler; browser: PCefBrowser; frame: PCefFrame; const target_url: PCefString; target_disposition: TCefWindowOpenDisposition; user_gesture: Integer): Integer; stdcall; get_resource_request_handler : function(self: PCefRequestHandler; browser: PCefBrowser; frame: PCefFrame; request: PCefRequest; is_navigation, is_download: Integer; const request_initiator: PCefString; disable_default_handling: PInteger): PCefResourceRequestHandler; stdcall; get_auth_credentials : function(self: PCefRequestHandler; browser: PCefBrowser; const origin_url: PCefString; isProxy: Integer; const host: PCefString; port: Integer; const realm, scheme: PCefString; callback: PCefAuthCallback): Integer; stdcall; on_quota_request : function(self: PCefRequestHandler; browser: PCefBrowser; const origin_url: PCefString; new_size: Int64; callback: PCefRequestCallback): Integer; stdcall; @@ -1739,13 +1753,13 @@ type // /include/capi/cef_resource_handler_capi.h (cef_resource_skip_callback_t) TCefResourceSkipCallback = record base : TCefBaseRefCounted; - cont : procedure(self: PCefResourceSkipCallback; bytes_skipped: int64); + cont : procedure(self: PCefResourceSkipCallback; bytes_skipped: int64); stdcall; end; // /include/capi/cef_resource_handler_capi.h (cef_resource_read_callback_t) TCefResourceReadCallback = record base : TCefBaseRefCounted; - cont : procedure(self: PCefResourceReadCallback; bytes_read: int64); + cont : procedure(self: PCefResourceReadCallback; bytes_read: int64); stdcall; end; // /include/capi/cef_resource_handler_capi.h (cef_resource_handler_t) @@ -1873,7 +1887,7 @@ type visit_url_cookies : function(self: PCefCookieManager; const url: PCefString; includeHttpOnly: Integer; visitor: PCefCookieVisitor): Integer; stdcall; set_cookie : function(self: PCefCookieManager; const url: PCefString; const cookie: PCefCookie; callback: PCefSetCookieCallback): Integer; stdcall; delete_cookies : function(self: PCefCookieManager; const url, cookie_name: PCefString; callback: PCefDeleteCookiesCallback): Integer; stdcall; - flush_store : function(self: PCefCookieManager; handler: PCefCompletionCallback): Integer; stdcall; + flush_store : function(self: PCefCookieManager; callback: PCefCompletionCallback): Integer; stdcall; end; // /include/capi/cef_scheme_capi.h (cef_scheme_handler_factory_t) @@ -2604,7 +2618,7 @@ type get_load_handler : function(self: PCefClient): PCefLoadHandler; stdcall; get_render_handler : function(self: PCefClient): PCefRenderHandler; stdcall; get_request_handler : function(self: PCefClient): PCefRequestHandler; stdcall; - on_process_message_received : function(self: PCefClient; browser: PCefBrowser; frame: PCefFrame; source_process: TCefProcessId; message: PCefProcessMessage): Integer; stdcall; + on_process_message_received : function(self: PCefClient; browser: PCefBrowser; frame: PCefFrame; source_process: TCefProcessId; message_: PCefProcessMessage): Integer; stdcall; end; // /include/capi/cef_browser_capi.h (cef_browser_host_t) @@ -3061,20 +3075,6 @@ type on_key_event : function(self: PCefWindowDelegate; window: PCefWindow; const event: PCefKeyEvent): Integer; stdcall; end; - {$IFDEF MSWINDOWS} - TMyMemoryStatusEx = record - dwLength : DWORD; - dwMemoryLoad : DWORD; - ullTotalPhys : uint64; - ullAvailPhys : uint64; - ullTotalPageFile : uint64; - ullAvailPageFile : uint64; - ullTotalVirtual : uint64; - ullAvailVirtual : uint64; - ullAvailExtendedVirtual : uint64; - end; - {$ENDIF} - implementation end. diff --git a/update_CEF4Delphi.json b/update_CEF4Delphi.json index ca18d18c..d8a56e43 100644 --- a/update_CEF4Delphi.json +++ b/update_CEF4Delphi.json @@ -1,10 +1,10 @@ { "UpdateLazPackages" : [ { - "ForceNotify" : true, - "InternalVersion" : 66, + "ForceNotify" : false, + "InternalVersion" : 67, "Name" : "cef4delphi_lazarus.lpk", - "Version" : "78.3.1.0" + "Version" : "78.3.4.0" } ], "UpdatePackageData" : {