From f2e452c02eee12d6a5573ea656b20c5f00d296e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20D=C3=ADaz=20Fau?= Date: Tue, 29 Jan 2019 10:16:58 +0100 Subject: [PATCH] Update to CEF 3.3578.1867.g0f6d65a - Removed obsolete properties in TCefApplication - TabbedBrowser demo now closes when there are no tabs --- .../uFMXExternalPumpBrowser.fmx | 28 +++++++++---------- .../uFMXExternalPumpBrowser.pas | 2 +- demos/MiniBrowser/uMiniBrowser.dfm | 1 + demos/TabbedBrowser/uMainForm.pas | 21 ++++++++------ source/uCEFApplication.pas | 10 +------ 5 files changed, 29 insertions(+), 33 deletions(-) diff --git a/demos/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.fmx b/demos/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.fmx index cdaf2040..0a2b14bd 100644 --- a/demos/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.fmx +++ b/demos/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.fmx @@ -70,6 +70,20 @@ object FMXExternalPumpBrowserFrm: TFMXExternalPumpBrowserFrm end end end + object Timer1: TTimer + Enabled = False + Interval = 300 + OnTimer = Timer1Timer + Left = 40 + Top = 137 + end + object SaveDialog1: TSaveDialog + DefaultExt = 'bmp' + Filter = 'Bitmap files (*.bmp)|*.BMP' + Title = 'Save snapshot' + Left = 40 + Top = 201 + end object Panel1: TFMXBufferPanel Align = Client TabOrder = 0 @@ -90,20 +104,6 @@ object FMXExternalPumpBrowserFrm: TFMXExternalPumpBrowserFrm OnKeyUp = Panel1KeyUp OnKeyDown = Panel1KeyDown end - object Timer1: TTimer - Enabled = False - Interval = 300 - OnTimer = Timer1Timer - Left = 40 - Top = 137 - end - object SaveDialog1: TSaveDialog - DefaultExt = 'bmp' - Filter = 'Bitmap files (*.bmp)|*.BMP' - Title = 'Save snapshot' - Left = 40 - Top = 201 - end object chrmosr: TFMXChromium OnTooltip = chrmosrTooltip OnBeforePopup = chrmosrBeforePopup diff --git a/demos/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.pas b/demos/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.pas index 02b89f18..a390cf97 100644 --- a/demos/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.pas +++ b/demos/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.pas @@ -58,13 +58,13 @@ type TFMXExternalPumpBrowserFrm = class(TForm) AddressPnl: TPanel; AddressEdt: TEdit; - Panel1: TFMXBufferPanel; chrmosr: TFMXChromium; Timer1: TTimer; Panel2: TPanel; GoBtn: TButton; SnapshotBtn: TButton; SaveDialog1: TSaveDialog; + Panel1: TFMXBufferPanel; procedure GoBtnClick(Sender: TObject); procedure GoBtnEnter(Sender: TObject); diff --git a/demos/MiniBrowser/uMiniBrowser.dfm b/demos/MiniBrowser/uMiniBrowser.dfm index dcecf727..bdf8da11 100644 --- a/demos/MiniBrowser/uMiniBrowser.dfm +++ b/demos/MiniBrowser/uMiniBrowser.dfm @@ -141,6 +141,7 @@ object MiniBrowserFrm: TMiniBrowserFrm 'http://www.adobe.com/software/flash/about/' 'http://isflashinstalled.com/' 'http://html5test.com/' + 'https://test.webrtc.org/' 'https://www.w3schools.com/' 'http://webglsamples.org/' 'https://get.webgl.org/' diff --git a/demos/TabbedBrowser/uMainForm.pas b/demos/TabbedBrowser/uMainForm.pas index f53c56ab..683917fe 100644 --- a/demos/TabbedBrowser/uMainForm.pas +++ b/demos/TabbedBrowser/uMainForm.pas @@ -205,17 +205,20 @@ begin if FClosingTab then CanClose := False else - begin - CanClose := FCanClose; + if (PageControl1.PageCount = 0) then + CanClose := True + else + begin + CanClose := FCanClose; - if not(FClosing) then - begin - FClosing := True; - Visible := False; + if not(FClosing) then + begin + FClosing := True; + Visible := False; - CloseAllBrowsers; - end; - end; + CloseAllBrowsers; + end; + end; end; procedure TMainForm.CloseAllBrowsers; diff --git a/source/uCEFApplication.pas b/source/uCEFApplication.pas index 1103f9ed..23678729 100644 --- a/source/uCEFApplication.pas +++ b/source/uCEFApplication.pas @@ -59,7 +59,7 @@ uses const CEF_SUPPORTED_VERSION_MAJOR = 3; CEF_SUPPORTED_VERSION_MINOR = 3578; - CEF_SUPPORTED_VERSION_RELEASE = 1863; + CEF_SUPPORTED_VERSION_RELEASE = 1867; CEF_SUPPORTED_VERSION_BUILD = 0; CEF_CHROMEELF_VERSION_MAJOR = 71; @@ -114,8 +114,6 @@ type FCustomCommandLines : TStringList; FCustomCommandLineValues : TStringList; FFlashEnabled : boolean; - FEnableMediaStream : boolean; - FEnableSpeechInput : boolean; FEnableGPU : boolean; FCheckCEFFiles : boolean; FLibLoaded : boolean; @@ -354,8 +352,6 @@ type property DeleteCache : boolean read FDeleteCache write FDeleteCache; property DeleteCookies : boolean read FDeleteCookies write FDeleteCookies; property FlashEnabled : boolean read FFlashEnabled write FFlashEnabled; - property EnableMediaStream : boolean read FEnableMediaStream write FEnableMediaStream; - property EnableSpeechInput : boolean read FEnableSpeechInput write FEnableSpeechInput; property EnableGPU : boolean read FEnableGPU write FEnableGPU; property CheckCEFFiles : boolean read FCheckCEFFiles write FCheckCEFFiles; property ShowMessageDlg : boolean read FShowMessageDlg write FShowMessageDlg; @@ -528,8 +524,6 @@ begin FDeleteCache := False; FDeleteCookies := False; FFlashEnabled := True; - FEnableMediaStream := True; - FEnableSpeechInput := True; FEnableGPU := False; FCustomCommandLines := nil; FCustomCommandLineValues := nil; @@ -1480,8 +1474,6 @@ begin commandLine.AppendSwitch('--enable-system-flash'); end; - commandLine.AppendSwitchWithValue('--enable-media-stream', IntToStr(Ord(FEnableMediaStream))); - commandLine.AppendSwitchWithValue('--enable-speech-input', IntToStr(Ord(FEnableSpeechInput))); if not(FEnableGPU) then begin