mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium revision ad468e8b (#292352).
- Building Chromium using SVN is no longer supported. - Remove CefDOMEvent and CefDOMEventListener (issue #933). - Remove CefRenderHandler::OnScrollOffsetChanged (http://crbug.com/404656). - Remove UR_FLAG_REPORT_LOAD_TIMING (https://codereview.chromium.org/451623002/). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1816 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -45,7 +45,6 @@ extern "C" {
|
||||
#endif
|
||||
|
||||
struct _cef_domdocument_t;
|
||||
struct _cef_domevent_listener_t;
|
||||
struct _cef_domnode_t;
|
||||
|
||||
///
|
||||
@@ -297,20 +296,6 @@ typedef struct _cef_domnode_t {
|
||||
struct _cef_domnode_t* (CEF_CALLBACK *get_last_child)(
|
||||
struct _cef_domnode_t* self);
|
||||
|
||||
///
|
||||
// Add an event listener to this node for the specified event type. If
|
||||
// |useCapture| is true (1) then this listener will be considered a capturing
|
||||
// listener. Capturing listeners will recieve all events of the specified type
|
||||
// before the events are dispatched to any other event targets beneath the
|
||||
// current node in the tree. Events which are bubbling upwards through the
|
||||
// tree will not trigger a capturing listener. Separate calls to this function
|
||||
// can be used to register the same listener with and without capture. See
|
||||
// WebCore/dom/EventNames.h for the list of supported event types.
|
||||
///
|
||||
void (CEF_CALLBACK *add_event_listener)(struct _cef_domnode_t* self,
|
||||
const cef_string_t* eventType, struct _cef_domevent_listener_t* listener,
|
||||
int useCapture);
|
||||
|
||||
|
||||
// The following functions are valid only for element nodes.
|
||||
|
||||
@@ -361,85 +346,6 @@ typedef struct _cef_domnode_t {
|
||||
} cef_domnode_t;
|
||||
|
||||
|
||||
///
|
||||
// Structure used to represent a DOM event. The functions of this structure
|
||||
// should only be called on the render process main thread.
|
||||
///
|
||||
typedef struct _cef_domevent_t {
|
||||
///
|
||||
// Base structure.
|
||||
///
|
||||
cef_base_t base;
|
||||
|
||||
///
|
||||
// Returns the event type.
|
||||
///
|
||||
// The resulting string must be freed by calling cef_string_userfree_free().
|
||||
cef_string_userfree_t (CEF_CALLBACK *get_type)(struct _cef_domevent_t* self);
|
||||
|
||||
///
|
||||
// Returns the event category.
|
||||
///
|
||||
cef_dom_event_category_t (CEF_CALLBACK *get_category)(
|
||||
struct _cef_domevent_t* self);
|
||||
|
||||
///
|
||||
// Returns the event processing phase.
|
||||
///
|
||||
cef_dom_event_phase_t (CEF_CALLBACK *get_phase)(struct _cef_domevent_t* self);
|
||||
|
||||
///
|
||||
// Returns true (1) if the event can bubble up the tree.
|
||||
///
|
||||
int (CEF_CALLBACK *can_bubble)(struct _cef_domevent_t* self);
|
||||
|
||||
///
|
||||
// Returns true (1) if the event can be canceled.
|
||||
///
|
||||
int (CEF_CALLBACK *can_cancel)(struct _cef_domevent_t* self);
|
||||
|
||||
///
|
||||
// Returns the document associated with this event.
|
||||
///
|
||||
struct _cef_domdocument_t* (CEF_CALLBACK *get_document)(
|
||||
struct _cef_domevent_t* self);
|
||||
|
||||
///
|
||||
// Returns the target of the event.
|
||||
///
|
||||
struct _cef_domnode_t* (CEF_CALLBACK *get_target)(
|
||||
struct _cef_domevent_t* self);
|
||||
|
||||
///
|
||||
// Returns the current target of the event.
|
||||
///
|
||||
struct _cef_domnode_t* (CEF_CALLBACK *get_current_target)(
|
||||
struct _cef_domevent_t* self);
|
||||
} cef_domevent_t;
|
||||
|
||||
|
||||
///
|
||||
// Structure to implement for handling DOM events. The functions of this
|
||||
// structure will be called on the render process main thread.
|
||||
///
|
||||
typedef struct _cef_domevent_listener_t {
|
||||
///
|
||||
// Base structure.
|
||||
///
|
||||
cef_base_t base;
|
||||
|
||||
///
|
||||
// Called when an event is received. The event object passed to this function
|
||||
// contains a snapshot of the DOM at the time this function is executed. DOM
|
||||
// objects are only valid for the scope of this function. Do not keep
|
||||
// references to or attempt to access any DOM objects outside the scope of
|
||||
// this function.
|
||||
///
|
||||
void (CEF_CALLBACK *handle_event)(struct _cef_domevent_listener_t* self,
|
||||
struct _cef_domevent_t* event);
|
||||
} cef_domevent_listener_t;
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
@@ -147,12 +147,6 @@ typedef struct _cef_render_handler_t {
|
||||
///
|
||||
void (CEF_CALLBACK *update_drag_cursor)(struct _cef_render_handler_t* self,
|
||||
struct _cef_browser_t* browser, cef_drag_operations_mask_t operation);
|
||||
|
||||
///
|
||||
// Called when the scroll offset has changed.
|
||||
///
|
||||
void (CEF_CALLBACK *on_scroll_offset_changed)(
|
||||
struct _cef_render_handler_t* self, struct _cef_browser_t* browser);
|
||||
} cef_render_handler_t;
|
||||
|
||||
|
||||
|
@@ -146,8 +146,8 @@ typedef struct _cef_request_t {
|
||||
const cef_string_t* url);
|
||||
|
||||
///
|
||||
// Get the resource type for this request. Accurate resource type information
|
||||
// may only be available in the browser process.
|
||||
// Get the resource type for this request. Only available in the browser
|
||||
// process.
|
||||
///
|
||||
cef_resource_type_t (CEF_CALLBACK *get_resource_type)(
|
||||
struct _cef_request_t* self);
|
||||
|
@@ -42,7 +42,6 @@
|
||||
#include <map>
|
||||
|
||||
class CefDOMDocument;
|
||||
class CefDOMEventListener;
|
||||
class CefDOMNode;
|
||||
|
||||
///
|
||||
@@ -291,22 +290,6 @@ class CefDOMNode : public virtual CefBase {
|
||||
/*--cef()--*/
|
||||
virtual CefRefPtr<CefDOMNode> GetLastChild() =0;
|
||||
|
||||
///
|
||||
// Add an event listener to this node for the specified event type. If
|
||||
// |useCapture| is true then this listener will be considered a capturing
|
||||
// listener. Capturing listeners will recieve all events of the specified
|
||||
// type before the events are dispatched to any other event targets beneath
|
||||
// the current node in the tree. Events which are bubbling upwards through
|
||||
// the tree will not trigger a capturing listener. Separate calls to this
|
||||
// method can be used to register the same listener with and without capture.
|
||||
// See WebCore/dom/EventNames.h for the list of supported event types.
|
||||
///
|
||||
/*--cef()--*/
|
||||
virtual void AddEventListener(const CefString& eventType,
|
||||
CefRefPtr<CefDOMEventListener> listener,
|
||||
bool useCapture) =0;
|
||||
|
||||
|
||||
// The following methods are valid only for element nodes.
|
||||
|
||||
///
|
||||
@@ -354,82 +337,4 @@ class CefDOMNode : public virtual CefBase {
|
||||
virtual CefString GetElementInnerText() =0;
|
||||
};
|
||||
|
||||
|
||||
///
|
||||
// Class used to represent a DOM event. The methods of this class should only
|
||||
// be called on the render process main thread.
|
||||
///
|
||||
/*--cef(source=library)--*/
|
||||
class CefDOMEvent : public virtual CefBase {
|
||||
public:
|
||||
typedef cef_dom_event_category_t Category;
|
||||
typedef cef_dom_event_phase_t Phase;
|
||||
|
||||
///
|
||||
// Returns the event type.
|
||||
///
|
||||
/*--cef()--*/
|
||||
virtual CefString GetType() =0;
|
||||
|
||||
///
|
||||
// Returns the event category.
|
||||
///
|
||||
/*--cef(default_retval=DOM_EVENT_CATEGORY_UNKNOWN)--*/
|
||||
virtual Category GetCategory() =0;
|
||||
|
||||
///
|
||||
// Returns the event processing phase.
|
||||
///
|
||||
/*--cef(default_retval=DOM_EVENT_PHASE_UNKNOWN)--*/
|
||||
virtual Phase GetPhase() =0;
|
||||
|
||||
///
|
||||
// Returns true if the event can bubble up the tree.
|
||||
///
|
||||
/*--cef()--*/
|
||||
virtual bool CanBubble() =0;
|
||||
|
||||
///
|
||||
// Returns true if the event can be canceled.
|
||||
///
|
||||
/*--cef()--*/
|
||||
virtual bool CanCancel() =0;
|
||||
|
||||
///
|
||||
// Returns the document associated with this event.
|
||||
///
|
||||
/*--cef()--*/
|
||||
virtual CefRefPtr<CefDOMDocument> GetDocument() =0;
|
||||
|
||||
///
|
||||
// Returns the target of the event.
|
||||
///
|
||||
/*--cef()--*/
|
||||
virtual CefRefPtr<CefDOMNode> GetTarget() =0;
|
||||
|
||||
///
|
||||
// Returns the current target of the event.
|
||||
///
|
||||
/*--cef()--*/
|
||||
virtual CefRefPtr<CefDOMNode> GetCurrentTarget() =0;
|
||||
};
|
||||
|
||||
|
||||
///
|
||||
// Interface to implement for handling DOM events. The methods of this class
|
||||
// will be called on the render process main thread.
|
||||
///
|
||||
/*--cef(source=client)--*/
|
||||
class CefDOMEventListener : public virtual CefBase {
|
||||
public:
|
||||
///
|
||||
// Called when an event is received. The event object passed to this method
|
||||
// contains a snapshot of the DOM at the time this method is executed. DOM
|
||||
// objects are only valid for the scope of this method. Do not keep references
|
||||
// to or attempt to access any DOM objects outside the scope of this method.
|
||||
///
|
||||
/*--cef()--*/
|
||||
virtual void HandleEvent(CefRefPtr<CefDOMEvent> event) =0;
|
||||
};
|
||||
|
||||
#endif // CEF_INCLUDE_CEF_DOM_H_
|
||||
|
@@ -159,12 +159,6 @@ class CefRenderHandler : public virtual CefBase {
|
||||
/*--cef()--*/
|
||||
virtual void UpdateDragCursor(CefRefPtr<CefBrowser> browser,
|
||||
DragOperation operation) {}
|
||||
|
||||
///
|
||||
// Called when the scroll offset has changed.
|
||||
///
|
||||
/*--cef()--*/
|
||||
virtual void OnScrollOffsetChanged(CefRefPtr<CefBrowser> browser) {}
|
||||
};
|
||||
|
||||
#endif // CEF_INCLUDE_CEF_RENDER_HANDLER_H_
|
||||
|
@@ -155,8 +155,8 @@ class CefRequest : public virtual CefBase {
|
||||
virtual void SetFirstPartyForCookies(const CefString& url) =0;
|
||||
|
||||
///
|
||||
// Get the resource type for this request. Accurate resource type information
|
||||
// may only be available in the browser process.
|
||||
// Get the resource type for this request. Only available in the browser
|
||||
// process.
|
||||
///
|
||||
/*--cef(default_retval=RT_SUB_RESOURCE)--*/
|
||||
virtual ResourceType GetResourceType() =0;
|
||||
|
@@ -1043,11 +1043,6 @@ typedef enum {
|
||||
///
|
||||
UR_FLAG_REPORT_UPLOAD_PROGRESS = 1 << 3,
|
||||
|
||||
///
|
||||
// If set load timing info will be collected for the request.
|
||||
///
|
||||
UR_FLAG_REPORT_LOAD_TIMING = 1 << 4,
|
||||
|
||||
///
|
||||
// If set the headers sent and received for the request will be recorded.
|
||||
///
|
||||
|
Reference in New Issue
Block a user