Skip to content

Commit ac17ee5

Browse files
committed
Update to WebView2 NuGet 1.0.1072.54
1 parent 1747211 commit ac17ee5

19 files changed

+731
-204
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ WebView4Delphi is an open source project created by Salvador Díaz Fau to embed
33

44
WebView4Delphi only supports Windows. If you need to embed a web browser in Linux, Windows or MacOS consider using [CEF4Delphi](https://github.com/salvadordf/CEF4Delphi) instead.
55

6-
WebView4Delphi uses the [Microsoft Edge WebView2 Runtime](https://docs.microsoft.com/en-us/microsoft-edge/webview2/) and [Microsoft.Web.WebView2 NuGet package version 1.0.1054.31](https://www.nuget.org/packages/Microsoft.Web.WebView2) to embed a web browser.
6+
WebView4Delphi uses the [Microsoft Edge WebView2 Runtime](https://docs.microsoft.com/en-us/microsoft-edge/webview2/) and [Microsoft.Web.WebView2 NuGet package version 1.0.1072.54](https://www.nuget.org/packages/Microsoft.Web.WebView2) to embed a web browser.
77

88
WebView4Delphi was developed and tested on Delphi 11.0, Delphi XE3 and Lazarus 2.2.0/FPC 3.2.2.
99

bin32/WebView2Loader.dll

1 KB
Binary file not shown.

bin64/WebView2Loader.dll

1.47 KB
Binary file not shown.

demos/Delphi_VCL/MiniBrowser/uMiniBrowser.dfm

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,10 @@ object MiniBrowserFrm: TMiniBrowserFrm
328328
Caption = 'Change user agent string...'
329329
OnClick = Changeuseragentstring1Click
330330
end
331+
object Muted1: TMenuItem
332+
Caption = 'Muted'
333+
OnClick = Muted1Click
334+
end
331335
end
332336
object OpenDialog1: TOpenDialog
333337
Left = 48

demos/Delphi_VCL/MiniBrowser/uMiniBrowser.pas

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ TMiniBrowserFrm = class(TForm)
4949
Availablebrowserversion1: TMenuItem;
5050
SaveToFileMi: TMenuItem;
5151
Changeuseragentstring1: TMenuItem;
52+
Muted1: TMenuItem;
5253

5354
procedure FormShow(Sender: TObject);
5455
procedure FormCreate(Sender: TObject);
@@ -97,6 +98,7 @@ TMiniBrowserFrm = class(TForm)
9798
procedure WVBrowser1RetrieveHTMLCompleted(Sender: TObject; aResult: Boolean; const aHTML: wvstring);
9899
procedure WVBrowser1RetrieveTextCompleted(Sender: TObject; aResult: Boolean; const aText: wvstring);
99100
procedure WVBrowser1RetrieveMHTMLCompleted(Sender: TObject; aResult: Boolean; const aMHTML: wvstring);
101+
procedure Muted1Click(Sender: TObject);
100102

101103
protected
102104
FDownloadOperation : TCoreWebView2DownloadOperation;
@@ -154,7 +156,7 @@ procedure TMiniBrowserFrm.akesnapshot1Click(Sender: TObject);
154156

155157
procedure TMiniBrowserFrm.Availablebrowserversion1Click(Sender: TObject);
156158
begin
157-
showmessage(GlobalWebView2Loader.AvailableBrowserVersion);
159+
showmessage('Available browser version : ' + GlobalWebView2Loader.AvailableBrowserVersion);
158160
end;
159161

160162
procedure TMiniBrowserFrm.BackBtnClick(Sender: TObject);
@@ -271,6 +273,11 @@ procedure TMiniBrowserFrm.LoadFromFileMiClick(Sender: TObject);
271273
end;
272274
end;
273275

276+
procedure TMiniBrowserFrm.Muted1Click(Sender: TObject);
277+
begin
278+
WVBrowser1.ToggleMuteState;
279+
end;
280+
274281
procedure TMiniBrowserFrm.LoadFromFileAsString(const aFileName : string);
275282
var
276283
TempLines : TStringList;
@@ -325,6 +332,7 @@ procedure TMiniBrowserFrm.PopupMenu1Popup(Sender: TObject);
325332
Blockimages1.Checked := FBlockImages;
326333
Offline1.Checked := WVBrowser1.Offline;
327334
Ignorecertificateerrors1.Checked := WVBrowser1.IgnoreCertificateErrors;
335+
Muted1.Checked := WVBrowser1.IsMuted;
328336
end;
329337

330338
procedure TMiniBrowserFrm.Print1Click(Sender: TObject);
@@ -648,6 +656,7 @@ procedure TMiniBrowserFrm.WMMoving(var aMessage : TMessage);
648656
initialization
649657
GlobalWebView2Loader := TWVLoader.Create(nil);
650658
GlobalWebView2Loader.UserDataFolder := ExtractFileDir(Application.ExeName) + '\CustomCache';
659+
GlobalWebView2Loader.RemoteDebuggingPort := 9222;
651660
GlobalWebView2Loader.StartWebView2;
652661

653662
end.

demos/Lazarus/MiniBrowser/MiniBrowser.lpi

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<CONFIG>
33
<ProjectOptions>
4-
<Version Value="11"/>
4+
<Version Value="12"/>
55
<PathDelim Value="\"/>
66
<General>
77
<Flags>
88
<MainUnitHasUsesSectionForAllUnits Value="False"/>
99
<MainUnitHasCreateFormStatements Value="False"/>
1010
<MainUnitHasTitleStatement Value="False"/>
1111
<MainUnitHasScaledStatement Value="False"/>
12+
<CompatibilityMode Value="True"/>
1213
</Flags>
1314
<SessionStorage Value="InProjectDir"/>
14-
<MainUnit Value="0"/>
1515
<Title Value="MiniBrowser"/>
1616
<UseAppBundle Value="False"/>
1717
<ResourceType Value="res"/>
@@ -25,7 +25,6 @@
2525
</PublishOptions>
2626
<RunParams>
2727
<FormatVersion Value="2"/>
28-
<Modes Count="0"/>
2928
</RunParams>
3029
<RequiredPackages Count="2">
3130
<Item1>

demos/Lazarus/MiniBrowser/MiniBrowser.lps

Lines changed: 37 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22
<CONFIG>
33
<ProjectSession>
44
<PathDelim Value="\"/>
5-
<Version Value="11"/>
5+
<Version Value="12"/>
66
<BuildModes Active="Default"/>
77
<Units Count="28">
88
<Unit0>
99
<Filename Value="MiniBrowser.lpr"/>
1010
<IsPartOfProject Value="True"/>
1111
<UsageCount Value="22"/>
1212
<Loaded Value="True"/>
13-
<DefaultSyntaxHighlighter Value="Delphi"/>
1413
</Unit0>
1514
<Unit1>
1615
<Filename Value="uMiniBrowser.pas"/>
@@ -20,15 +19,14 @@
2019
<ResourceBaseClass Value="Form"/>
2120
<IsVisibleTab Value="True"/>
2221
<EditorIndex Value="1"/>
23-
<TopLine Value="411"/>
24-
<CursorPos Y="424"/>
22+
<TopLine Value="319"/>
23+
<CursorPos X="75" Y="340"/>
2524
<UsageCount Value="22"/>
2625
<Bookmarks Count="1">
27-
<Item0 Y="222" ID="1"/>
26+
<Item0 X="106" Y="224" ID="1"/>
2827
</Bookmarks>
2928
<Loaded Value="True"/>
3029
<LoadedDesigner Value="True"/>
31-
<DefaultSyntaxHighlighter Value="Delphi"/>
3230
</Unit1>
3331
<Unit2>
3432
<Filename Value="uTextViewerForm.pas"/>
@@ -216,14 +214,13 @@
216214
</Unit20>
217215
<Unit21>
218216
<Filename Value="..\..\..\source\uWVBrowserBase.pas"/>
219-
<EditorIndex Value="3"/>
217+
<EditorIndex Value="-1"/>
220218
<TopLine Value="305"/>
221219
<CursorPos X="19" Y="322"/>
222220
<UsageCount Value="10"/>
223221
<Bookmarks Count="1">
224222
<Item0 X="27" Y="2319" ID="2"/>
225223
</Bookmarks>
226-
<Loaded Value="True"/>
227224
<DefaultSyntaxHighlighter Value="Delphi"/>
228225
</Unit21>
229226
<Unit22>
@@ -263,138 +260,137 @@
263260
</Unit26>
264261
<Unit27>
265262
<Filename Value="C:\lazarus\fpc\3.2.0\source\packages\fcl-json\src\fpjson.pp"/>
266-
<EditorIndex Value="2"/>
263+
<EditorIndex Value="-1"/>
267264
<TopLine Value="94"/>
268265
<CursorPos X="3" Y="99"/>
269266
<UsageCount Value="10"/>
270-
<Loaded Value="True"/>
271267
</Unit27>
272268
</Units>
273269
<JumpHistory Count="30" HistoryIndex="29">
274270
<Position1>
275271
<Filename Value="uMiniBrowser.pas"/>
276-
<Caret Line="462" Column="65" TopLine="424"/>
272+
<Caret Line="376" Column="58" TopLine="362"/>
277273
</Position1>
278274
<Position2>
279275
<Filename Value="uMiniBrowser.pas"/>
280-
<Caret Line="95" Column="78" TopLine="91"/>
276+
<Caret Line="379" Column="87" TopLine="360"/>
281277
</Position2>
282278
<Position3>
283279
<Filename Value="uMiniBrowser.pas"/>
284-
<Caret Line="122" Column="27" TopLine="117"/>
280+
<Caret Line="399" Column="48" TopLine="375"/>
285281
</Position3>
286282
<Position4>
287283
<Filename Value="uMiniBrowser.pas"/>
288-
<Caret Line="385" Column="63" TopLine="369"/>
284+
<Caret Line="391" TopLine="375"/>
289285
</Position4>
290286
<Position5>
291287
<Filename Value="uMiniBrowser.pas"/>
292-
<Caret Line="123" Column="50" TopLine="114"/>
288+
<Caret Line="393" TopLine="375"/>
293289
</Position5>
294290
<Position6>
295291
<Filename Value="uMiniBrowser.pas"/>
296-
<Caret Line="396" Column="42" TopLine="383"/>
292+
<Caret Line="394" TopLine="375"/>
297293
</Position6>
298294
<Position7>
299295
<Filename Value="uMiniBrowser.pas"/>
300-
<Caret Line="376" Column="58" TopLine="362"/>
296+
<Caret Line="396" TopLine="375"/>
301297
</Position7>
302298
<Position8>
303299
<Filename Value="uMiniBrowser.pas"/>
304-
<Caret Line="379" Column="87" TopLine="360"/>
300+
<Caret Line="387" Column="31" TopLine="375"/>
305301
</Position8>
306302
<Position9>
307303
<Filename Value="uMiniBrowser.pas"/>
308-
<Caret Line="399" Column="48" TopLine="375"/>
304+
<Caret Line="397" Column="52" TopLine="375"/>
309305
</Position9>
310306
<Position10>
311307
<Filename Value="uMiniBrowser.pas"/>
312-
<Caret Line="391" TopLine="375"/>
308+
<Caret Line="396" Column="52" TopLine="374"/>
313309
</Position10>
314310
<Position11>
315311
<Filename Value="uMiniBrowser.pas"/>
316-
<Caret Line="393" TopLine="375"/>
312+
<Caret Line="395" Column="52" TopLine="373"/>
317313
</Position11>
318314
<Position12>
319315
<Filename Value="uMiniBrowser.pas"/>
320-
<Caret Line="394" TopLine="375"/>
316+
<Caret Line="394" Column="52" TopLine="372"/>
321317
</Position12>
322318
<Position13>
323319
<Filename Value="uMiniBrowser.pas"/>
324-
<Caret Line="396" TopLine="375"/>
320+
<Caret Line="293" TopLine="286"/>
325321
</Position13>
326322
<Position14>
327323
<Filename Value="uMiniBrowser.pas"/>
328-
<Caret Line="387" Column="31" TopLine="375"/>
324+
<Caret Line="88" Column="27" TopLine="57"/>
329325
</Position14>
330326
<Position15>
331327
<Filename Value="uMiniBrowser.pas"/>
332-
<Caret Line="397" Column="52" TopLine="375"/>
328+
<Caret Line="86" Column="29" TopLine="60"/>
333329
</Position15>
334330
<Position16>
335331
<Filename Value="uMiniBrowser.pas"/>
336-
<Caret Line="396" Column="52" TopLine="374"/>
332+
<Caret Line="106" Column="43" TopLine="74"/>
337333
</Position16>
338334
<Position17>
339335
<Filename Value="uMiniBrowser.pas"/>
340-
<Caret Line="395" Column="52" TopLine="373"/>
336+
<Caret Line="595" Column="50" TopLine="575"/>
341337
</Position17>
342338
<Position18>
343339
<Filename Value="uMiniBrowser.pas"/>
344-
<Caret Line="394" Column="52" TopLine="372"/>
340+
<Caret Line="599" Column="64" TopLine="568"/>
345341
</Position18>
346342
<Position19>
347343
<Filename Value="uMiniBrowser.pas"/>
348-
<Caret Line="293" TopLine="286"/>
344+
<Caret Line="120" Column="15" TopLine="103"/>
349345
</Position19>
350346
<Position20>
351347
<Filename Value="uMiniBrowser.pas"/>
352-
<Caret Line="88" Column="27" TopLine="57"/>
348+
<Caret Line="502" Column="56" TopLine="465"/>
353349
</Position20>
354350
<Position21>
355351
<Filename Value="uMiniBrowser.pas"/>
356-
<Caret Line="86" Column="29" TopLine="60"/>
352+
<Caret Line="89" TopLine="57"/>
357353
</Position21>
358354
<Position22>
359355
<Filename Value="uMiniBrowser.pas"/>
360-
<Caret Line="106" Column="43" TopLine="74"/>
356+
<Caret Line="340" TopLine="299"/>
361357
</Position22>
362358
<Position23>
363359
<Filename Value="uMiniBrowser.pas"/>
364-
<Caret Line="595" Column="50" TopLine="575"/>
360+
<Caret Line="536" Column="41" TopLine="515"/>
365361
</Position23>
366362
<Position24>
367363
<Filename Value="uMiniBrowser.pas"/>
368-
<Caret Line="599" Column="64" TopLine="568"/>
364+
<Caret Line="120" Column="15" TopLine="102"/>
369365
</Position24>
370366
<Position25>
371367
<Filename Value="uMiniBrowser.pas"/>
372-
<Caret Line="120" Column="15" TopLine="103"/>
368+
<Caret Line="424" TopLine="411"/>
373369
</Position25>
374370
<Position26>
375371
<Filename Value="uMiniBrowser.pas"/>
376-
<Caret Line="502" Column="56" TopLine="465"/>
372+
<Caret Line="155" Column="78" TopLine="155"/>
377373
</Position26>
378374
<Position27>
379375
<Filename Value="uMiniBrowser.pas"/>
380-
<Caret Line="89" TopLine="57"/>
376+
<Caret Line="225" Column="52" TopLine="211"/>
381377
</Position27>
382378
<Position28>
383379
<Filename Value="uMiniBrowser.pas"/>
384-
<Caret Line="340" TopLine="299"/>
380+
<Caret Line="141" TopLine="110"/>
385381
</Position28>
386382
<Position29>
387383
<Filename Value="uMiniBrowser.pas"/>
388-
<Caret Line="536" Column="41" TopLine="515"/>
384+
<Caret Line="143" TopLine="112"/>
389385
</Position29>
390386
<Position30>
391387
<Filename Value="uMiniBrowser.pas"/>
392-
<Caret Line="120" Column="15" TopLine="102"/>
388+
<Caret Line="229" Column="30" TopLine="227"/>
393389
</Position30>
394390
</JumpHistory>
395391
<RunParams>
396392
<FormatVersion Value="2"/>
397-
<Modes Count="0" ActiveMode=""/>
393+
<Modes ActiveMode=""/>
398394
</RunParams>
399395
</ProjectSession>
400396
</CONFIG>

demos/Lazarus/MiniBrowser/uMiniBrowser.lfm

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ object MiniBrowserFrm: TMiniBrowserFrm
1414
OnDestroy = FormDestroy
1515
OnShow = FormShow
1616
Position = poScreenCenter
17-
LCLVersion = '2.0.12.0'
17+
LCLVersion = '2.2.0.4'
1818
object NavControlPnl: TPanel
1919
Left = 0
2020
Height = 25
@@ -310,11 +310,16 @@ object MiniBrowserFrm: TMiniBrowserFrm
310310
end
311311
object MenuItem3: TMenuItem
312312
Caption = 'Available browser version...'
313+
OnClick = MenuItem3Click
313314
end
314315
object ChangeUserAgentMi: TMenuItem
315316
Caption = 'Change user agent string...'
316317
OnClick = ChangeUserAgentMiClick
317318
end
319+
object Muted1: TMenuItem
320+
Caption = 'Muted'
321+
OnClick = Muted1Click
322+
end
318323
end
319324
object OpenDialog1: TOpenDialog
320325
Left = 48

0 commit comments

Comments
 (0)