From 181f58984307d77d1aa1782d3d73c495b7045ad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20D=C3=ADaz=20Fau?= Date: Sun, 14 Mar 2021 11:54:24 +0100 Subject: [PATCH] Update to CEF 89.0.7 --- README.md | 16 ++++++++-------- packages/cef4delphi_lazarus.lpk | 2 +- source/uCEFApplicationCore.pas | 2 +- source/uCEFBufferPanel.pas | 12 ++++++------ update_CEF4Delphi.json | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index b5f4d67b..8fc1f26e 100644 --- a/README.md +++ b/README.md @@ -3,15 +3,15 @@ CEF4Delphi is an open source project created by Salvador Díaz Fau to embed Chro CEF4Delphi is based on DCEF3 and fpCEF3. The original license of those projects still applies to CEF4Delphi. Read the license terms in the first lines of any *.pas file. -CEF4Delphi uses CEF 89.0.6 which includes Chromium 89.0.4389.72. +CEF4Delphi uses CEF 89.0.7 which includes Chromium 89.0.4389.72. The CEF binaries used by CEF4Delphi are available for download at spotify : -* [Windows 32 bits](https://cef-builds.spotifycdn.com/cef_binary_89.0.6%2Bg6f30454%2Bchromium-89.0.4389.72_windows32.tar.bz2) -* [Windows 64 bits](https://cef-builds.spotifycdn.com/cef_binary_89.0.6%2Bg6f30454%2Bchromium-89.0.4389.72_windows64.tar.bz2) -* [Linux x86 32 bits](https://cef-builds.spotifycdn.com/cef_binary_89.0.6%2Bg6f30454%2Bchromium-89.0.4389.72_linux32.tar.bz2) -* [Linux x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_89.0.6%2Bg6f30454%2Bchromium-89.0.4389.72_linux64.tar.bz2) -* [Linux ARM 32 bits](https://cef-builds.spotifycdn.com/cef_binary_89.0.6%2Bg6f30454%2Bchromium-89.0.4389.72_linuxarm.tar.bz2) -* [Linux ARM 64 bits](https://cef-builds.spotifycdn.com/cef_binary_89.0.6%2Bg6f30454%2Bchromium-89.0.4389.72_linuxarm64.tar.bz2) -* [MacOS x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_89.0.6%2Bg6f30454%2Bchromium-89.0.4389.72_macosx64.tar.bz2) +* [Windows 32 bits](https://cef-builds.spotifycdn.com/cef_binary_89.0.7%2Bgb5952bd%2Bchromium-89.0.4389.72_windows32.tar.bz2) +* [Windows 64 bits](https://cef-builds.spotifycdn.com/cef_binary_89.0.7%2Bgb5952bd%2Bchromium-89.0.4389.72_windows64.tar.bz2) +* [Linux x86 32 bits](https://cef-builds.spotifycdn.com/cef_binary_89.0.7%2Bgb5952bd%2Bchromium-89.0.4389.72_linux32.tar.bz2) +* [Linux x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_89.0.7%2Bgb5952bd%2Bchromium-89.0.4389.72_linux64.tar.bz2) +* [Linux ARM 32 bits](https://cef-builds.spotifycdn.com/cef_binary_89.0.7%2Bgb5952bd%2Bchromium-89.0.4389.72_linuxarm.tar.bz2) +* [Linux ARM 64 bits](https://cef-builds.spotifycdn.com/cef_binary_89.0.7%2Bgb5952bd%2Bchromium-89.0.4389.72_linuxarm64.tar.bz2) +* [MacOS x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_89.0.7%2Bgb5952bd%2Bchromium-89.0.4389.72_macosx64.tar.bz2) CEF4Delphi was developed and tested on Delphi 10.4.2 and it has been tested in Delphi 7, Delphi XE, Delphi 10, Delphi 10.2, Delphi 10.3 and Lazarus 2.0.12/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 4f293e26..5af74a7a 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 3e428eef..a0b757e2 100644 --- a/source/uCEFApplicationCore.pas +++ b/source/uCEFApplicationCore.pas @@ -66,7 +66,7 @@ uses const CEF_SUPPORTED_VERSION_MAJOR = 89; CEF_SUPPORTED_VERSION_MINOR = 0; - CEF_SUPPORTED_VERSION_RELEASE = 6; + CEF_SUPPORTED_VERSION_RELEASE = 7; CEF_SUPPORTED_VERSION_BUILD = 0; CEF_CHROMEELF_VERSION_MAJOR = 89; diff --git a/source/uCEFBufferPanel.pas b/source/uCEFBufferPanel.pas index 74c8eb59..34b50524 100644 --- a/source/uCEFBufferPanel.pas +++ b/source/uCEFBufferPanel.pas @@ -137,7 +137,6 @@ type procedure DoOnIMECancelComposition; virtual; procedure DoOnIMECommitText(const aText : ustring; const replacement_range : PCefRange; relative_cursor_pos : integer); virtual; procedure DoOnIMESetComposition(const aText : ustring; const underlines : TCefCompositionUnderlineDynArray; const replacement_range, selection_range : TCefRange); virtual; - {$ENDIF} public @@ -642,7 +641,9 @@ begin Canvas.FillRect(rect(0, 0, Width, Height)); end; - if Assigned(OnPaint) then OnPaint(Self); + {$IFDEF FPC} + if assigned(OnPaint) then OnPaint(Self); + {$ENDIF} end; {$IFDEF MSWINDOWS} @@ -822,14 +823,14 @@ end; procedure TBufferPanel.DoOnIMECancelComposition; begin - if FOnIMECancelComposition <> nil then + if assigned(FOnIMECancelComposition) then FOnIMECancelComposition(Self); end; procedure TBufferPanel.DoOnIMECommitText(const aText: ustring; const replacement_range: PCefRange; relative_cursor_pos: integer); begin - if FOnIMECommitText <> nil then + if assigned(FOnIMECommitText) then FOnIMECommitText(Self, aText, replacement_range, relative_cursor_pos); end; @@ -837,10 +838,9 @@ procedure TBufferPanel.DoOnIMESetComposition(const aText: ustring; const underlines: TCefCompositionUnderlineDynArray; const replacement_range, selection_range: TCefRange); begin - if FOnIMESetComposition <> nil then + if assigned(FOnIMESetComposition) then FOnIMESetComposition(Self, aText, underlines, replacement_range, selection_range); end; - {$ENDIF} function TBufferPanel.GetBufferBits : pointer; diff --git a/update_CEF4Delphi.json b/update_CEF4Delphi.json index f62d7796..8578e9c4 100644 --- a/update_CEF4Delphi.json +++ b/update_CEF4Delphi.json @@ -2,9 +2,9 @@ "UpdateLazPackages" : [ { "ForceNotify" : true, - "InternalVersion" : 268, + "InternalVersion" : 269, "Name" : "cef4delphi_lazarus.lpk", - "Version" : "89.0.6.0" + "Version" : "89.0.7.0" } ], "UpdatePackageData" : {