mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Merge revision 542 changes:
- Add CefCookieManager interface and CefRequestHandler::GetCookieManager for custom cookie handling (issue #542). - Support getting and setting cookies with custom scheme handlers (issue #555). - Support calling CefFrame::GetIdentifier and CefFrame::GetURL on any thread (issue #556). git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/963@544 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
@@ -310,51 +310,6 @@ CEF_EXPORT int cef_parse_url(const cef_string_t* url,
|
||||
CEF_EXPORT int cef_create_url(const struct _cef_urlparts_t* parts,
|
||||
cef_string_t* url);
|
||||
|
||||
///
|
||||
// Visit all cookies. The returned cookies are ordered by longest path, then by
|
||||
// earliest creation date. Returns false (0) if cookies cannot be accessed.
|
||||
///
|
||||
CEF_EXPORT int cef_visit_all_cookies(struct _cef_cookie_visitor_t* visitor);
|
||||
|
||||
///
|
||||
// Visit a subset of cookies. The results are filtered by the given url scheme,
|
||||
// host, domain and path. If |includeHttpOnly| is true (1) HTTP-only cookies
|
||||
// will also be included in the results. The returned cookies are ordered by
|
||||
// longest path, then by earliest creation date. Returns false (0) if cookies
|
||||
// cannot be accessed.
|
||||
///
|
||||
CEF_EXPORT int cef_visit_url_cookies(const cef_string_t* url,
|
||||
int includeHttpOnly, struct _cef_cookie_visitor_t* visitor);
|
||||
|
||||
///
|
||||
// Sets a cookie given a valid URL and explicit user-provided cookie attributes.
|
||||
// This function expects each attribute to be well-formed. It will check for
|
||||
// disallowed characters (e.g. the ';' character is disallowed within the cookie
|
||||
// value attribute) and will return false (0) without setting the cookie if such
|
||||
// characters are found. This function must be called on the IO thread.
|
||||
///
|
||||
CEF_EXPORT int cef_set_cookie(const cef_string_t* url,
|
||||
const struct _cef_cookie_t* cookie);
|
||||
|
||||
///
|
||||
// Delete all cookies that match the specified parameters. If both |url| and
|
||||
// |cookie_name| are specified all host and domain cookies matching both values
|
||||
// will be deleted. If only |url| is specified all host cookies (but not domain
|
||||
// cookies) irrespective of path will be deleted. If |url| is NULL all cookies
|
||||
// for all hosts and domains will be deleted. Returns false (0) if a non-NULL
|
||||
// invalid URL is specified or if cookies cannot be accessed. This function must
|
||||
// be called on the IO thread.
|
||||
///
|
||||
CEF_EXPORT int cef_delete_cookies(const cef_string_t* url,
|
||||
const cef_string_t* cookie_name);
|
||||
|
||||
///
|
||||
// Sets the directory path that will be used for storing cookie data. If |path|
|
||||
// is NULL data will be stored in memory only. By default the cookie path is the
|
||||
// same as the cache path. Returns false (0) if cookies cannot be accessed.
|
||||
///
|
||||
CEF_EXPORT int cef_set_cookie_path(const cef_string_t* path);
|
||||
|
||||
///
|
||||
// Visit storage of the specified type. If |origin| is non-NULL only data
|
||||
// matching that origin will be visited. If |key| is non-NULL only data matching
|
||||
@@ -437,6 +392,81 @@ typedef struct _cef_task_t
|
||||
} cef_task_t;
|
||||
|
||||
|
||||
///
|
||||
// Structure used for managing cookies. The functions of this structure may be
|
||||
// called on any thread unless otherwise indicated.
|
||||
///
|
||||
typedef struct _cef_cookie_manager_t
|
||||
{
|
||||
// Base structure.
|
||||
cef_base_t base;
|
||||
|
||||
///
|
||||
// Visit all cookies. The returned cookies are ordered by longest path, then
|
||||
// by earliest creation date. Returns false (0) if cookies cannot be accessed.
|
||||
///
|
||||
int (CEF_CALLBACK *visit_all_cookies)(struct _cef_cookie_manager_t* self,
|
||||
struct _cef_cookie_visitor_t* visitor);
|
||||
|
||||
///
|
||||
// Visit a subset of cookies. The results are filtered by the given url
|
||||
// scheme, host, domain and path. If |includeHttpOnly| is true (1) HTTP-only
|
||||
// cookies will also be included in the results. The returned cookies are
|
||||
// ordered by longest path, then by earliest creation date. Returns false (0)
|
||||
// if cookies cannot be accessed.
|
||||
///
|
||||
int (CEF_CALLBACK *visit_url_cookies)(struct _cef_cookie_manager_t* self,
|
||||
const cef_string_t* url, int includeHttpOnly,
|
||||
struct _cef_cookie_visitor_t* visitor);
|
||||
|
||||
///
|
||||
// Sets a cookie given a valid URL and explicit user-provided cookie
|
||||
// attributes. This function expects each attribute to be well-formed. It will
|
||||
// check for disallowed characters (e.g. the ';' character is disallowed
|
||||
// within the cookie value attribute) and will return false (0) without
|
||||
// setting the cookie if such characters are found. This function must be
|
||||
// called on the IO thread.
|
||||
///
|
||||
int (CEF_CALLBACK *set_cookie)(struct _cef_cookie_manager_t* self,
|
||||
const cef_string_t* url, const struct _cef_cookie_t* cookie);
|
||||
|
||||
///
|
||||
// Delete all cookies that match the specified parameters. If both |url| and
|
||||
// values |cookie_name| are specified all host and domain cookies matching
|
||||
// both will be deleted. If only |url| is specified all host cookies (but not
|
||||
// domain cookies) irrespective of path will be deleted. If |url| is NULL all
|
||||
// cookies for all hosts and domains will be deleted. Returns false (0) if a
|
||||
// non- NULL invalid URL is specified or if cookies cannot be accessed. This
|
||||
// function must be called on the IO thread.
|
||||
///
|
||||
int (CEF_CALLBACK *delete_cookies)(struct _cef_cookie_manager_t* self,
|
||||
const cef_string_t* url, const cef_string_t* cookie_name);
|
||||
|
||||
///
|
||||
// Sets the directory path that will be used for storing cookie data. If
|
||||
// |path| is NULL data will be stored in memory only. Returns false (0) if
|
||||
// cookies cannot be accessed.
|
||||
///
|
||||
int (CEF_CALLBACK *set_storage_path)(struct _cef_cookie_manager_t* self,
|
||||
const cef_string_t* path);
|
||||
|
||||
} cef_cookie_manager_t;
|
||||
|
||||
|
||||
///
|
||||
// Returns the global cookie manager. By default data will be stored at
|
||||
// CefSettings.cache_path if specified or in memory otherwise.
|
||||
///
|
||||
CEF_EXPORT cef_cookie_manager_t* cef_cookie_manager_get_global_manager();
|
||||
|
||||
///
|
||||
// Creates a new cookie manager. If |path| is NULL data will be stored in memory
|
||||
// only. Returns NULL if creation fails.
|
||||
///
|
||||
CEF_EXPORT cef_cookie_manager_t* cef_cookie_manager_create_manager(
|
||||
const cef_string_t* path);
|
||||
|
||||
|
||||
///
|
||||
// Structure to implement for visiting cookie values. The functions of this
|
||||
// structure will always be called on the IO thread.
|
||||
@@ -882,8 +912,7 @@ typedef struct _cef_frame_t
|
||||
cef_string_userfree_t (CEF_CALLBACK *get_name)(struct _cef_frame_t* self);
|
||||
|
||||
///
|
||||
// Returns the globally unique identifier for this frame. This function should
|
||||
// only be called on the UI thread.
|
||||
// Returns the globally unique identifier for this frame.
|
||||
///
|
||||
long long (CEF_CALLBACK *get_identifier)(struct _cef_frame_t* self);
|
||||
|
||||
@@ -894,8 +923,7 @@ typedef struct _cef_frame_t
|
||||
struct _cef_frame_t* (CEF_CALLBACK *get_parent)(struct _cef_frame_t* self);
|
||||
|
||||
///
|
||||
// Returns the URL currently loaded in this frame. This function should only
|
||||
// be called on the UI thread.
|
||||
// Returns the URL currently loaded in this frame.
|
||||
///
|
||||
// The resulting string must be freed by calling cef_string_userfree_free().
|
||||
cef_string_userfree_t (CEF_CALLBACK *get_url)(struct _cef_frame_t* self);
|
||||
@@ -1159,6 +1187,16 @@ typedef struct _cef_request_handler_t
|
||||
int port, const cef_string_t* realm, const cef_string_t* scheme,
|
||||
cef_string_t* username, cef_string_t* password);
|
||||
|
||||
///
|
||||
// Called on the IO thread to retrieve the cookie manager. |main_url| is the
|
||||
// URL of the top-level frame. Cookies managers can be unique per browser or
|
||||
// shared across multiple browsers. The global cookie manager will be used if
|
||||
// this function returns NULL.
|
||||
///
|
||||
struct _cef_cookie_manager_t* (CEF_CALLBACK *get_cookie_manager)(
|
||||
struct _cef_request_handler_t* self, struct _cef_browser_t* browser,
|
||||
const cef_string_t* main_url);
|
||||
|
||||
} cef_request_handler_t;
|
||||
|
||||
|
||||
@@ -2636,7 +2674,8 @@ typedef struct _cef_scheme_handler_factory_t
|
||||
///
|
||||
// Return a new scheme handler instance to handle the request. |browser| will
|
||||
// be the browser window that initiated the request. If the request was
|
||||
// initiated using the cef_web_urlrequest_t API |browser| will be NULL.
|
||||
// initiated using the cef_web_urlrequest_t API |browser| will be NULL. The
|
||||
// |request| object passed to this function will not contain cookie data.
|
||||
///
|
||||
struct _cef_scheme_handler_t* (CEF_CALLBACK *create)(
|
||||
struct _cef_scheme_handler_factory_t* self,
|
||||
|
||||
Reference in New Issue
Block a user