From dee111279bf6dd2b4093c2585bee2a2794d8c7e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20D=C3=ADaz=20Fau?= Date: Sat, 18 Jul 2020 19:12:01 +0200 Subject: [PATCH] Update to CEF 84.2.1 --- README.md | 6 +++--- packages/cef4delphi_lazarus.lpk | 2 +- source/uCEFApplicationCore.pas | 12 ++++++------ source/uCEFConstants.pas | 8 ++++++++ source/uCEFInterfaces.pas | 4 ++-- source/uCEFTextfield.pas | 8 ++++---- source/uCEFTextfieldComponent.pas | 8 ++++---- source/uCEFTypes.pas | 5 +++-- update_CEF4Delphi.json | 4 ++-- 9 files changed, 33 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index ce250f16..0f0514f4 100644 --- a/README.md +++ b/README.md @@ -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 uses CEF 83.5.0 which includes Chromium 83.0.4103.106. +CEF4Delphi uses CEF 84.2.1 which includes Chromium 84.0.4147.89. The CEF binaries used by CEF4Delphi are available for download at spotify : -* [32 bits](http://opensource.spotify.com/cefbuilds/cef_binary_83.5.0%2Bgbf03589%2Bchromium-83.0.4103.106_windows32.tar.bz2) -* [64 bits](http://opensource.spotify.com/cefbuilds/cef_binary_83.5.0%2Bgbf03589%2Bchromium-83.0.4103.106_windows64.tar.bz2) +* [32 bits](http://opensource.spotify.com/cefbuilds/cef_binary_84.2.1%2Bg3f2c372%2Bchromium-84.0.4147.89_windows32.tar.bz2) +* [64 bits](http://opensource.spotify.com/cefbuilds/cef_binary_84.2.1%2Bg3f2c372%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. diff --git a/packages/cef4delphi_lazarus.lpk b/packages/cef4delphi_lazarus.lpk index a8b43e62..bc4b2dc5 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 384d8542..39ab87ef 100644 --- a/source/uCEFApplicationCore.pas +++ b/source/uCEFApplicationCore.pas @@ -60,15 +60,15 @@ uses uCEFTypes, uCEFInterfaces, uCEFBaseRefCounted, uCEFSchemeRegistrar; const - CEF_SUPPORTED_VERSION_MAJOR = 83; - CEF_SUPPORTED_VERSION_MINOR = 5; - CEF_SUPPORTED_VERSION_RELEASE = 0; + CEF_SUPPORTED_VERSION_MAJOR = 84; + CEF_SUPPORTED_VERSION_MINOR = 2; + CEF_SUPPORTED_VERSION_RELEASE = 1; CEF_SUPPORTED_VERSION_BUILD = 0; - CEF_CHROMEELF_VERSION_MAJOR = 83; + CEF_CHROMEELF_VERSION_MAJOR = 84; CEF_CHROMEELF_VERSION_MINOR = 0; - CEF_CHROMEELF_VERSION_RELEASE = 4103; - CEF_CHROMEELF_VERSION_BUILD = 106; + CEF_CHROMEELF_VERSION_RELEASE = 4147; + CEF_CHROMEELF_VERSION_BUILD = 89; {$IFDEF MSWINDOWS} LIBCEF_DLL = 'libcef.dll'; diff --git a/source/uCEFConstants.pas b/source/uCEFConstants.pas index c8672bfd..08f6a066 100644 --- a/source/uCEFConstants.pas +++ b/source/uCEFConstants.pas @@ -543,6 +543,14 @@ const CEF_COOKIE_PRIORITY_MEDIUM = 0; CEF_COOKIE_PRIORITY_HIGH = 1; + // /include/internal/cef_types.h (cef_text_field_commands_t) + CEF_TFC_CUT = 1; + CEF_TFC_COPY = 2; + CEF_TFC_PASTE = 3; + CEF_TFC_UNDO = 4; + CEF_TFC_DELETE = 5; + CEF_TFC_SELECT_ALL = 6; + //****************************************************** //****************** OTHER CONSTANTS ******************* diff --git a/source/uCEFInterfaces.pas b/source/uCEFInterfaces.pas index 767b2557..1b469c46 100644 --- a/source/uCEFInterfaces.pas +++ b/source/uCEFInterfaces.pas @@ -2635,8 +2635,8 @@ type procedure SetFontList(const font_list: ustring); procedure ApplyTextColor(color: TCefColor; const range: TCefRange); procedure ApplyTextStyle(style: TCefTextStyle; add: boolean; const range: TCefRange); - function IsCommandEnabled(command_id: Integer): boolean; - procedure ExecuteCommand(command_id: Integer); + function IsCommandEnabled(command_id: TCefTextFieldCommands): boolean; + procedure ExecuteCommand(command_id: TCefTextFieldCommands); procedure ClearEditHistory; procedure SetPlaceholderText(const text_: ustring); function GetPlaceholderText : ustring; diff --git a/source/uCEFTextfield.pas b/source/uCEFTextfield.pas index dfa78cbb..51092752 100644 --- a/source/uCEFTextfield.pas +++ b/source/uCEFTextfield.pas @@ -83,8 +83,8 @@ type procedure SetFontList(const font_list: ustring); procedure ApplyTextColor(color: TCefColor; const range: TCefRange); procedure ApplyTextStyle(style: TCefTextStyle; add: boolean; const range: TCefRange); - function IsCommandEnabled(command_id: Integer): boolean; - procedure ExecuteCommand(command_id: Integer); + function IsCommandEnabled(command_id: TCefTextFieldCommands): boolean; + procedure ExecuteCommand(command_id: TCefTextFieldCommands); procedure ClearEditHistory; procedure SetPlaceholderText(const text_: ustring); function GetPlaceholderText : ustring; @@ -235,12 +235,12 @@ begin PCefTextfield(FData)^.apply_text_style(PCefTextfield(FData), style, ord(add), @range); end; -function TCefTextfieldRef.IsCommandEnabled(command_id: Integer): boolean; +function TCefTextfieldRef.IsCommandEnabled(command_id: TCefTextFieldCommands): boolean; begin Result := (PCefTextfield(FData)^.is_command_enabled(PCefTextfield(FData), command_id) <> 0); end; -procedure TCefTextfieldRef.ExecuteCommand(command_id: Integer); +procedure TCefTextfieldRef.ExecuteCommand(command_id: TCefTextFieldCommands); begin PCefTextfield(FData)^.execute_command(PCefTextfield(FData), command_id); end; diff --git a/source/uCEFTextfieldComponent.pas b/source/uCEFTextfieldComponent.pas index 1bd69439..d6852f6b 100644 --- a/source/uCEFTextfieldComponent.pas +++ b/source/uCEFTextfieldComponent.pas @@ -112,8 +112,8 @@ type procedure SetFontList(const font_list: ustring); procedure ApplyTextColor(color: TCefColor; const range: TCefRange); procedure ApplyTextStyle(style: TCefTextStyle; add: boolean; const range: TCefRange); - function IsCommandEnabled(command_id: Integer): boolean; - procedure ExecuteCommand(command_id: Integer); + function IsCommandEnabled(command_id: TCefTextFieldCommands): boolean; + procedure ExecuteCommand(command_id: TCefTextFieldCommands); procedure ClearEditHistory; procedure SetAccessibleName(const name_: ustring); procedure SetPlaceholderTextColor(color: TCefColor); @@ -406,12 +406,12 @@ begin FTextfield.ApplyTextStyle(style, add, range); end; -function TCEFTextfieldComponent.IsCommandEnabled(command_id: Integer): boolean; +function TCEFTextfieldComponent.IsCommandEnabled(command_id: TCefTextFieldCommands): boolean; begin Result := Initialized and FTextfield.IsCommandEnabled(command_id); end; -procedure TCEFTextfieldComponent.ExecuteCommand(command_id: Integer); +procedure TCEFTextfieldComponent.ExecuteCommand(command_id: TCefTextFieldCommands); begin if Initialized then FTextfield.ExecuteCommand(command_id); diff --git a/source/uCEFTypes.pas b/source/uCEFTypes.pas index 4391fe32..b055c022 100644 --- a/source/uCEFTypes.pas +++ b/source/uCEFTypes.pas @@ -315,6 +315,7 @@ type TCefSchemeOptions = Integer; // /include/internal/cef_types.h (cef_scheme_options_t) TCefMediaRouterCreateResult = Integer; // /include/internal/cef_types.h (cef_media_route_create_result_t) TCefCookiePriority = Integer; // /include/internal/cef_types.h (cef_cookie_priority_t) + TCefTextFieldCommands = Integer; // /include/internal/cef_types.h (cef_text_field_commands_t) @@ -3186,8 +3187,8 @@ type set_font_list : procedure(self: PCefTextfield; const font_list: PCefString); stdcall; apply_text_color : procedure(self: PCefTextfield; color: TCefColor; const range: PCefRange); stdcall; apply_text_style : procedure(self: PCefTextfield; style: TCefTextStyle; add: Integer; const range: PCefRange); stdcall; - is_command_enabled : function(self: PCefTextfield; command_id: Integer): Integer; stdcall; - execute_command : procedure(self: PCefTextfield; command_id: Integer); stdcall; + is_command_enabled : function(self: PCefTextfield; command_id: TCefTextFieldCommands): Integer; stdcall; + execute_command : procedure(self: PCefTextfield; command_id: TCefTextFieldCommands); stdcall; clear_edit_history : procedure(self: PCefTextfield); stdcall; set_placeholder_text : procedure(self: PCefTextfield; const text: PCefString); stdcall; get_placeholder_text : function(self: PCefTextfield): PCefStringUserFree; stdcall; diff --git a/update_CEF4Delphi.json b/update_CEF4Delphi.json index 90e8ddd7..a41c6efd 100644 --- a/update_CEF4Delphi.json +++ b/update_CEF4Delphi.json @@ -2,9 +2,9 @@ "UpdateLazPackages" : [ { "ForceNotify" : true, - "InternalVersion" : 164, + "InternalVersion" : 165, "Name" : "cef4delphi_lazarus.lpk", - "Version" : "83.5.0.0" + "Version" : "84.2.1.0" } ], "UpdatePackageData" : {