mirror of
https://github.com/salvadordf/CEF4Delphi.git
synced 2025-06-02 21:57:37 +02:00
Update to CEF 3.3239.1720.g1ad5e2a
TChromium.DeleteCookies now uses the right cookie manager in custom request contexts.
This commit is contained in:
parent
9888fe3e46
commit
2f89f8a609
@ -57,7 +57,7 @@ uses
|
|||||||
const
|
const
|
||||||
CEF_SUPPORTED_VERSION_MAJOR = 3;
|
CEF_SUPPORTED_VERSION_MAJOR = 3;
|
||||||
CEF_SUPPORTED_VERSION_MINOR = 3239;
|
CEF_SUPPORTED_VERSION_MINOR = 3239;
|
||||||
CEF_SUPPORTED_VERSION_RELEASE = 1716;
|
CEF_SUPPORTED_VERSION_RELEASE = 1720;
|
||||||
CEF_SUPPORTED_VERSION_BUILD = 0;
|
CEF_SUPPORTED_VERSION_BUILD = 0;
|
||||||
|
|
||||||
CEF_CHROMEELF_VERSION_MAJOR = 63;
|
CEF_CHROMEELF_VERSION_MAJOR = 63;
|
||||||
|
@ -459,7 +459,7 @@ type
|
|||||||
procedure StartDownload(const aURL : ustring);
|
procedure StartDownload(const aURL : ustring);
|
||||||
|
|
||||||
procedure SimulateMouseWheel(aDeltaX, aDeltaY : integer);
|
procedure SimulateMouseWheel(aDeltaX, aDeltaY : integer);
|
||||||
procedure DeleteCookies;
|
function DeleteCookies : boolean;
|
||||||
procedure RetrieveHTML(const aFrameName : ustring = ''); overload;
|
procedure RetrieveHTML(const aFrameName : ustring = ''); overload;
|
||||||
procedure RetrieveHTML(const aFrame : ICefFrame); overload;
|
procedure RetrieveHTML(const aFrame : ICefFrame); overload;
|
||||||
procedure RetrieveHTML(const aFrameIdentifier : int64); overload;
|
procedure RetrieveHTML(const aFrameIdentifier : int64); overload;
|
||||||
@ -1991,15 +1991,22 @@ begin
|
|||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TChromium.DeleteCookies;
|
function TChromium.DeleteCookies : boolean;
|
||||||
var
|
var
|
||||||
TempTask: ICefTask;
|
TempManager : ICefCookieManager;
|
||||||
begin
|
begin
|
||||||
if Initialized then
|
Result := False;
|
||||||
|
|
||||||
|
if Initialized and (FBrowser.Host <> nil) and (FBrowser.Host.RequestContext <> nil) then
|
||||||
|
begin
|
||||||
|
TempManager := FBrowser.Host.RequestContext.GetDefaultCookieManager(nil);
|
||||||
|
|
||||||
|
if (TempManager <> nil) then
|
||||||
begin
|
begin
|
||||||
if (FCookiDeletercb = nil) then FCookiDeletercb := TCefCustomDeleteCookiesCallback.Create(self);
|
if (FCookiDeletercb = nil) then FCookiDeletercb := TCefCustomDeleteCookiesCallback.Create(self);
|
||||||
TempTask := TCefDeleteCookiesTask.Create(FCookiDeletercb);
|
|
||||||
CefPostTask(TID_IO, TempTask);
|
Result := TempManager.DeleteCookies('', '', FCookiDeletercb);
|
||||||
|
end;
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
@ -1397,7 +1397,14 @@ type
|
|||||||
function GetRequestStatus: TCefUrlRequestStatus;
|
function GetRequestStatus: TCefUrlRequestStatus;
|
||||||
function GetRequestError: Integer;
|
function GetRequestError: Integer;
|
||||||
function GetResponse: ICefResponse;
|
function GetResponse: ICefResponse;
|
||||||
|
function GetResponseWasCached: boolean;
|
||||||
procedure Cancel;
|
procedure Cancel;
|
||||||
|
|
||||||
|
property Request : ICefRequest read GetRequest;
|
||||||
|
property RequestStatus : TCefUrlRequestStatus read GetRequestStatus;
|
||||||
|
property RequestError : Integer read GetRequestError;
|
||||||
|
property Response : ICefResponse read GetResponse;
|
||||||
|
property ResponseWasCached : boolean read GetResponseWasCached;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
ICefUrlrequestClient = interface(ICefBaseRefCounted)
|
ICefUrlrequestClient = interface(ICefBaseRefCounted)
|
||||||
|
@ -101,16 +101,6 @@ type
|
|||||||
procedure Execute; override;
|
procedure Execute; override;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
TCefDeleteCookiesTask = class(TCefTaskOwn)
|
|
||||||
protected
|
|
||||||
FCallBack : ICefDeleteCookiesCallback;
|
|
||||||
|
|
||||||
procedure Execute; override;
|
|
||||||
|
|
||||||
public
|
|
||||||
constructor Create(const aCallBack : ICefDeleteCookiesCallback); reintroduce;
|
|
||||||
end;
|
|
||||||
|
|
||||||
TCefUpdatePrefsTask = class(TCefTaskOwn)
|
TCefUpdatePrefsTask = class(TCefTaskOwn)
|
||||||
protected
|
protected
|
||||||
FChromiumBrowser : TObject;
|
FChromiumBrowser : TObject;
|
||||||
@ -268,25 +258,6 @@ begin
|
|||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
||||||
// TCefDeleteCookiesTask
|
|
||||||
|
|
||||||
|
|
||||||
constructor TCefDeleteCookiesTask.Create(const aCallBack : ICefDeleteCookiesCallback);
|
|
||||||
begin
|
|
||||||
inherited Create;
|
|
||||||
|
|
||||||
FCallBack := aCallBack;
|
|
||||||
end;
|
|
||||||
|
|
||||||
procedure TCefDeleteCookiesTask.Execute;
|
|
||||||
var
|
|
||||||
CookieManager : ICefCookieManager;
|
|
||||||
begin
|
|
||||||
CookieManager := TCefCookieManagerRef.Global(nil);
|
|
||||||
CookieManager.DeleteCookies('', '', FCallBack);
|
|
||||||
end;
|
|
||||||
|
|
||||||
|
|
||||||
// TCefUpdatePrefsTask
|
// TCefUpdatePrefsTask
|
||||||
|
|
||||||
|
|
||||||
|
@ -1426,6 +1426,7 @@ type
|
|||||||
get_request_status: function(self: PCefUrlRequest): TCefUrlRequestStatus; stdcall;
|
get_request_status: function(self: PCefUrlRequest): TCefUrlRequestStatus; stdcall;
|
||||||
get_request_error: function(self: PCefUrlRequest): TCefErrorcode; stdcall;
|
get_request_error: function(self: PCefUrlRequest): TCefErrorcode; stdcall;
|
||||||
get_response: function(self: PCefUrlRequest): PCefResponse; stdcall;
|
get_response: function(self: PCefUrlRequest): PCefResponse; stdcall;
|
||||||
|
response_was_cached: function(self: PCefUrlRequest): integer; stdcall;
|
||||||
cancel: procedure(self: PCefUrlRequest); stdcall;
|
cancel: procedure(self: PCefUrlRequest); stdcall;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
@ -56,6 +56,7 @@ type
|
|||||||
function GetRequestStatus: TCefUrlRequestStatus;
|
function GetRequestStatus: TCefUrlRequestStatus;
|
||||||
function GetRequestError: Integer;
|
function GetRequestError: Integer;
|
||||||
function GetResponse: ICefResponse;
|
function GetResponse: ICefResponse;
|
||||||
|
function GetResponseWasCached: boolean;
|
||||||
procedure Cancel;
|
procedure Cancel;
|
||||||
public
|
public
|
||||||
class function UnWrap(data: Pointer): ICefUrlRequest;
|
class function UnWrap(data: Pointer): ICefUrlRequest;
|
||||||
@ -94,6 +95,11 @@ begin
|
|||||||
Result := PCefUrlRequest(FData).get_request_status(PCefUrlRequest(FData));
|
Result := PCefUrlRequest(FData).get_request_status(PCefUrlRequest(FData));
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
function TCefUrlRequestRef.GetResponseWasCached: boolean;
|
||||||
|
begin
|
||||||
|
Result := PCefUrlRequest(FData).response_was_cached(PCefUrlRequest(FData)) <> 0;
|
||||||
|
end;
|
||||||
|
|
||||||
function TCefUrlRequestRef.GetResponse: ICefResponse;
|
function TCefUrlRequestRef.GetResponse: ICefResponse;
|
||||||
begin
|
begin
|
||||||
Result := TCefResponseRef.UnWrap(PCefUrlRequest(FData).get_response(PCefUrlRequest(FData)));
|
Result := TCefResponseRef.UnWrap(PCefUrlRequest(FData).get_response(PCefUrlRequest(FData)));
|
||||||
@ -101,8 +107,9 @@ end;
|
|||||||
|
|
||||||
class function TCefUrlRequestRef.UnWrap(data: Pointer): ICefUrlRequest;
|
class function TCefUrlRequestRef.UnWrap(data: Pointer): ICefUrlRequest;
|
||||||
begin
|
begin
|
||||||
if data <> nil then
|
if (data <> nil) then
|
||||||
Result := Create(data) as ICefUrlRequest else
|
Result := Create(data) as ICefUrlRequest
|
||||||
|
else
|
||||||
Result := nil;
|
Result := nil;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user