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

Merge revision 1007 changes: 

- Allow empty |mimeType| argument to GetDownloadHandler  (issue #405).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1364@1008 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2013-01-17 18:48:17 +00:00
parent 08f7a4bcc2
commit 6990820200
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cef1/include/cef_request_handler.h
View File

@ -132,7 +132,7 @@ class CefRequestHandler : public virtual CefBase {
// CefDownloadHandler instance that will recieve the file contents. Return // CefDownloadHandler instance that will recieve the file contents. Return
// true to download the file or false to cancel the file download. // true to download the file or false to cancel the file download.
/// ///
/*--cef()--*/ /*--cef(optional_param=mimeType)--*/
virtual bool GetDownloadHandler(CefRefPtr<CefBrowser> browser, virtual bool GetDownloadHandler(CefRefPtr<CefBrowser> browser,
const CefString& mimeType, const CefString& mimeType,
const CefString& fileName, const CefString& fileName,

5
cef1/libcef_dll/cpptoc/request_handler_cpptoc.cc
View File

@ -254,10 +254,6 @@ int CEF_CALLBACK request_handler_get_download_handler(
DCHECK(browser); DCHECK(browser);
if (!browser) if (!browser)
return 0; return 0;
// Verify param: mimeType; type: string_byref_const
DCHECK(mimeType);
if (!mimeType)
return 0;
// Verify param: fileName; type: string_byref_const // Verify param: fileName; type: string_byref_const
DCHECK(fileName); DCHECK(fileName);
if (!fileName) if (!fileName)
@ -266,6 +262,7 @@ int CEF_CALLBACK request_handler_get_download_handler(
DCHECK(handler); DCHECK(handler);
if (!handler) if (!handler)
return 0; return 0;
// Unverified params: mimeType
// Translate param: handler; type: refptr_same_byref // Translate param: handler; type: refptr_same_byref
CefRefPtr<CefDownloadHandler> handlerPtr; CefRefPtr<CefDownloadHandler> handlerPtr;

5
cef1/libcef_dll/ctocpp/request_handler_ctocpp.cc
View File

@ -217,14 +217,11 @@ bool CefRequestHandlerCToCpp::GetDownloadHandler(CefRefPtr<CefBrowser> browser,
DCHECK(browser.get()); DCHECK(browser.get());
if (!browser.get()) if (!browser.get())
return false; return false;
// Verify param: mimeType; type: string_byref_const
DCHECK(!mimeType.empty());
if (mimeType.empty())
return false;
// Verify param: fileName; type: string_byref_const // Verify param: fileName; type: string_byref_const
DCHECK(!fileName.empty()); DCHECK(!fileName.empty());
if (fileName.empty()) if (fileName.empty())
return false; return false;
// Unverified params: mimeType
// Translate param: handler; type: refptr_same_byref // Translate param: handler; type: refptr_same_byref
cef_download_handler_t* handlerStruct = NULL; cef_download_handler_t* handlerStruct = NULL;