Skip to content

Commit 0a970b7

Browse files
committed
Renamed "message" argument to "message_" in TChromiumCore.OnConsoleMessage
1 parent 55e949c commit 0a970b7

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

demos/Delphi_VCL/DOMVisitor/uDOMVisitor.pas

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ TDOMVisitorFrm = class(TForm)
7676
procedure Chromium1ProcessMessageReceived(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; sourceProcess: TCefProcessId; const message: ICefProcessMessage; out Result: Boolean);
7777
procedure Chromium1BeforePopup(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; popup_id: Integer; const targetUrl, targetFrameName: ustring; targetDisposition: TCefWindowOpenDisposition; userGesture: Boolean; const popupFeatures: TCefPopupFeatures; var windowInfo: TCefWindowInfo; var client: ICefClient; var settings: TCefBrowserSettings; var extra_info: ICefDictionaryValue; var noJavascriptAccess: Boolean; var Result: Boolean);
7878
procedure Chromium1BeforeClose(Sender: TObject; const browser: ICefBrowser);
79-
procedure Chromium1ConsoleMessage(Sender: TObject; const browser: ICefBrowser; level: TCefLogSeverity; const message, source: ustring; line: Integer; out Result: Boolean);
79+
procedure Chromium1ConsoleMessage(Sender: TObject; const browser: ICefBrowser; level: TCefLogSeverity; const message_, source: ustring; line: Integer; out Result: Boolean);
8080
procedure Chromium1DevToolsMethodResult(Sender: TObject; const browser: ICefBrowser; message_id: Integer; success: Boolean; const result: ICefValue);
8181

8282
protected
@@ -492,7 +492,7 @@ procedure TDOMVisitorFrm.Chromium1BeforePopup(Sender: TObject;
492492
end;
493493

494494
procedure TDOMVisitorFrm.Chromium1ConsoleMessage(Sender: TObject;
495-
const browser: ICefBrowser; level: TCefLogSeverity; const message, source: ustring;
495+
const browser: ICefBrowser; level: TCefLogSeverity; const message_, source: ustring;
496496
line: Integer; out Result: Boolean);
497497
var
498498
TempResult : string;
@@ -501,11 +501,11 @@ procedure TDOMVisitorFrm.Chromium1ConsoleMessage(Sender: TObject;
501501
// from the render process.
502502
// This event may receive many other messages but we identify our message
503503
// thanks to the preamble.
504-
if (length(message) > 0) and
505-
(copy(message, 1, length(CONSOLE_MSG_PREAMBLE)) = CONSOLE_MSG_PREAMBLE) then
504+
if (length(message_) > 0) and
505+
(copy(message_, 1, length(CONSOLE_MSG_PREAMBLE)) = CONSOLE_MSG_PREAMBLE) then
506506
begin
507507
// Remove CONSOLE_MSG_PREAMBLE to get the encoded result
508-
TempResult := copy(message, succ(length(CONSOLE_MSG_PREAMBLE)), length(message));
508+
TempResult := copy(message_, succ(length(CONSOLE_MSG_PREAMBLE)), length(message_));
509509
// Decode the result and copy to the clipboard.
510510
Clipboard.AsText := TNetEncoding.URL.Decode(TempResult);
511511
// Update the status bar text in the main application thread

demos/Lazarus_Windows/DOMVisitor/uDOMVisitor.pas

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ TDOMVisitorFrm = class(TForm)
7070
procedure Chromium1ProcessMessageReceived(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; sourceProcess: TCefProcessId; const message: ICefProcessMessage; out Result: Boolean);
7171
procedure Chromium1BeforePopup(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; popup_id: Integer; const targetUrl, targetFrameName: ustring; targetDisposition: TCefWindowOpenDisposition; userGesture: Boolean; const popupFeatures: TCefPopupFeatures; var windowInfo: TCefWindowInfo; var client: ICefClient; var settings: TCefBrowserSettings; var extra_info: ICefDictionaryValue; var noJavascriptAccess: Boolean; var Result: Boolean);
7272
procedure Chromium1BeforeClose(Sender: TObject; const browser: ICefBrowser);
73-
procedure Chromium1ConsoleMessage(Sender: TObject; const browser: ICefBrowser; level: TCefLogSeverity; const message, source: ustring; line: Integer; out Result: Boolean);
73+
procedure Chromium1ConsoleMessage(Sender: TObject; const browser: ICefBrowser; level: TCefLogSeverity; const message_, source: ustring; line: Integer; out Result: Boolean);
7474
procedure Chromium1DevToolsMethodResult(Sender: TObject; const browser: ICefBrowser; message_id: integer; success: boolean; const result: ICefValue);
7575

7676
protected
@@ -476,7 +476,7 @@ procedure TDOMVisitorFrm.Chromium1BeforePopup(Sender: TObject;
476476
end;
477477

478478
procedure TDOMVisitorFrm.Chromium1ConsoleMessage(Sender: TObject;
479-
const browser: ICefBrowser; level: TCefLogSeverity; const message, source: ustring;
479+
const browser: ICefBrowser; level: TCefLogSeverity; const message_, source: ustring;
480480
line: Integer; out Result: Boolean);
481481
begin
482482
// In this event we receive the message with the name and value of a DOM node
@@ -488,10 +488,10 @@ procedure TDOMVisitorFrm.Chromium1ConsoleMessage(Sender: TObject;
488488
// This and many other TChromium events are executed in a CEF thread. The VCL
489489
// should be used only in the main thread and we use a message and a field
490490
// protected by a synchronization object to call showmessage safely.
491-
if (length(message) > 0) and
492-
(copy(message, 1, length(CONSOLE_MSG_PREAMBLE)) = CONSOLE_MSG_PREAMBLE) then
491+
if (length(message_) > 0) and
492+
(copy(message_, 1, length(CONSOLE_MSG_PREAMBLE)) = CONSOLE_MSG_PREAMBLE) then
493493
begin
494-
MsgContents := copy(message, succ(length(CONSOLE_MSG_PREAMBLE)), length(message));
494+
MsgContents := copy(message_, succ(length(CONSOLE_MSG_PREAMBLE)), length(message_));
495495

496496
if (length(MsgContents) = 0) then
497497
MsgContents := 'There was an error reading the search box information'

source/uCEFChromiumEvents.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ interface
5454
TOnFullScreenModeChange = procedure(Sender: TObject; const browser: ICefBrowser; fullscreen: Boolean) of object;
5555
TOnTooltip = procedure(Sender: TObject; const browser: ICefBrowser; var text: ustring; out Result: Boolean) of object;
5656
TOnStatusMessage = procedure(Sender: TObject; const browser: ICefBrowser; const value: ustring) of object;
57-
TOnConsoleMessage = procedure(Sender: TObject; const browser: ICefBrowser; level: TCefLogSeverity; const message, source: ustring; line: Integer; out Result: Boolean) of object;
57+
TOnConsoleMessage = procedure(Sender: TObject; const browser: ICefBrowser; level: TCefLogSeverity; const message_, source: ustring; line: Integer; out Result: Boolean) of object;
5858
TOnAutoResize = procedure(Sender: TObject; const browser: ICefBrowser; const new_size: PCefSize; out Result: Boolean) of object;
5959
TOnLoadingProgressChange = procedure(Sender: TObject; const browser: ICefBrowser; const progress: double) of object;
6060
TOnCursorChange = procedure(Sender: TObject; const browser: ICefBrowser; cursor_: TCefCursorHandle; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult : boolean) of Object;

update_CEF4Delphi.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"UpdateLazPackages" : [
33
{
44
"ForceNotify" : true,
5-
"InternalVersion" : 823,
5+
"InternalVersion" : 824,
66
"Name" : "cef4delphi_lazarus.lpk",
77
"Version" : "142.0.17"
88
}

0 commit comments

Comments
 (0)