bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pass the scroll offset to CefRenderHandler::OnScrollOffsetChanged (issue #1561). 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@2052 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2015-03-06 17:50:14 +00:00
parent a4c4246897
commit 36fd5e3ed0
6 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/capi/cef_render_handler_capi.h
View File

@ -159,7 +159,8 @@ typedef struct _cef_render_handler_t {
// Called when the scroll offset has changed. // Called when the scroll offset has changed.
/// ///
void (CEF_CALLBACK *on_scroll_offset_changed)( void (CEF_CALLBACK *on_scroll_offset_changed)(
struct _cef_render_handler_t* self, struct _cef_browser_t* browser); struct _cef_render_handler_t* self, struct _cef_browser_t* browser,
double x, double y);
} cef_render_handler_t; } cef_render_handler_t;

4
include/cef_render_handler.h
View File

@ -172,7 +172,9 @@ class CefRenderHandler : public virtual CefBase {
// Called when the scroll offset has changed. // Called when the scroll offset has changed.
/// ///
/*--cef()--*/ /*--cef()--*/
virtual void OnScrollOffsetChanged(CefRefPtr<CefBrowser> browser) {} virtual void OnScrollOffsetChanged(CefRefPtr<CefBrowser> browser,
double x,
double y) {}
}; };
#endif // CEF_INCLUDE_CEF_RENDER_HANDLER_H_ #endif // CEF_INCLUDE_CEF_RENDER_HANDLER_H_

7
libcef/browser/render_widget_host_view_osr.cc
View File

@ -1366,8 +1366,11 @@ void CefRenderWidgetHostViewOSR::OnScrollOffsetChanged() {
if (browser_impl_.get()) { if (browser_impl_.get()) {
CefRefPtr<CefRenderHandler> handler = CefRefPtr<CefRenderHandler> handler =
browser_impl_->client()->GetRenderHandler(); browser_impl_->client()->GetRenderHandler();
if (handler.get()) if (handler.get()) {
handler->OnScrollOffsetChanged(browser_impl_.get()); handler->OnScrollOffsetChanged(browser_impl_.get(),
last_scroll_offset_.x(),
last_scroll_offset_.y());
}
} }
is_scroll_offset_changed_pending_ = false; is_scroll_offset_changed_pending_ = false;
} }

7
libcef_dll/cpptoc/render_handler_cpptoc.cc
View File

@ -328,7 +328,8 @@ void CEF_CALLBACK render_handler_update_drag_cursor(
} }
void CEF_CALLBACK render_handler_on_scroll_offset_changed( void CEF_CALLBACK render_handler_on_scroll_offset_changed(
struct _cef_render_handler_t* self, cef_browser_t* browser) { struct _cef_render_handler_t* self, cef_browser_t* browser, double x,
double y) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self); DCHECK(self);
@ -341,7 +342,9 @@ void CEF_CALLBACK render_handler_on_scroll_offset_changed(
// Execute // Execute
CefRenderHandlerCppToC::Get(self)->OnScrollOffsetChanged( CefRenderHandlerCppToC::Get(self)->OnScrollOffsetChanged(
CefBrowserCToCpp::Wrap(browser)); CefBrowserCToCpp::Wrap(browser),
x,
y);
} }

6
libcef_dll/ctocpp/render_handler_ctocpp.cc
View File

@ -254,7 +254,7 @@ void CefRenderHandlerCToCpp::UpdateDragCursor(CefRefPtr<CefBrowser> browser,
} }
void CefRenderHandlerCToCpp::OnScrollOffsetChanged( void CefRenderHandlerCToCpp::OnScrollOffsetChanged(
CefRefPtr<CefBrowser> browser) { CefRefPtr<CefBrowser> browser, double x, double y) {
if (CEF_MEMBER_MISSING(struct_, on_scroll_offset_changed)) if (CEF_MEMBER_MISSING(struct_, on_scroll_offset_changed))
return; return;
@ -267,7 +267,9 @@ void CefRenderHandlerCToCpp::OnScrollOffsetChanged(
// Execute // Execute
struct_->on_scroll_offset_changed(struct_, struct_->on_scroll_offset_changed(struct_,
CefBrowserCppToC::Wrap(browser)); CefBrowserCppToC::Wrap(browser),
x,
y);
} }

3
libcef_dll/ctocpp/render_handler_ctocpp.h
View File

@ -51,7 +51,8 @@ class CefRenderHandlerCToCpp
int y) override; int y) override;
void UpdateDragCursor(CefRefPtr<CefBrowser> browser, void UpdateDragCursor(CefRefPtr<CefBrowser> browser,
DragOperation operation) override; DragOperation operation) override;
void OnScrollOffsetChanged(CefRefPtr<CefBrowser> browser) override; void OnScrollOffsetChanged(CefRefPtr<CefBrowser> browser, double x,
double y) override;
}; };
#endif // BUILDING_CEF_SHARED #endif // BUILDING_CEF_SHARED