diff --git a/include/capi/cef_render_handler_capi.h b/include/capi/cef_render_handler_capi.h index c32e9a0cb3bd583f77ba8090099e15c00c86d8f1..f35cac9684d764031737bdf99a668b006d7154f0 100644 --- a/include/capi/cef_render_handler_capi.h +++ b/include/capi/cef_render_handler_capi.h @@ -33,7 +33,7 @@ // by hand. See the translator.README.txt file in the tools directory for // more information. // -// $hash=92756b79e86f7c641928193eab6f541e7b126ab7$ +// $hash=6711aa27311ed7ea3b40a225aefad72238feef65$ // #ifndef CEF_INCLUDE_CAPI_CEF_RENDER_HANDLER_CAPI_H_ @@ -63,36 +63,34 @@ typedef struct _cef_render_handler_t { // Return the handler for accessibility notifications. If no handler is // provided the default implementation will be used. /// - struct _cef_accessibility_handler_t*(CEF_CALLBACK* get_accessibility_handler)( - struct _cef_render_handler_t* self); + struct _cef_accessibility_handler_t *( + CEF_CALLBACK *get_accessibility_handler)( + struct _cef_render_handler_t *self); /// // Called to retrieve the root window rectangle in screen coordinates. Return // true (1) if the rectangle was provided. If this function returns false (0) // the rectangle from GetViewRect will be used. /// - int(CEF_CALLBACK* get_root_screen_rect)(struct _cef_render_handler_t* self, - struct _cef_browser_t* browser, - cef_rect_t* rect); + int(CEF_CALLBACK *get_root_screen_rect)(struct _cef_render_handler_t *self, + struct _cef_browser_t *browser, + cef_rect_t *rect); /// // Called to retrieve the view rectangle which is relative to screen // coordinates. This function must always provide a non-NULL rectangle. /// - void(CEF_CALLBACK* get_view_rect)(struct _cef_render_handler_t* self, - struct _cef_browser_t* browser, - cef_rect_t* rect); + void(CEF_CALLBACK *get_view_rect)(struct _cef_render_handler_t *self, + struct _cef_browser_t *browser, + cef_rect_t *rect); /// // Called to retrieve the translation from view coordinates to actual screen // coordinates. Return true (1) if the screen coordinates were provided. /// - int(CEF_CALLBACK* get_screen_point)(struct _cef_render_handler_t* self, - struct _cef_browser_t* browser, - int viewX, - int viewY, - int* screenX, - int* screenY); + int(CEF_CALLBACK *get_screen_point)(struct _cef_render_handler_t *self, + struct _cef_browser_t *browser, int viewX, + int viewY, int *screenX, int *screenY); /// // Called to allow the client to fill in the CefScreenInfo object with @@ -103,25 +101,24 @@ typedef struct _cef_render_handler_t { // will be used. If the rectangle is still NULL or invalid popups may not be // drawn correctly. /// - int(CEF_CALLBACK* get_screen_info)(struct _cef_render_handler_t* self, - struct _cef_browser_t* browser, - struct _cef_screen_info_t* screen_info); + int(CEF_CALLBACK *get_screen_info)(struct _cef_render_handler_t *self, + struct _cef_browser_t *browser, + struct _cef_screen_info_t *screen_info); /// // Called when the browser wants to show or hide the popup widget. The popup // should be shown if |show| is true (1) and hidden if |show| is false (0). /// - void(CEF_CALLBACK* on_popup_show)(struct _cef_render_handler_t* self, - struct _cef_browser_t* browser, - int show); + void(CEF_CALLBACK *on_popup_show)(struct _cef_render_handler_t *self, + struct _cef_browser_t *browser, int show); /// // Called when the browser wants to move or resize the popup widget. |rect| // contains the new location and size in view coordinates. /// - void(CEF_CALLBACK* on_popup_size)(struct _cef_render_handler_t* self, - struct _cef_browser_t* browser, - const cef_rect_t* rect); + void(CEF_CALLBACK *on_popup_size)(struct _cef_render_handler_t *self, + struct _cef_browser_t *browser, + const cef_rect_t *rect); /// // Called when an element should be painted. Pixel values passed to this @@ -134,14 +131,12 @@ typedef struct _cef_render_handler_t { // upper-left origin. This function is only called when // cef_window_tInfo::shared_texture_enabled is set to false (0). /// - void(CEF_CALLBACK* on_paint)(struct _cef_render_handler_t* self, - struct _cef_browser_t* browser, + void(CEF_CALLBACK *on_paint)(struct _cef_render_handler_t *self, + struct _cef_browser_t *browser, cef_paint_element_type_t type, size_t dirtyRectsCount, - cef_rect_t const* dirtyRects, - const void* buffer, - int width, - int height); + cef_rect_t const *dirtyRects, const void *buffer, + int width, int height); /// // Called when an element has been rendered to the shared texture handle. @@ -152,41 +147,38 @@ typedef struct _cef_render_handler_t { // This function is only called when cef_window_tInfo::shared_texture_enabled // is set to true (1), and is currently only supported on Windows. /// - void(CEF_CALLBACK* on_accelerated_paint)(struct _cef_render_handler_t* self, - struct _cef_browser_t* browser, + void(CEF_CALLBACK *on_accelerated_paint)(struct _cef_render_handler_t *self, + struct _cef_browser_t *browser, cef_paint_element_type_t type, size_t dirtyRectsCount, - cef_rect_t const* dirtyRects, - void* shared_handle); + cef_rect_t const *dirtyRects, + void *shared_handle); /// // Called to retrieve the size of the touch handle for the specified // |orientation|. /// - void(CEF_CALLBACK* get_touch_handle_size)( - struct _cef_render_handler_t* self, - struct _cef_browser_t* browser, - cef_horizontal_alignment_t orientation, - cef_size_t* size); + void(CEF_CALLBACK *get_touch_handle_size)( + struct _cef_render_handler_t *self, struct _cef_browser_t *browser, + cef_horizontal_alignment_t orientation, cef_size_t *size); /// // Called when touch handle state is updated. The client is responsible for // rendering the touch handles. /// - void(CEF_CALLBACK* on_touch_handle_state_changed)( - struct _cef_render_handler_t* self, - struct _cef_browser_t* browser, - const struct _cef_touch_handle_state_t* state); + void(CEF_CALLBACK *on_touch_handle_state_changed)( + struct _cef_render_handler_t *self, struct _cef_browser_t *browser, + const struct _cef_touch_handle_state_t *state); /// // Called when touch selection is updated. The client is responsible for // rendering the touch handles. /// - void(CEF_CALLBACK* on_touch_selection_changed)( - struct _cef_render_handler_t* self, - const struct _cef_touch_handle_state_t* insert_handle, - const struct _cef_touch_handle_state_t* start_selection_handle, - const struct _cef_touch_handle_state_t* end_selection_handle, + void(CEF_CALLBACK *on_touch_selection_changed)( + struct _cef_render_handler_t *self, + const struct _cef_touch_handle_state_t *insert_handle, + const struct _cef_touch_handle_state_t *start_selection_handle, + const struct _cef_touch_handle_state_t *end_selection_handle, int need_report); /// @@ -203,70 +195,62 @@ typedef struct _cef_render_handler_t { // synchronously or asynchronously to inform the web view that the drag // operation has ended. /// - int(CEF_CALLBACK* start_dragging)(struct _cef_render_handler_t* self, - struct _cef_browser_t* browser, - struct _cef_drag_data_t* drag_data, + int(CEF_CALLBACK *start_dragging)(struct _cef_render_handler_t *self, + struct _cef_browser_t *browser, + struct _cef_drag_data_t *drag_data, cef_drag_operations_mask_t allowed_ops, - int x, - int y); + int x, int y); /// // Called when the web view wants to update the mouse cursor during a drag & // drop operation. |operation| describes the allowed operation (none, move, // copy, link). /// - void(CEF_CALLBACK* update_drag_cursor)(struct _cef_render_handler_t* self, - struct _cef_browser_t* browser, + 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, - double x, - double y); + void(CEF_CALLBACK *on_scroll_offset_changed)( + struct _cef_render_handler_t *self, struct _cef_browser_t *browser, + double x, double y); /// // Called when the RootLayer has changed. /// - void(CEF_CALLBACK* on_root_layer_changed)(struct _cef_render_handler_t* self, - struct _cef_browser_t* browser, - int height, - int width); + void(CEF_CALLBACK *on_root_layer_changed)(struct _cef_render_handler_t *self, + struct _cef_browser_t *browser, + int height, int width); /// // Called when the IME composition range has changed. |selected_range| is the // range of characters that have been selected. |character_bounds| is the // bounds of each character in view coordinates. /// - void(CEF_CALLBACK* on_ime_composition_range_changed)( - struct _cef_render_handler_t* self, - struct _cef_browser_t* browser, - const cef_range_t* selected_range, - size_t character_boundsCount, - cef_rect_t const* character_bounds); + void(CEF_CALLBACK *on_ime_composition_range_changed)( + struct _cef_render_handler_t *self, struct _cef_browser_t *browser, + const cef_range_t *selected_range, size_t character_boundsCount, + cef_rect_t const *character_bounds); /// // Called when text selection has changed for the specified |browser|. // |selected_text| is the currently selected text and |selected_range| is the // character range. /// - void(CEF_CALLBACK* on_text_selection_changed)( - struct _cef_render_handler_t* self, - struct _cef_browser_t* browser, - const cef_string_t* selected_text, - const cef_range_t* selected_range); + void(CEF_CALLBACK *on_text_selection_changed)( + struct _cef_render_handler_t *self, struct _cef_browser_t *browser, + const cef_string_t *selected_text, const cef_range_t *selected_range); /// // Called when text selection has changed for the specified |browser|. |text| // is the currently text and |selected_range| is the character range. /// - void(CEF_CALLBACK* on_selection_changed)(struct _cef_render_handler_t* self, - struct _cef_browser_t* browser, - const cef_string_t* text, - const cef_range_t* selected_range); + void(CEF_CALLBACK *on_selection_changed)(struct _cef_render_handler_t *self, + struct _cef_browser_t *browser, + const cef_string_t *text, + const cef_range_t *selected_range); /// // Called when an on-screen keyboard should be shown or hidden for the @@ -275,48 +259,58 @@ typedef struct _cef_render_handler_t { // for this browser should be hidden. |show_keyboard| specifies whether to // display the keyboard. /// - void(CEF_CALLBACK* on_virtual_keyboard_requested)( - struct _cef_render_handler_t* self, - struct _cef_browser_t* browser, - cef_text_input_mode_t input_mode, - int show_keyboard); + void(CEF_CALLBACK *on_virtual_keyboard_requested)( + struct _cef_render_handler_t *self, struct _cef_browser_t *browser, + cef_text_input_mode_t input_mode, int show_keyboard); /// // Called when the cursor position has changed. /// - void(CEF_CALLBACK* on_cursor_update)(struct _cef_render_handler_t* self, - struct _cef_browser_t* browser, - const cef_rect_t* rect); + void(CEF_CALLBACK *on_cursor_update)(struct _cef_render_handler_t *self, + struct _cef_browser_t *browser, + const cef_rect_t *rect); /// /// Called when swap buffer completed with new size. /// - void(CEF_CALLBACK* on_complete_swap_with_new_size)( - struct _cef_render_handler_t* self); + void(CEF_CALLBACK *on_complete_swap_with_new_size)( + struct _cef_render_handler_t *self); /// /// Called when resize not work. /// - void(CEF_CALLBACK* on_resize_not_work)(struct _cef_render_handler_t* self); + void(CEF_CALLBACK *on_resize_not_work)(struct _cef_render_handler_t *self); /// /// Called when over scroll. /// - void(CEF_CALLBACK* on_overscroll)(struct _cef_render_handler_t* self, - struct _cef_browser_t* browser, - const float x, - const float y); + void(CEF_CALLBACK *on_overscroll)(struct _cef_render_handler_t *self, + struct _cef_browser_t *browser, + const float x, const float y); /// /// Called when editable status has been changed. /// - void(CEF_CALLBACK* on_editable_changed)(struct _cef_render_handler_t* self, - struct _cef_browser_t* browser, + void(CEF_CALLBACK *on_editable_changed)(struct _cef_render_handler_t *self, + struct _cef_browser_t *browser, int is_editable_node); + + /// + /// Called when over scroll. + /// + void(CEF_CALLBACK *on_over_scroll_fling_velocity)( + struct _cef_render_handler_t *self, struct _cef_browser_t *browser, + const float x, const float y, int is_fling); + + /// + /// Called when over scroll fling end. + /// + void(CEF_CALLBACK *on_over_scroll_fling_end)( + struct _cef_render_handler_t *self, struct _cef_browser_t *browser); } cef_render_handler_t; #ifdef __cplusplus } #endif -#endif // CEF_INCLUDE_CAPI_CEF_RENDER_HANDLER_CAPI_H_ +#endif // CEF_INCLUDE_CAPI_CEF_RENDER_HANDLER_CAPI_H_ diff --git a/include/cef_api_hash.h b/include/cef_api_hash.h index 1dfe43c1179f6ab9c8e86546875e5f1be749eff3..59b1ca0a8d47848c6895cb716f04bd1648dc7e5f 100644 --- a/include/cef_api_hash.h +++ b/include/cef_api_hash.h @@ -42,15 +42,15 @@ // way that may cause binary incompatibility with other builds. The universal // hash value will change if any platform is affected whereas the platform hash // values will change only if that particular platform is affected. -#define CEF_API_HASH_UNIVERSAL "9136694da06c3e39438804f09ab4f6169a8e751c" +#define CEF_API_HASH_UNIVERSAL "76c95fd74cd2bac7427fbf0f87d22b4827e7c568" #if defined(OS_WIN) -#define CEF_API_HASH_PLATFORM "2834804fc2e11abb6ac5c3550a6641981c2e748b" +#define CEF_API_HASH_PLATFORM "80e902fddbf4ffc0bb5f3712f556884f7ef6524a" #elif defined(OS_MAC) -#define CEF_API_HASH_PLATFORM "539213150036dbda126130249e711d4bb4f92cd7" +#define CEF_API_HASH_PLATFORM "a20f9a244c7a95529876e8d6418e2400688c9f02" #elif defined(OS_LINUX) -#define CEF_API_HASH_PLATFORM "8b7ac65714f030a8e55e13d6ada103799cbd158a" +#define CEF_API_HASH_PLATFORM "9fdec46dd8c3e9f06fd782afb3089aa4155b48e2" #elif defined(OS_OHOS) -#define CEF_API_HASH_PLATFORM "8b7ac65714f030a8e55e13d6ada103799cbd158a" +#define CEF_API_HASH_PLATFORM "9fdec46dd8c3e9f06fd782afb3089aa4155b48e2" #endif #ifdef __cplusplus diff --git a/include/cef_render_handler.h b/include/cef_render_handler.h index 36243e36e0ebd01713dda778698725b4e782f8d3..addf170e04aea13f78785c39556bb45d3e030eb6 100644 --- a/include/cef_render_handler.h +++ b/include/cef_render_handler.h @@ -313,6 +313,21 @@ class CefRenderHandler : public virtual CefBaseRefCounted { /*--cef()--*/ virtual void OnEditableChanged(CefRefPtr browser, bool is_editable_node) {} + + /// + /// Called when over scroll. + /// + /*--cef()--*/ + virtual void OnOverScrollFlingVelocity(CefRefPtr browser, + const float x, + const float y, + bool is_fling) {} + + /// + /// Called when over scroll fling end. + /// + /*--cef()--*/ + virtual void OnOverScrollFlingEnd(CefRefPtr browser) {} }; #endif // CEF_INCLUDE_CEF_RENDER_HANDLER_H_ diff --git a/libcef/browser/osr/render_widget_host_view_osr.cc b/libcef/browser/osr/render_widget_host_view_osr.cc index 6b0db24529efd1e7bf3e2792d830271c472c0916..600bd972137a354dbc053fa08d7893bd5518ec95 100644 --- a/libcef/browser/osr/render_widget_host_view_osr.cc +++ b/libcef/browser/osr/render_widget_host_view_osr.cc @@ -2414,5 +2414,34 @@ void CefRenderWidgetHostViewOSR::DidOverscroll( float x = params.latest_overscroll_delta.x(); float y = params.latest_overscroll_delta.y(); handler->OnOverscroll(browser_impl_.get(), x, y); + + float fling_velocity_x = params.current_fling_velocity.x() * current_frames_; + float fling_velocity_y = params.current_fling_velocity.y() * current_frames_; + bool is_fling = true; + if (fling_velocity_x == 0 && fling_velocity_y == 0) { + fling_velocity_x = x; + fling_velocity_y = y; + is_fling = false; + } + handler->OnOverScrollFlingVelocity(browser_impl_.get(), fling_velocity_x, + fling_velocity_y, is_fling); + } +} + +void CefRenderWidgetHostViewOSR::DidStopFlinging() { + LOG(DEBUG) << "CefRenderWidgetHostViewOSR::DidStopFlinging"; + if (browser_impl_.get()) { + CefRefPtr handler = + browser_impl_->client()->GetRenderHandler(); + CHECK(handler); + handler->OnOverScrollFlingEnd(browser_impl_.get()); } } + +blink::mojom::InputEventResultState +CefRenderWidgetHostViewOSR::FilterInputEvent( + const blink::WebInputEvent& input_event) { + LOG(DEBUG) << "CefRenderWidgetHostViewOSR::FilterInputEvent"; + + return blink::mojom::InputEventResultState::kNotConsumed; +} diff --git a/libcef/browser/osr/render_widget_host_view_osr.h b/libcef/browser/osr/render_widget_host_view_osr.h index 261f795d0b91d2af1c79115b4e6cbab22a8ea9ea..646c5359afb35e5500849be6da6a9a4ee3d45e82 100644 --- a/libcef/browser/osr/render_widget_host_view_osr.h +++ b/libcef/browser/osr/render_widget_host_view_osr.h @@ -248,6 +248,9 @@ class CefRenderWidgetHostViewOSR blink::mojom::InputEventResultState ack_result) override; void OnGestureEvent(const ui::GestureEventData& gesture) override; void DidOverscroll(const ui::DidOverscrollParams& params) override; + void DidStopFlinging() override; + blink::mojom::InputEventResultState FilterInputEvent( + const blink::WebInputEvent& input_event) override; #if BUILDFLAG(IS_OHOS) void OnVsync(); @@ -494,6 +497,7 @@ class CefRenderWidgetHostViewOSR bool is_need_show_keyboard_ = false; bool is_need_hide_keyboard_ = true; std::chrono::high_resolution_clock::time_point lastHideKeyboardTime_; + int current_frames_ = 60; #endif CefRefPtr browser_impl_; diff --git a/libcef_dll/cpptoc/render_handler_cpptoc.cc b/libcef_dll/cpptoc/render_handler_cpptoc.cc index a81756852483221a8a5c9c8f1cd3cfdc3163448c..9943748b03738f77cfbcf7bc5f4bf7854755941c 100644 --- a/libcef_dll/cpptoc/render_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/render_handler_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=9a336189c38ced7f1c64e4372c95e5ba2ac52abc$ +// $hash=aeec58911a3c9b212f3b0fe3c577168550940a65$ // #include "libcef_dll/cpptoc/render_handler_cpptoc.h" @@ -22,8 +22,8 @@ namespace { // MEMBER FUNCTIONS - Body may be edited by hand. -cef_accessibility_handler_t* CEF_CALLBACK -render_handler_get_accessibility_handler(struct _cef_render_handler_t* self) { +cef_accessibility_handler_t *CEF_CALLBACK +render_handler_get_accessibility_handler(struct _cef_render_handler_t *self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -41,9 +41,8 @@ render_handler_get_accessibility_handler(struct _cef_render_handler_t* self) { } int CEF_CALLBACK -render_handler_get_root_screen_rect(struct _cef_render_handler_t* self, - cef_browser_t* browser, - cef_rect_t* rect) { +render_handler_get_root_screen_rect(struct _cef_render_handler_t *self, + cef_browser_t *browser, cef_rect_t *rect) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -76,9 +75,8 @@ render_handler_get_root_screen_rect(struct _cef_render_handler_t* self, } void CEF_CALLBACK -render_handler_get_view_rect(struct _cef_render_handler_t* self, - cef_browser_t* browser, - cef_rect_t* rect) { +render_handler_get_view_rect(struct _cef_render_handler_t *self, + cef_browser_t *browser, cef_rect_t *rect) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -107,13 +105,9 @@ render_handler_get_view_rect(struct _cef_render_handler_t* self, *rect = rectVal; } -int CEF_CALLBACK -render_handler_get_screen_point(struct _cef_render_handler_t* self, - cef_browser_t* browser, - int viewX, - int viewY, - int* screenX, - int* screenY) { +int CEF_CALLBACK render_handler_get_screen_point( + struct _cef_render_handler_t *self, cef_browser_t *browser, int viewX, + int viewY, int *screenX, int *screenY) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -154,10 +148,9 @@ render_handler_get_screen_point(struct _cef_render_handler_t* self, return _retval; } -int CEF_CALLBACK -render_handler_get_screen_info(struct _cef_render_handler_t* self, - cef_browser_t* browser, - struct _cef_screen_info_t* screen_info) { +int CEF_CALLBACK render_handler_get_screen_info( + struct _cef_render_handler_t *self, cef_browser_t *browser, + struct _cef_screen_info_t *screen_info) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -191,10 +184,8 @@ render_handler_get_screen_info(struct _cef_render_handler_t* self, return _retval; } -void CEF_CALLBACK -render_handler_on_popup_show(struct _cef_render_handler_t* self, - cef_browser_t* browser, - int show) { +void CEF_CALLBACK render_handler_on_popup_show( + struct _cef_render_handler_t *self, cef_browser_t *browser, int show) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -213,9 +204,8 @@ render_handler_on_popup_show(struct _cef_render_handler_t* self, } void CEF_CALLBACK -render_handler_on_popup_size(struct _cef_render_handler_t* self, - cef_browser_t* browser, - const cef_rect_t* rect) { +render_handler_on_popup_size(struct _cef_render_handler_t *self, + cef_browser_t *browser, const cef_rect_t *rect) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -240,14 +230,10 @@ render_handler_on_popup_size(struct _cef_render_handler_t* self, CefBrowserCToCpp::Wrap(browser), rectVal); } -void CEF_CALLBACK render_handler_on_paint(struct _cef_render_handler_t* self, - cef_browser_t* browser, - cef_paint_element_type_t type, - size_t dirtyRectsCount, - cef_rect_t const* dirtyRects, - const void* buffer, - int width, - int height) { +void CEF_CALLBACK render_handler_on_paint( + struct _cef_render_handler_t *self, cef_browser_t *browser, + cef_paint_element_type_t type, size_t dirtyRectsCount, + cef_rect_t const *dirtyRects, const void *buffer, int width, int height) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -283,13 +269,10 @@ void CEF_CALLBACK render_handler_on_paint(struct _cef_render_handler_t* self, width, height); } -void CEF_CALLBACK -render_handler_on_accelerated_paint(struct _cef_render_handler_t* self, - cef_browser_t* browser, - cef_paint_element_type_t type, - size_t dirtyRectsCount, - cef_rect_t const* dirtyRects, - void* shared_handle) { +void CEF_CALLBACK render_handler_on_accelerated_paint( + struct _cef_render_handler_t *self, cef_browser_t *browser, + cef_paint_element_type_t type, size_t dirtyRectsCount, + cef_rect_t const *dirtyRects, void *shared_handle) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -324,11 +307,9 @@ render_handler_on_accelerated_paint(struct _cef_render_handler_t* self, CefBrowserCToCpp::Wrap(browser), type, dirtyRectsList, shared_handle); } -void CEF_CALLBACK -render_handler_get_touch_handle_size(struct _cef_render_handler_t* self, - cef_browser_t* browser, - cef_horizontal_alignment_t orientation, - cef_size_t* size) { +void CEF_CALLBACK render_handler_get_touch_handle_size( + struct _cef_render_handler_t *self, cef_browser_t *browser, + cef_horizontal_alignment_t orientation, cef_size_t *size) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -358,9 +339,8 @@ render_handler_get_touch_handle_size(struct _cef_render_handler_t* self, } void CEF_CALLBACK render_handler_on_touch_handle_state_changed( - struct _cef_render_handler_t* self, - cef_browser_t* browser, - const struct _cef_touch_handle_state_t* state) { + struct _cef_render_handler_t *self, cef_browser_t *browser, + const struct _cef_touch_handle_state_t *state) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -388,10 +368,10 @@ void CEF_CALLBACK render_handler_on_touch_handle_state_changed( } void CEF_CALLBACK render_handler_on_touch_selection_changed( - struct _cef_render_handler_t* self, - const struct _cef_touch_handle_state_t* insert_handle, - const struct _cef_touch_handle_state_t* start_selection_handle, - const struct _cef_touch_handle_state_t* end_selection_handle, + struct _cef_render_handler_t *self, + const struct _cef_touch_handle_state_t *insert_handle, + const struct _cef_touch_handle_state_t *start_selection_handle, + const struct _cef_touch_handle_state_t *end_selection_handle, int need_report) { shutdown_checker::AssertNotShutdown(); @@ -432,13 +412,10 @@ void CEF_CALLBACK render_handler_on_touch_selection_changed( need_report ? true : false); } -int CEF_CALLBACK -render_handler_start_dragging(struct _cef_render_handler_t* self, - cef_browser_t* browser, - cef_drag_data_t* drag_data, - cef_drag_operations_mask_t allowed_ops, - int x, - int y) { +int CEF_CALLBACK render_handler_start_dragging( + struct _cef_render_handler_t *self, cef_browser_t *browser, + cef_drag_data_t *drag_data, cef_drag_operations_mask_t allowed_ops, int x, + int y) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -464,10 +441,9 @@ render_handler_start_dragging(struct _cef_render_handler_t* self, return _retval; } -void CEF_CALLBACK -render_handler_update_drag_cursor(struct _cef_render_handler_t* self, - cef_browser_t* browser, - cef_drag_operations_mask_t operation) { +void CEF_CALLBACK render_handler_update_drag_cursor( + struct _cef_render_handler_t *self, cef_browser_t *browser, + cef_drag_operations_mask_t operation) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -485,11 +461,9 @@ render_handler_update_drag_cursor(struct _cef_render_handler_t* self, CefBrowserCToCpp::Wrap(browser), operation); } -void CEF_CALLBACK -render_handler_on_scroll_offset_changed(struct _cef_render_handler_t* self, - cef_browser_t* browser, - double x, - double y) { +void CEF_CALLBACK render_handler_on_scroll_offset_changed( + struct _cef_render_handler_t *self, cef_browser_t *browser, double x, + double y) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -507,11 +481,9 @@ render_handler_on_scroll_offset_changed(struct _cef_render_handler_t* self, CefBrowserCToCpp::Wrap(browser), x, y); } -void CEF_CALLBACK -render_handler_on_root_layer_changed(struct _cef_render_handler_t* self, - cef_browser_t* browser, - int height, - int width) { +void CEF_CALLBACK render_handler_on_root_layer_changed( + struct _cef_render_handler_t *self, cef_browser_t *browser, int height, + int width) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -530,11 +502,9 @@ render_handler_on_root_layer_changed(struct _cef_render_handler_t* self, } void CEF_CALLBACK render_handler_on_ime_composition_range_changed( - struct _cef_render_handler_t* self, - cef_browser_t* browser, - const cef_range_t* selected_range, - size_t character_boundsCount, - cef_rect_t const* character_bounds) { + struct _cef_render_handler_t *self, cef_browser_t *browser, + const cef_range_t *selected_range, size_t character_boundsCount, + cef_rect_t const *character_bounds) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -571,11 +541,9 @@ void CEF_CALLBACK render_handler_on_ime_composition_range_changed( CefBrowserCToCpp::Wrap(browser), selected_rangeVal, character_boundsList); } -void CEF_CALLBACK -render_handler_on_text_selection_changed(struct _cef_render_handler_t* self, - cef_browser_t* browser, - const cef_string_t* selected_text, - const cef_range_t* selected_range) { +void CEF_CALLBACK render_handler_on_text_selection_changed( + struct _cef_render_handler_t *self, cef_browser_t *browser, + const cef_string_t *selected_text, const cef_range_t *selected_range) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -598,11 +566,9 @@ render_handler_on_text_selection_changed(struct _cef_render_handler_t* self, selected_rangeVal); } -void CEF_CALLBACK -render_handler_on_selection_changed(struct _cef_render_handler_t* self, - cef_browser_t* browser, - const cef_string_t* text, - const cef_range_t* selected_range) { +void CEF_CALLBACK render_handler_on_selection_changed( + struct _cef_render_handler_t *self, cef_browser_t *browser, + const cef_string_t *text, const cef_range_t *selected_range) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -624,11 +590,9 @@ render_handler_on_selection_changed(struct _cef_render_handler_t* self, CefBrowserCToCpp::Wrap(browser), CefString(text), selected_rangeVal); } -void CEF_CALLBACK -render_handler_on_virtual_keyboard_requested(struct _cef_render_handler_t* self, - cef_browser_t* browser, - cef_text_input_mode_t input_mode, - int show_keyboard) { +void CEF_CALLBACK render_handler_on_virtual_keyboard_requested( + struct _cef_render_handler_t *self, cef_browser_t *browser, + cef_text_input_mode_t input_mode, int show_keyboard) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -647,10 +611,9 @@ render_handler_on_virtual_keyboard_requested(struct _cef_render_handler_t* self, show_keyboard ? true : false); } -void CEF_CALLBACK -render_handler_on_cursor_update(struct _cef_render_handler_t* self, - cef_browser_t* browser, - const cef_rect_t* rect) { +void CEF_CALLBACK render_handler_on_cursor_update( + struct _cef_render_handler_t *self, cef_browser_t *browser, + const cef_rect_t *rect) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -676,7 +639,7 @@ render_handler_on_cursor_update(struct _cef_render_handler_t* self, } void CEF_CALLBACK render_handler_on_complete_swap_with_new_size( - struct _cef_render_handler_t* self) { + struct _cef_render_handler_t *self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -690,7 +653,7 @@ void CEF_CALLBACK render_handler_on_complete_swap_with_new_size( } void CEF_CALLBACK -render_handler_on_resize_not_work(struct _cef_render_handler_t* self) { +render_handler_on_resize_not_work(struct _cef_render_handler_t *self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -703,11 +666,9 @@ render_handler_on_resize_not_work(struct _cef_render_handler_t* self) { CefRenderHandlerCppToC::Get(self)->OnResizeNotWork(); } -void CEF_CALLBACK -render_handler_on_overscroll(struct _cef_render_handler_t* self, - cef_browser_t* browser, - const float x, - const float y) { +void CEF_CALLBACK render_handler_on_overscroll( + struct _cef_render_handler_t *self, cef_browser_t *browser, const float x, + const float y) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -725,10 +686,9 @@ render_handler_on_overscroll(struct _cef_render_handler_t* self, CefBrowserCToCpp::Wrap(browser), x, y); } -void CEF_CALLBACK -render_handler_on_editable_changed(struct _cef_render_handler_t* self, - cef_browser_t* browser, - int is_editable_node) { +void CEF_CALLBACK render_handler_on_editable_changed( + struct _cef_render_handler_t *self, cef_browser_t *browser, + int is_editable_node) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -746,7 +706,46 @@ render_handler_on_editable_changed(struct _cef_render_handler_t* self, CefBrowserCToCpp::Wrap(browser), is_editable_node ? true : false); } -} // namespace +void CEF_CALLBACK render_handler_on_over_scroll_fling_velocity( + struct _cef_render_handler_t *self, cef_browser_t *browser, const float x, + const float y, int is_fling) { + shutdown_checker::AssertNotShutdown(); + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) + return; + // Verify param: browser; type: refptr_diff + DCHECK(browser); + if (!browser) + return; + + // Execute + CefRenderHandlerCppToC::Get(self)->OnOverScrollFlingVelocity( + CefBrowserCToCpp::Wrap(browser), x, y, is_fling ? true : false); +} + +void CEF_CALLBACK render_handler_on_over_scroll_fling_end( + struct _cef_render_handler_t *self, cef_browser_t *browser) { + shutdown_checker::AssertNotShutdown(); + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) + return; + // Verify param: browser; type: refptr_diff + DCHECK(browser); + if (!browser) + return; + + // Execute + CefRenderHandlerCppToC::Get(self)->OnOverScrollFlingEnd( + CefBrowserCToCpp::Wrap(browser)); +} + +} // namespace // CONSTRUCTOR - Do not edit by hand. @@ -784,6 +783,10 @@ CefRenderHandlerCppToC::CefRenderHandlerCppToC() { GetStruct()->on_resize_not_work = render_handler_on_resize_not_work; GetStruct()->on_overscroll = render_handler_on_overscroll; GetStruct()->on_editable_changed = render_handler_on_editable_changed; + GetStruct()->on_over_scroll_fling_velocity = + render_handler_on_over_scroll_fling_velocity; + GetStruct()->on_over_scroll_fling_end = + render_handler_on_over_scroll_fling_end; } // DESTRUCTOR - Do not edit by hand. @@ -793,17 +796,16 @@ CefRenderHandlerCppToC::~CefRenderHandlerCppToC() { } template <> -CefRefPtr CefCppToCRefCounted< - CefRenderHandlerCppToC, - CefRenderHandler, - cef_render_handler_t>::UnwrapDerived(CefWrapperType type, - cef_render_handler_t* s) { +CefRefPtr +CefCppToCRefCounted::UnwrapDerived(CefWrapperType type, + cef_render_handler_t + *s) { NOTREACHED() << "Unexpected class type: " << type; return nullptr; } template <> -CefWrapperType CefCppToCRefCounted::kWrapperType = WT_RENDER_HANDLER; diff --git a/libcef_dll/ctocpp/render_handler_ctocpp.cc b/libcef_dll/ctocpp/render_handler_ctocpp.cc index db94f62601a5c1492b25fd50693ac0b700bf222d..b119a142d2e6671c93fba3498b86bd89ee82c51b 100644 --- a/libcef_dll/ctocpp/render_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/render_handler_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=6ade3729f9d523f2abec2b6b4f02eb49a4074d95$ +// $hash=a8f553984903844d389f7a5f6b5b3d22d700982a$ // #include "libcef_dll/ctocpp/render_handler_ctocpp.h" @@ -25,14 +25,14 @@ CefRefPtr< CefAccessibilityHandler> CefRenderHandlerCToCpp::GetAccessibilityHandler() { shutdown_checker::AssertNotShutdown(); - cef_render_handler_t* _struct = GetStruct(); + cef_render_handler_t *_struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, get_accessibility_handler)) return nullptr; // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute - cef_accessibility_handler_t* _retval = + cef_accessibility_handler_t *_retval = _struct->get_accessibility_handler(_struct); // Return type: refptr_same @@ -41,10 +41,10 @@ CefRefPtr< NO_SANITIZE("cfi-icall") bool CefRenderHandlerCToCpp::GetRootScreenRect(CefRefPtr browser, - CefRect& rect) { + CefRect &rect) { shutdown_checker::AssertNotShutdown(); - cef_render_handler_t* _struct = GetStruct(); + cef_render_handler_t *_struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, get_root_screen_rect)) return false; @@ -65,10 +65,10 @@ bool CefRenderHandlerCToCpp::GetRootScreenRect(CefRefPtr browser, NO_SANITIZE("cfi-icall") void CefRenderHandlerCToCpp::GetViewRect(CefRefPtr browser, - CefRect& rect) { + CefRect &rect) { shutdown_checker::AssertNotShutdown(); - cef_render_handler_t* _struct = GetStruct(); + cef_render_handler_t *_struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, get_view_rect)) return; @@ -85,13 +85,11 @@ void CefRenderHandlerCToCpp::GetViewRect(CefRefPtr browser, NO_SANITIZE("cfi-icall") bool CefRenderHandlerCToCpp::GetScreenPoint(CefRefPtr browser, - int viewX, - int viewY, - int& screenX, - int& screenY) { + int viewX, int viewY, int &screenX, + int &screenY) { shutdown_checker::AssertNotShutdown(); - cef_render_handler_t* _struct = GetStruct(); + cef_render_handler_t *_struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, get_screen_point)) return false; @@ -113,10 +111,10 @@ bool CefRenderHandlerCToCpp::GetScreenPoint(CefRefPtr browser, NO_SANITIZE("cfi-icall") bool CefRenderHandlerCToCpp::GetScreenInfo(CefRefPtr browser, - CefScreenInfo& screen_info) { + CefScreenInfo &screen_info) { shutdown_checker::AssertNotShutdown(); - cef_render_handler_t* _struct = GetStruct(); + cef_render_handler_t *_struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, get_screen_info)) return false; @@ -140,7 +138,7 @@ void CefRenderHandlerCToCpp::OnPopupShow(CefRefPtr browser, bool show) { shutdown_checker::AssertNotShutdown(); - cef_render_handler_t* _struct = GetStruct(); + cef_render_handler_t *_struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, on_popup_show)) return; @@ -157,10 +155,10 @@ void CefRenderHandlerCToCpp::OnPopupShow(CefRefPtr browser, NO_SANITIZE("cfi-icall") void CefRenderHandlerCToCpp::OnPopupSize(CefRefPtr browser, - const CefRect& rect) { + const CefRect &rect) { shutdown_checker::AssertNotShutdown(); - cef_render_handler_t* _struct = GetStruct(); + cef_render_handler_t *_struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, on_popup_size)) return; @@ -178,13 +176,12 @@ void CefRenderHandlerCToCpp::OnPopupSize(CefRefPtr browser, NO_SANITIZE("cfi-icall") void CefRenderHandlerCToCpp::OnPaint(CefRefPtr browser, PaintElementType type, - const RectList& dirtyRects, - const void* buffer, - int width, + const RectList &dirtyRects, + const void *buffer, int width, int height) { shutdown_checker::AssertNotShutdown(); - cef_render_handler_t* _struct = GetStruct(); + cef_render_handler_t *_struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, on_paint)) return; @@ -201,7 +198,7 @@ void CefRenderHandlerCToCpp::OnPaint(CefRefPtr browser, // Translate param: dirtyRects; type: simple_vec_byref_const const size_t dirtyRectsCount = dirtyRects.size(); - cef_rect_t* dirtyRectsList = NULL; + cef_rect_t *dirtyRectsList = NULL; if (dirtyRectsCount > 0) { dirtyRectsList = new cef_rect_t[dirtyRectsCount]; DCHECK(dirtyRectsList); @@ -224,11 +221,11 @@ void CefRenderHandlerCToCpp::OnPaint(CefRefPtr browser, NO_SANITIZE("cfi-icall") void CefRenderHandlerCToCpp::OnAcceleratedPaint(CefRefPtr browser, PaintElementType type, - const RectList& dirtyRects, - void* shared_handle) { + const RectList &dirtyRects, + void *shared_handle) { shutdown_checker::AssertNotShutdown(); - cef_render_handler_t* _struct = GetStruct(); + cef_render_handler_t *_struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, on_accelerated_paint)) return; @@ -245,7 +242,7 @@ void CefRenderHandlerCToCpp::OnAcceleratedPaint(CefRefPtr browser, // Translate param: dirtyRects; type: simple_vec_byref_const const size_t dirtyRectsCount = dirtyRects.size(); - cef_rect_t* dirtyRectsList = NULL; + cef_rect_t *dirtyRectsList = NULL; if (dirtyRectsCount > 0) { dirtyRectsList = new cef_rect_t[dirtyRectsCount]; DCHECK(dirtyRectsList); @@ -267,12 +264,11 @@ void CefRenderHandlerCToCpp::OnAcceleratedPaint(CefRefPtr browser, NO_SANITIZE("cfi-icall") void CefRenderHandlerCToCpp::GetTouchHandleSize( - CefRefPtr browser, - cef_horizontal_alignment_t orientation, - CefSize& size) { + CefRefPtr browser, cef_horizontal_alignment_t orientation, + CefSize &size) { shutdown_checker::AssertNotShutdown(); - cef_render_handler_t* _struct = GetStruct(); + cef_render_handler_t *_struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, get_touch_handle_size)) return; @@ -290,11 +286,10 @@ void CefRenderHandlerCToCpp::GetTouchHandleSize( NO_SANITIZE("cfi-icall") void CefRenderHandlerCToCpp::OnTouchHandleStateChanged( - CefRefPtr browser, - const CefTouchHandleState& state) { + CefRefPtr browser, const CefTouchHandleState &state) { shutdown_checker::AssertNotShutdown(); - cef_render_handler_t* _struct = GetStruct(); + cef_render_handler_t *_struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, on_touch_handle_state_changed)) return; @@ -312,13 +307,12 @@ void CefRenderHandlerCToCpp::OnTouchHandleStateChanged( NO_SANITIZE("cfi-icall") void CefRenderHandlerCToCpp::OnTouchSelectionChanged( - const CefTouchHandleState& insert_handle, - const CefTouchHandleState& start_selection_handle, - const CefTouchHandleState& end_selection_handle, - bool need_report) { + const CefTouchHandleState &insert_handle, + const CefTouchHandleState &start_selection_handle, + const CefTouchHandleState &end_selection_handle, bool need_report) { shutdown_checker::AssertNotShutdown(); - cef_render_handler_t* _struct = GetStruct(); + cef_render_handler_t *_struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, on_touch_selection_changed)) return; @@ -334,11 +328,10 @@ NO_SANITIZE("cfi-icall") bool CefRenderHandlerCToCpp::StartDragging(CefRefPtr browser, CefRefPtr drag_data, DragOperationsMask allowed_ops, - int x, - int y) { + int x, int y) { shutdown_checker::AssertNotShutdown(); - cef_render_handler_t* _struct = GetStruct(); + cef_render_handler_t *_struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, start_dragging)) return false; @@ -367,7 +360,7 @@ void CefRenderHandlerCToCpp::UpdateDragCursor(CefRefPtr browser, DragOperation operation) { shutdown_checker::AssertNotShutdown(); - cef_render_handler_t* _struct = GetStruct(); + cef_render_handler_t *_struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, update_drag_cursor)) return; @@ -385,12 +378,10 @@ void CefRenderHandlerCToCpp::UpdateDragCursor(CefRefPtr browser, NO_SANITIZE("cfi-icall") void CefRenderHandlerCToCpp::OnScrollOffsetChanged( - CefRefPtr browser, - double x, - double y) { + CefRefPtr browser, double x, double y) { shutdown_checker::AssertNotShutdown(); - cef_render_handler_t* _struct = GetStruct(); + cef_render_handler_t *_struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, on_scroll_offset_changed)) return; @@ -408,11 +399,10 @@ void CefRenderHandlerCToCpp::OnScrollOffsetChanged( NO_SANITIZE("cfi-icall") void CefRenderHandlerCToCpp::OnRootLayerChanged(CefRefPtr browser, - int height, - int width) { + int height, int width) { shutdown_checker::AssertNotShutdown(); - cef_render_handler_t* _struct = GetStruct(); + cef_render_handler_t *_struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, on_root_layer_changed)) return; @@ -430,12 +420,11 @@ void CefRenderHandlerCToCpp::OnRootLayerChanged(CefRefPtr browser, NO_SANITIZE("cfi-icall") void CefRenderHandlerCToCpp::OnImeCompositionRangeChanged( - CefRefPtr browser, - const CefRange& selected_range, - const RectList& character_bounds) { + CefRefPtr browser, const CefRange &selected_range, + const RectList &character_bounds) { shutdown_checker::AssertNotShutdown(); - cef_render_handler_t* _struct = GetStruct(); + cef_render_handler_t *_struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, on_ime_composition_range_changed)) return; @@ -448,7 +437,7 @@ void CefRenderHandlerCToCpp::OnImeCompositionRangeChanged( // Translate param: character_bounds; type: simple_vec_byref_const const size_t character_boundsCount = character_bounds.size(); - cef_rect_t* character_boundsList = NULL; + cef_rect_t *character_boundsList = NULL; if (character_boundsCount > 0) { character_boundsList = new cef_rect_t[character_boundsCount]; DCHECK(character_boundsList); @@ -471,12 +460,11 @@ void CefRenderHandlerCToCpp::OnImeCompositionRangeChanged( NO_SANITIZE("cfi-icall") void CefRenderHandlerCToCpp::OnTextSelectionChanged( - CefRefPtr browser, - const CefString& selected_text, - const CefRange& selected_range) { + CefRefPtr browser, const CefString &selected_text, + const CefRange &selected_range) { shutdown_checker::AssertNotShutdown(); - cef_render_handler_t* _struct = GetStruct(); + cef_render_handler_t *_struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, on_text_selection_changed)) return; @@ -496,12 +484,11 @@ void CefRenderHandlerCToCpp::OnTextSelectionChanged( NO_SANITIZE("cfi-icall") void CefRenderHandlerCToCpp::OnSelectionChanged( - CefRefPtr browser, - const CefString& text, - const CefRange& selected_range) { + CefRefPtr browser, const CefString &text, + const CefRange &selected_range) { shutdown_checker::AssertNotShutdown(); - cef_render_handler_t* _struct = GetStruct(); + cef_render_handler_t *_struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, on_selection_changed)) return; @@ -520,12 +507,11 @@ void CefRenderHandlerCToCpp::OnSelectionChanged( NO_SANITIZE("cfi-icall") void CefRenderHandlerCToCpp::OnVirtualKeyboardRequested( - CefRefPtr browser, - TextInputMode input_mode, + CefRefPtr browser, TextInputMode input_mode, bool show_keyboard) { shutdown_checker::AssertNotShutdown(); - cef_render_handler_t* _struct = GetStruct(); + cef_render_handler_t *_struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, on_virtual_keyboard_requested)) return; @@ -543,10 +529,10 @@ void CefRenderHandlerCToCpp::OnVirtualKeyboardRequested( NO_SANITIZE("cfi-icall") void CefRenderHandlerCToCpp::OnCursorUpdate(CefRefPtr browser, - const CefRect& rect) { + const CefRect &rect) { shutdown_checker::AssertNotShutdown(); - cef_render_handler_t* _struct = GetStruct(); + cef_render_handler_t *_struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, on_cursor_update)) return; @@ -565,7 +551,7 @@ NO_SANITIZE("cfi-icall") void CefRenderHandlerCToCpp::OnCompleteSwapWithNewSize() { shutdown_checker::AssertNotShutdown(); - cef_render_handler_t* _struct = GetStruct(); + cef_render_handler_t *_struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, on_complete_swap_with_new_size)) return; @@ -578,7 +564,7 @@ void CefRenderHandlerCToCpp::OnCompleteSwapWithNewSize() { NO_SANITIZE("cfi-icall") void CefRenderHandlerCToCpp::OnResizeNotWork() { shutdown_checker::AssertNotShutdown(); - cef_render_handler_t* _struct = GetStruct(); + cef_render_handler_t *_struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, on_resize_not_work)) return; @@ -590,11 +576,10 @@ NO_SANITIZE("cfi-icall") void CefRenderHandlerCToCpp::OnResizeNotWork() { NO_SANITIZE("cfi-icall") void CefRenderHandlerCToCpp::OnOverscroll(CefRefPtr browser, - const float x, - const float y) { + const float x, const float y) { shutdown_checker::AssertNotShutdown(); - cef_render_handler_t* _struct = GetStruct(); + cef_render_handler_t *_struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, on_overscroll)) return; @@ -614,7 +599,7 @@ void CefRenderHandlerCToCpp::OnEditableChanged(CefRefPtr browser, bool is_editable_node) { shutdown_checker::AssertNotShutdown(); - cef_render_handler_t* _struct = GetStruct(); + cef_render_handler_t *_struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, on_editable_changed)) return; @@ -630,6 +615,48 @@ void CefRenderHandlerCToCpp::OnEditableChanged(CefRefPtr browser, is_editable_node); } +NO_SANITIZE("cfi-icall") +void CefRenderHandlerCToCpp::OnOverScrollFlingVelocity( + CefRefPtr browser, const float x, const float y, + bool is_fling) { + shutdown_checker::AssertNotShutdown(); + + cef_render_handler_t *_struct = GetStruct(); + if (CEF_MEMBER_MISSING(_struct, on_over_scroll_fling_velocity)) + return; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Verify param: browser; type: refptr_diff + DCHECK(browser.get()); + if (!browser.get()) + return; + + // Execute + _struct->on_over_scroll_fling_velocity( + _struct, CefBrowserCppToC::Wrap(browser), x, y, is_fling); +} + +NO_SANITIZE("cfi-icall") +void CefRenderHandlerCToCpp::OnOverScrollFlingEnd( + CefRefPtr browser) { + shutdown_checker::AssertNotShutdown(); + + cef_render_handler_t *_struct = GetStruct(); + if (CEF_MEMBER_MISSING(_struct, on_over_scroll_fling_end)) + return; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Verify param: browser; type: refptr_diff + DCHECK(browser.get()); + if (!browser.get()) + return; + + // Execute + _struct->on_over_scroll_fling_end(_struct, CefBrowserCppToC::Wrap(browser)); +} + // CONSTRUCTOR - Do not edit by hand. CefRenderHandlerCToCpp::CefRenderHandlerCToCpp() {} @@ -641,17 +668,15 @@ CefRenderHandlerCToCpp::~CefRenderHandlerCToCpp() { } template <> -cef_render_handler_t* -CefCToCppRefCounted::UnwrapDerived(CefWrapperType type, - CefRenderHandler* c) { + CefRenderHandler *c) { NOTREACHED() << "Unexpected class type: " << type; return nullptr; } template <> -CefWrapperType CefCToCppRefCounted::kWrapperType = WT_RENDER_HANDLER; diff --git a/libcef_dll/ctocpp/render_handler_ctocpp.h b/libcef_dll/ctocpp/render_handler_ctocpp.h index b1468cb6e3cb401dfd13a58108a6629c2db56147..aeb7f6619ec7b3c8c1d983a3305954ce8520022a 100644 --- a/libcef_dll/ctocpp/render_handler_ctocpp.h +++ b/libcef_dll/ctocpp/render_handler_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c7471f14081b068e17d0ff3c049856df382c372a$ +// $hash=2b8942c35ec869f92ef2e111a9c4ffbc9064fbf8$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_RENDER_HANDLER_CTOCPP_H_ @@ -27,80 +27,69 @@ // Wrap a C structure with a C++ class. // This class may be instantiated and accessed DLL-side only. class CefRenderHandlerCToCpp - : public CefCToCppRefCounted { - public: +public: CefRenderHandlerCToCpp(); virtual ~CefRenderHandlerCToCpp(); // CefRenderHandler methods. CefRefPtr GetAccessibilityHandler() override; - bool GetRootScreenRect(CefRefPtr browser, CefRect& rect) override; - void GetViewRect(CefRefPtr browser, CefRect& rect) override; - bool GetScreenPoint(CefRefPtr browser, - int viewX, - int viewY, - int& screenX, - int& screenY) override; + bool GetRootScreenRect(CefRefPtr browser, CefRect &rect) override; + void GetViewRect(CefRefPtr browser, CefRect &rect) override; + bool GetScreenPoint(CefRefPtr browser, int viewX, int viewY, + int &screenX, int &screenY) override; bool GetScreenInfo(CefRefPtr browser, - CefScreenInfo& screen_info) override; + CefScreenInfo &screen_info) override; void OnPopupShow(CefRefPtr browser, bool show) override; - void OnPopupSize(CefRefPtr browser, const CefRect& rect) override; - void OnPaint(CefRefPtr browser, - PaintElementType type, - const RectList& dirtyRects, - const void* buffer, - int width, + void OnPopupSize(CefRefPtr browser, const CefRect &rect) override; + void OnPaint(CefRefPtr browser, PaintElementType type, + const RectList &dirtyRects, const void *buffer, int width, int height) override; - void OnAcceleratedPaint(CefRefPtr browser, - PaintElementType type, - const RectList& dirtyRects, - void* shared_handle) override; + void OnAcceleratedPaint(CefRefPtr browser, PaintElementType type, + const RectList &dirtyRects, + void *shared_handle) override; void GetTouchHandleSize(CefRefPtr browser, cef_horizontal_alignment_t orientation, - CefSize& size) override; + CefSize &size) override; void OnTouchHandleStateChanged(CefRefPtr browser, - const CefTouchHandleState& state) override; - void OnTouchSelectionChanged( - const CefTouchHandleState& insert_handle, - const CefTouchHandleState& start_selection_handle, - const CefTouchHandleState& end_selection_handle, - bool need_report) override; + const CefTouchHandleState &state) override; + void + OnTouchSelectionChanged(const CefTouchHandleState &insert_handle, + const CefTouchHandleState &start_selection_handle, + const CefTouchHandleState &end_selection_handle, + bool need_report) override; bool StartDragging(CefRefPtr browser, CefRefPtr drag_data, - DragOperationsMask allowed_ops, - int x, - int y) override; + DragOperationsMask allowed_ops, int x, int y) override; void UpdateDragCursor(CefRefPtr browser, DragOperation operation) override; - void OnScrollOffsetChanged(CefRefPtr browser, - double x, + void OnScrollOffsetChanged(CefRefPtr browser, double x, double y) override; - void OnRootLayerChanged(CefRefPtr browser, - int height, + void OnRootLayerChanged(CefRefPtr browser, int height, int width) override; void OnImeCompositionRangeChanged(CefRefPtr browser, - const CefRange& selected_range, - const RectList& character_bounds) override; + const CefRange &selected_range, + const RectList &character_bounds) override; void OnTextSelectionChanged(CefRefPtr browser, - const CefString& selected_text, - const CefRange& selected_range) override; - void OnSelectionChanged(CefRefPtr browser, - const CefString& text, - const CefRange& selected_range) override; + const CefString &selected_text, + const CefRange &selected_range) override; + void OnSelectionChanged(CefRefPtr browser, const CefString &text, + const CefRange &selected_range) override; void OnVirtualKeyboardRequested(CefRefPtr browser, TextInputMode input_mode, bool show_keyboard) override; void OnCursorUpdate(CefRefPtr browser, - const CefRect& rect) override; + const CefRect &rect) override; void OnCompleteSwapWithNewSize() override; void OnResizeNotWork() override; - void OnOverscroll(CefRefPtr browser, - const float x, + void OnOverscroll(CefRefPtr browser, const float x, const float y) override; void OnEditableChanged(CefRefPtr browser, bool is_editable_node) override; + void OnOverScrollFlingVelocity(CefRefPtr browser, const float x, + const float y, bool is_fling) override; + void OnOverScrollFlingEnd(CefRefPtr browser) override; }; -#endif // CEF_LIBCEF_DLL_CTOCPP_RENDER_HANDLER_CTOCPP_H_ +#endif // CEF_LIBCEF_DLL_CTOCPP_RENDER_HANDLER_CTOCPP_H_