Clarify expectations for CefRenderHandler::GetViewRect (issue #1910)

This commit is contained in:
Marshall Greenblatt
2018-09-25 15:40:02 +02:00
parent 64cd460c73
commit 09afa3a843
17 changed files with 100 additions and 99 deletions

View File

@@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=98625368df8daaeca9df1791f1867828a6271a89$
// $hash=6cf6466ab2a1b87a1b57b5994aab64992b9f12dd$
//
#include "libcef_dll/cpptoc/render_handler_cpptoc.h"
@@ -70,7 +70,7 @@ render_handler_get_root_screen_rect(struct _cef_render_handler_t* self,
return _retval;
}
int CEF_CALLBACK
void CEF_CALLBACK
render_handler_get_view_rect(struct _cef_render_handler_t* self,
cef_browser_t* browser,
cef_rect_t* rect) {
@@ -78,29 +78,26 @@ render_handler_get_view_rect(struct _cef_render_handler_t* self,
DCHECK(self);
if (!self)
return 0;
return;
// Verify param: browser; type: refptr_diff
DCHECK(browser);
if (!browser)
return 0;
return;
// Verify param: rect; type: simple_byref
DCHECK(rect);
if (!rect)
return 0;
return;
// Translate param: rect; type: simple_byref
CefRect rectVal = rect ? *rect : CefRect();
// Execute
bool _retval = CefRenderHandlerCppToC::Get(self)->GetViewRect(
CefRenderHandlerCppToC::Get(self)->GetViewRect(
CefBrowserCToCpp::Wrap(browser), rectVal);
// Restore param: rect; type: simple_byref
if (rect)
*rect = rectVal;
// Return type: bool
return _retval;
}
int CEF_CALLBACK

View File

@@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=bd2800111c1f3f3a5c6107d0454a2b5fe67067b6$
// $hash=db89496c825cdc7fe1eaa4b7822d8492ae3a3f23$
//
#include "libcef_dll/ctocpp/render_handler_ctocpp.h"
@@ -59,25 +59,21 @@ bool CefRenderHandlerCToCpp::GetRootScreenRect(CefRefPtr<CefBrowser> browser,
}
NO_SANITIZE("cfi-icall")
bool CefRenderHandlerCToCpp::GetViewRect(CefRefPtr<CefBrowser> browser,
void CefRenderHandlerCToCpp::GetViewRect(CefRefPtr<CefBrowser> browser,
CefRect& rect) {
cef_render_handler_t* _struct = GetStruct();
if (CEF_MEMBER_MISSING(_struct, get_view_rect))
return false;
return;
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Verify param: browser; type: refptr_diff
DCHECK(browser.get());
if (!browser.get())
return false;
return;
// Execute
int _retval =
_struct->get_view_rect(_struct, CefBrowserCppToC::Wrap(browser), &rect);
// Return type: bool
return _retval ? true : false;
_struct->get_view_rect(_struct, CefBrowserCppToC::Wrap(browser), &rect);
}
NO_SANITIZE("cfi-icall")

View File

@@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=9e2bcb61512095fba2fca928f4696fbb39d9d3b1$
// $hash=46dd8560076264a776129a02ba11e2c2f56bf209$
//
#ifndef CEF_LIBCEF_DLL_CTOCPP_RENDER_HANDLER_CTOCPP_H_
@@ -36,7 +36,7 @@ class CefRenderHandlerCToCpp
// CefRenderHandler methods.
CefRefPtr<CefAccessibilityHandler> GetAccessibilityHandler() override;
bool GetRootScreenRect(CefRefPtr<CefBrowser> browser, CefRect& rect) override;
bool GetViewRect(CefRefPtr<CefBrowser> browser, CefRect& rect) override;
void GetViewRect(CefRefPtr<CefBrowser> browser, CefRect& rect) override;
bool GetScreenPoint(CefRefPtr<CefBrowser> browser,
int viewX,
int viewY,