bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Linux: Don't pass NULL CefBrowser to PrintHandler::GetPdfPaperSize (issue #2199)

Browse Source
This commit is contained in:
Marshall Greenblatt
2017-06-17 12:46:18 +03:00
parent dce5d5c28f
commit 70a01250e1
8 changed files with 27 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libcef_dll/ctocpp/print_handler_ctocpp.cc
View File

@@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=80679bfc067e7564eadb691876081c4176b04c4f$
// $hash=81ba68d1a06a25947aa4533d2c50fff945c54fd0$
//
#include "libcef_dll/ctocpp/print_handler_ctocpp.h"
@@ -142,22 +142,16 @@ void CefPrintHandlerCToCpp::OnPrintReset(CefRefPtr<CefBrowser> browser) {
_struct->on_print_reset(_struct, CefBrowserCppToC::Wrap(browser));
}
CefSize CefPrintHandlerCToCpp::GetPdfPaperSize(CefRefPtr<CefBrowser> browser,
int device_units_per_inch) {
CefSize CefPrintHandlerCToCpp::GetPdfPaperSize(int device_units_per_inch) {
cef_print_handler_t* _struct = GetStruct();
if (CEF_MEMBER_MISSING(_struct, get_pdf_paper_size))
return CefSize();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Verify param: browser; type: refptr_diff
DCHECK(browser.get());
if (!browser.get())
return CefSize();
// Execute
cef_size_t _retval = _struct->get_pdf_paper_size(
_struct, CefBrowserCppToC::Wrap(browser), device_units_per_inch);
cef_size_t _retval =
_struct->get_pdf_paper_size(_struct, device_units_per_inch);
// Return type: simple
return _retval;

5
libcef_dll/ctocpp/print_handler_ctocpp.h
View File

@@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=1a2adb6e9cbbe96253cc997312e60ca330dc4de6$
// $hash=4a628ee393964285a7ad6f2a6c64cff8a88c3b20$
//
#ifndef CEF_LIBCEF_DLL_CTOCPP_PRINT_HANDLER_CTOCPP_H_
@@ -45,8 +45,7 @@ class CefPrintHandlerCToCpp : public CefCToCppRefCounted<CefPrintHandlerCToCpp,
const CefString& pdf_file_path,
CefRefPtr<CefPrintJobCallback> callback) override;
void OnPrintReset(CefRefPtr<CefBrowser> browser) override;
CefSize GetPdfPaperSize(CefRefPtr<CefBrowser> browser,
int device_units_per_inch) override;
CefSize GetPdfPaperSize(int device_units_per_inch) override;
};
#endif // CEF_LIBCEF_DLL_CTOCPP_PRINT_HANDLER_CTOCPP_H_