1
0
mirror of https://github.com/salvadordf/CEF4Delphi.git synced 2025-11-23 21:34:53 +02:00

Update to CEF 84.3.3

This commit is contained in:
Salvador Díaz Fau
2020-07-22 18:01:03 +02:00
parent df55d013fb
commit 6f98a74518
7 changed files with 24 additions and 32 deletions

View File

@@ -3,10 +3,10 @@ CEF4Delphi is an open source project created by Salvador Díaz Fau to embed Chro
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 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 84.2.6 which includes Chromium 84.0.4147.89. CEF4Delphi uses CEF 84.3.3 which includes Chromium 84.0.4147.89.
The CEF binaries used by CEF4Delphi are available for download at spotify : The CEF binaries used by CEF4Delphi are available for download at spotify :
* [32 bits](http://opensource.spotify.com/cefbuilds/cef_binary_84.2.6%2Bgeeda28c%2Bchromium-84.0.4147.89_windows32.tar.bz2) * [32 bits](http://opensource.spotify.com/cefbuilds/cef_binary_84.3.3%2Bgffc2f0e%2Bchromium-84.0.4147.89_windows32.tar.bz2)
* [64 bits](http://opensource.spotify.com/cefbuilds/cef_binary_84.2.6%2Bgeeda28c%2Bchromium-84.0.4147.89_windows64.tar.bz2) * [64 bits](http://opensource.spotify.com/cefbuilds/cef_binary_84.3.3%2Bgffc2f0e%2Bchromium-84.0.4147.89_windows64.tar.bz2)
CEF4Delphi was developed and tested on Delphi 10.4 and it has been tested in Delphi 7, Delphi XE, Delphi 10, Delphi 10.2, Delphi 10.3 and Lazarus 2.0.10/FPC 3.2.0. CEF4Delphi includes VCL, FireMonkey (FMX) and Lazarus components. CEF4Delphi was developed and tested on Delphi 10.4 and it has been tested in Delphi 7, Delphi XE, Delphi 10, Delphi 10.2, Delphi 10.3 and Lazarus 2.0.10/FPC 3.2.0. CEF4Delphi includes VCL, FireMonkey (FMX) and Lazarus components.

View File

@@ -21,7 +21,7 @@
</CompilerOptions> </CompilerOptions>
<Description Value="CEF4Delphi is an open source project created by Salvador Díaz Fau to embed Chromium-based browsers in applications made with Delphi or Lazarus/FPC."/> <Description Value="CEF4Delphi is an open source project created by Salvador Díaz Fau to embed Chromium-based browsers in applications made with Delphi or Lazarus/FPC."/>
<License Value="MPL 1.1"/> <License Value="MPL 1.1"/>
<Version Major="84" Minor="2" Release="6"/> <Version Major="84" Minor="3" Release="3"/>
<Files Count="189"> <Files Count="189">
<Item1> <Item1>
<Filename Value="..\source\uCEFAccessibilityHandler.pas"/> <Filename Value="..\source\uCEFAccessibilityHandler.pas"/>

View File

@@ -55,14 +55,14 @@ uses
{$ENDIF} {$ENDIF}
System.Classes, System.UITypes, System.Classes, System.UITypes,
{$ELSE} {$ELSE}
{$IFDEF MSWINDOWS}Windows, {$ENDIF} Classes, {$IFDEF FPC}dynlibs,{$ENDIF} {$IFDEF MSWINDOWS}Windows,{$ENDIF} Classes, {$IFDEF FPC}dynlibs,{$ENDIF}
{$ENDIF} {$ENDIF}
uCEFTypes, uCEFInterfaces, uCEFBaseRefCounted, uCEFSchemeRegistrar; uCEFTypes, uCEFInterfaces, uCEFBaseRefCounted, uCEFSchemeRegistrar;
const const
CEF_SUPPORTED_VERSION_MAJOR = 84; CEF_SUPPORTED_VERSION_MAJOR = 84;
CEF_SUPPORTED_VERSION_MINOR = 2; CEF_SUPPORTED_VERSION_MINOR = 3;
CEF_SUPPORTED_VERSION_RELEASE = 6; CEF_SUPPORTED_VERSION_RELEASE = 3;
CEF_SUPPORTED_VERSION_BUILD = 0; CEF_SUPPORTED_VERSION_BUILD = 0;
CEF_CHROMEELF_VERSION_MAJOR = 84; CEF_CHROMEELF_VERSION_MAJOR = 84;

View File

@@ -2377,8 +2377,8 @@ type
ICefResourceBundle = interface(ICefBaseRefCounted) ICefResourceBundle = interface(ICefBaseRefCounted)
['{3213CF97-C854-452B-B615-39192F8D07DC}'] ['{3213CF97-C854-452B-B615-39192F8D07DC}']
function GetLocalizedString(stringId: Integer): ustring; function GetLocalizedString(stringId: Integer): ustring;
function GetDataResource(resourceId: Integer; var data: Pointer; var dataSize: NativeUInt): Boolean; function GetDataResource(resourceId: Integer): ICefBinaryValue;
function GetDataResourceForScale(resourceId: Integer; scaleFactor: TCefScaleFactor; var data: Pointer; var dataSize: NativeUInt): Boolean; function GetDataResourceForScale(resourceId: Integer; scaleFactor: TCefScaleFactor): ICefBinaryValue;
end; end;
// TCefImage // TCefImage

View File

@@ -55,8 +55,8 @@ type
TCefResourceBundleRef = class(TCefBaseRefCountedRef, ICefResourceBundle) TCefResourceBundleRef = class(TCefBaseRefCountedRef, ICefResourceBundle)
protected protected
function GetLocalizedString(stringId: Integer): ustring; function GetLocalizedString(stringId: Integer): ustring;
function GetDataResource(resourceId: Integer; var data: Pointer; var dataSize: NativeUInt): Boolean; function GetDataResource(resourceId: Integer): ICefBinaryValue;
function GetDataResourceForScale(resourceId: Integer; scaleFactor: TCefScaleFactor; var data: Pointer; var dataSize: NativeUInt): Boolean; function GetDataResourceForScale(resourceId: Integer; scaleFactor: TCefScaleFactor): ICefBinaryValue;
public public
class function UnWrap(data: Pointer): ICefResourceBundle; class function UnWrap(data: Pointer): ICefResourceBundle;
class function Global: ICefResourceBundle; class function Global: ICefResourceBundle;
@@ -65,29 +65,21 @@ type
implementation implementation
uses uses
uCEFMiscFunctions, uCEFLibFunctions; uCEFMiscFunctions, uCEFLibFunctions, uCEFBinaryValue;
function TCefResourceBundleRef.GetDataResource( resourceId : Integer; function TCefResourceBundleRef.GetDataResource(resourceId: Integer): ICefBinaryValue;
var data : Pointer;
var dataSize : NativeUInt): Boolean;
begin begin
Result := PCefResourceBundle(FData)^.get_data_resource(PCefResourceBundle(FData), Result := TCefBinaryValueRef.UnWrap(PCefResourceBundle(FData)^.get_data_resource(PCefResourceBundle(FData),
resourceId, resourceId));
data,
dataSize) <> 0;
end; end;
function TCefResourceBundleRef.GetDataResourceForScale( resourceId : Integer; function TCefResourceBundleRef.GetDataResourceForScale(resourceId : Integer;
scaleFactor : TCefScaleFactor; scaleFactor : TCefScaleFactor): ICefBinaryValue;
var data : Pointer;
var dataSize : NativeUInt): Boolean;
begin begin
Result := PCefResourceBundle(FData)^.get_data_resource_for_scale(PCefResourceBundle(FData), Result := TCefBinaryValueRef.UnWrap(PCefResourceBundle(FData)^.get_data_resource_for_scale(PCefResourceBundle(FData),
resourceId, resourceId,
scaleFactor, scaleFactor));
data,
dataSize) <> 0;
end; end;
function TCefResourceBundleRef.GetLocalizedString(stringId: Integer): ustring; function TCefResourceBundleRef.GetLocalizedString(stringId: Integer): ustring;

View File

@@ -1935,8 +1935,8 @@ type
TCefResourceBundle = record TCefResourceBundle = record
base : TCefBaseRefCounted; base : TCefBaseRefCounted;
get_localized_string : function(self: PCefResourceBundle; string_id: Integer): PCefStringUserFree; stdcall; get_localized_string : function(self: PCefResourceBundle; string_id: Integer): PCefStringUserFree; stdcall;
get_data_resource : function(self: PCefResourceBundle; resource_id: Integer; var data: Pointer; var data_size: NativeUInt): Integer; stdcall; get_data_resource : function(self: PCefResourceBundle; resource_id: Integer): PCefBinaryValue; stdcall;
get_data_resource_for_scale : function(self: PCefResourceBundle; resource_id: Integer; scale_factor: TCefScaleFactor; var data: Pointer; var data_size: NativeUInt): Integer; stdcall; get_data_resource_for_scale : function(self: PCefResourceBundle; resource_id: Integer; scale_factor: TCefScaleFactor): PCefBinaryValue; stdcall;
end; end;
// /include/capi/cef_menu_model_delegate_capi.h (cef_menu_model_delegate_t) // /include/capi/cef_menu_model_delegate_capi.h (cef_menu_model_delegate_t)

View File

@@ -2,9 +2,9 @@
"UpdateLazPackages" : [ "UpdateLazPackages" : [
{ {
"ForceNotify" : true, "ForceNotify" : true,
"InternalVersion" : 167, "InternalVersion" : 168,
"Name" : "cef4delphi_lazarus.lpk", "Name" : "cef4delphi_lazarus.lpk",
"Version" : "84.2.6.0" "Version" : "84.3.3.0"
} }
], ],
"UpdatePackageData" : { "UpdatePackageData" : {