Skip to content

Commit

Permalink
Update to CEF 79.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
salvadordf committed Jan 7, 2020
1 parent 26edf79 commit c14be37
Show file tree
Hide file tree
Showing 10 changed files with 818 additions and 27 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 79.0.10 which includes Chromium 79.0.3945.88.
CEF4Delphi uses CEF 79.1.3 which includes Chromium 79.0.3945.88.
The CEF binaries used by CEF4Delphi are available for download at spotify :
* [32 bits](http://opensource.spotify.com/cefbuilds/cef_binary_79.0.10%2Bge866a07%2Bchromium-79.0.3945.88_windows32.tar.bz2)
* [64 bits](http://opensource.spotify.com/cefbuilds/cef_binary_79.0.10%2Bge866a07%2Bchromium-79.0.3945.88_windows64.tar.bz2)
* [32 bits](http://opensource.spotify.com/cefbuilds/cef_binary_79.1.3%2Bga5342ed%2Bchromium-79.0.3945.88_windows32.tar.bz2)
* [64 bits](http://opensource.spotify.com/cefbuilds/cef_binary_79.1.3%2Bga5342ed%2Bchromium-79.0.3945.88_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.
Expand Down
406 changes: 404 additions & 2 deletions demos/Delphi_VCL/JavaScript/JSRTTIExtension/JSRTTIExtension.dproj

Large diffs are not rendered by default.

404 changes: 403 additions & 1 deletion demos/Delphi_VCL/PostInspectorBrowser/PostInspectorBrowser.dproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,4 @@ object Form1: TForm1
Left = 56
Top = 152
end
object CEFSentinel1: TCEFSentinel
OnClose = CEFSentinel1Close
Left = 56
Top = 224
end
end
12 changes: 2 additions & 10 deletions demos/Delphi_VCL/PostInspectorBrowser/uPostInspectorBrowser.pas
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ interface
Controls, Forms, Dialogs, StdCtrls, ExtCtrls, SyncObjs,
{$ENDIF}
uCEFChromium, uCEFWindowParent, uCEFInterfaces, uCEFConstants, uCEFTypes,
uCEFWinControl, uCEFSentinel;
uCEFWinControl, uCEFSentinel, uCEFChromiumCore;

const
CEF_SHOWDATA = WM_APP + $B00;
Expand All @@ -65,7 +65,6 @@ TForm1 = class(TForm)
Memo1: TMemo;
AddressCb: TComboBox;
Splitter1: TSplitter;
CEFSentinel1: TCEFSentinel;
procedure GoBtnClick(Sender: TObject);
procedure FormShow(Sender: TObject);
procedure Timer1Timer(Sender: TObject);
Expand All @@ -89,7 +88,6 @@ TForm1 = class(TForm)
const browser: ICefBrowser; const frame: ICefFrame;
const request: ICefRequest; const callback: ICefRequestCallback;
out Result: TCefReturnValue);
procedure CEFSentinel1Close(Sender: TObject);
protected
// Variables to control when can we destroy the form safely
FCanClose : boolean; // Set to True in TChromium.OnBeforeClose
Expand Down Expand Up @@ -142,8 +140,7 @@ implementation
// =================
// 1. FormCloseQuery sets CanClose to FALSE calls TChromium.CloseBrowser which triggers the TChromium.OnClose event.
// 2. TChromium.OnClose sends a CEFBROWSER_DESTROY message to destroy CEFWindowParent1 in the main thread, which triggers the TChromium.OnBeforeClose event.
// 3. TChromium.OnBeforeClose calls TCEFSentinel.Start, which will trigger TCEFSentinel.OnClose when the renderer processes are closed.
// 4. TCEFSentinel.OnClose sets FCanClose := True and sends WM_CLOSE to the form.
// 3. TChromium.OnBeforeClose sets FCanClose := True and sends WM_CLOSE to the form.

procedure CreateGlobalCEFApp;
begin
Expand Down Expand Up @@ -383,11 +380,6 @@ procedure TForm1.ShowDataMsg(var aMessage : TMessage);
end;

procedure TForm1.Chromium1BeforeClose(Sender: TObject; const browser: ICefBrowser);
begin
CEFSentinel1.Start;
end;

procedure TForm1.CEFSentinel1Close(Sender: TObject);
begin
FCanClose := True;
PostMessage(Handle, WM_CLOSE, 0, 0);
Expand Down
Binary file modified packages/CEF4Delphi_FMX.res
Binary file not shown.
2 changes: 1 addition & 1 deletion packages/cef4delphi_lazarus.lpk
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</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."/>
<License Value="MPL 1.1"/>
<Version Major="79" Release="10"/>
<Version Major="79" Minor="1" Release="3"/>
<Files Count="146">
<Item1>
<Filename Value="..\source\uCEFAccessibilityHandler.pas"/>
Expand Down
4 changes: 2 additions & 2 deletions source/uCEFApplicationCore.pas
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ interface

const
CEF_SUPPORTED_VERSION_MAJOR = 79;
CEF_SUPPORTED_VERSION_MINOR = 0;
CEF_SUPPORTED_VERSION_RELEASE = 10;
CEF_SUPPORTED_VERSION_MINOR = 1;
CEF_SUPPORTED_VERSION_RELEASE = 3;
CEF_SUPPORTED_VERSION_BUILD = 0;

CEF_CHROMEELF_VERSION_MAJOR = 79;
Expand Down
2 changes: 1 addition & 1 deletion source/uCEFChromiumCore.pas
Original file line number Diff line number Diff line change
Expand Up @@ -5436,7 +5436,7 @@ function TChromiumCore.CopyDCToBitmapStream(aSrcDC : HDC; const aSrcRect : TRect
if BitBlt(TempDstDC, 0, 0, TempWidth, TempHeight, aSrcDC, aSrcRect.Left, aSrcRect.Top, SRCCOPY) then
begin
TempHeader.bfType := $4D42; // "BM" bitmap header
TempHeader.bfOffBits := sizeof(BITMAPFILEHEADER) + TempInfo.bmiHeader.biSize + TempInfo.bmiHeader.biClrUsed * SizeOf(TRGBQuad);
TempHeader.bfOffBits := sizeof(TBitmapFileHeader) + TempInfo.bmiHeader.biSize + TempInfo.bmiHeader.biClrUsed * SizeOf(TRGBQuad);
TempHeader.bfSize := TempHeader.bfOffBits + TempInfo.bmiHeader.biSizeImage;

aStream.position := 0;
Expand Down
4 changes: 2 additions & 2 deletions update_CEF4Delphi.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"UpdateLazPackages" : [
{
"ForceNotify" : true,
"InternalVersion" : 79,
"InternalVersion" : 80,
"Name" : "cef4delphi_lazarus.lpk",
"Version" : "79.0.10.0"
"Version" : "79.1.3.0"
}
],
"UpdatePackageData" : {
Expand Down

0 comments on commit c14be37

Please sign in to comment.