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

Fix Linux compile errors. 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@150 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2010-12-07 01:30:26 +00:00
parent e826c9b1a0
commit 871a8a7770
54 changed files with 84 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cef.gyp
View File

@ -153,7 +153,6 @@
[ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', { [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
'sources': [ 'sources': [
'tests/cefclient/cefclient_gtk.cpp', 'tests/cefclient/cefclient_gtk.cpp',
'tests/cefclient/string_util_gtk.cpp',
], ],
}], }],
], ],

2
include/cef_capi.h
View File

@ -710,7 +710,7 @@ typedef struct _cef_post_data_element_t
} cef_post_data_element_t; } cef_post_data_element_t;
// Create a new cef_post_data_tElement object. // Create a new cef_post_data_element_t object.
CEF_EXPORT cef_post_data_element_t* cef_post_data_element_create(); CEF_EXPORT cef_post_data_element_t* cef_post_data_element_create();

2
include/cef_nplugin.h
View File

@ -74,7 +74,9 @@ struct CefPluginInfo {
std::vector<CefPluginMimeType> mime_types; std::vector<CefPluginMimeType> mime_types;
// Entry point function pointers. // Entry point function pointers.
#if !defined(OS_POSIX) || defined(OS_MACOSX)
NP_GetEntryPointsFunc np_getentrypoints; NP_GetEntryPointsFunc np_getentrypoints;
#endif
NP_InitializeFunc np_initialize; NP_InitializeFunc np_initialize;
NP_ShutdownFunc np_shutdown; NP_ShutdownFunc np_shutdown;
}; };

2
include/cef_nplugin_capi.h
View File

@ -74,7 +74,9 @@ typedef struct _cef_plugin_info_t {
cef_string_t type_descriptions; cef_string_t type_descriptions;
// Entry point function pointers. // Entry point function pointers.
#if !defined(OS_POSIX) || defined(OS_MACOSX)
NP_GetEntryPointsFunc np_getentrypoints; NP_GetEntryPointsFunc np_getentrypoints;
#endif
NP_InitializeFunc np_initialize; NP_InitializeFunc np_initialize;
NP_ShutdownFunc np_shutdown; NP_ShutdownFunc np_shutdown;
} cef_plugin_info_t; } cef_plugin_info_t;

1
include/cef_string_wrappers.h
View File

@ -34,6 +34,7 @@
#ifdef BUILDING_CEF_SHARED #ifdef BUILDING_CEF_SHARED
#include "base/string16.h" #include "base/string16.h"
#endif #endif
#include <memory.h>
#include <string> #include <string>
// Traits implementation for wide character strings. // Traits implementation for wide character strings.

2
libcef/browser_webkit_glue.cc
View File

@ -5,7 +5,7 @@
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "third_party/webkit/webcore/config.h" #include "third_party/WebKit/WebCore/config.h"
MSVC_PUSH_WARNING_LEVEL(0); MSVC_PUSH_WARNING_LEVEL(0);
#include "MemoryCache.h" #include "MemoryCache.h"
#include "TextEncoding.h" #include "TextEncoding.h"

2
libcef/cef_context.cc
View File

@ -91,7 +91,9 @@ static void UIT_RegisterPlugin(struct CefPluginInfo* plugin_info)
} }
} }
#if !defined(OS_POSIX) || defined(OS_MACOSX)
info.entry_points.np_getentrypoints = plugin_info->np_getentrypoints; info.entry_points.np_getentrypoints = plugin_info->np_getentrypoints;
#endif
info.entry_points.np_initialize = plugin_info->np_initialize; info.entry_points.np_initialize = plugin_info->np_initialize;
info.entry_points.np_shutdown = plugin_info->np_shutdown; info.entry_points.np_shutdown = plugin_info->np_shutdown;

1
libcef/stream_impl.cc
View File

@ -4,6 +4,7 @@
#include "stream_impl.h" #include "stream_impl.h"
#include "base/logging.h" #include "base/logging.h"
#include <stdlib.h>
// Static functions // Static functions

3
libcef_dll/cpptoc/browser_cpptoc.cc
View File

@ -264,6 +264,7 @@ CefBrowserCppToC::CefBrowserCppToC(CefBrowser* cls)
} }
#ifdef _DEBUG #ifdef _DEBUG
long CefCppToC<CefBrowserCppToC, CefBrowser, cef_browser_t>::DebugObjCt = 0; template<> long CefCppToC<CefBrowserCppToC, CefBrowser,
cef_browser_t>::DebugObjCt = 0;
#endif #endif

2
libcef_dll/cpptoc/download_handler_cpptoc.cc
View File

@ -47,7 +47,7 @@ CefDownloadHandlerCppToC::CefDownloadHandlerCppToC(CefDownloadHandler* cls)
} }
#ifdef _DEBUG #ifdef _DEBUG
long CefCppToC<CefDownloadHandlerCppToC, CefDownloadHandler, template<> long CefCppToC<CefDownloadHandlerCppToC, CefDownloadHandler,
cef_download_handler_t>::DebugObjCt = 0; cef_download_handler_t>::DebugObjCt = 0;
#endif #endif

3
libcef_dll/cpptoc/frame_cpptoc.cc
View File

@ -240,6 +240,7 @@ CefFrameCppToC::CefFrameCppToC(CefFrame* cls)
} }
#ifdef _DEBUG #ifdef _DEBUG
long CefCppToC<CefFrameCppToC, CefFrame, cef_frame_t>::DebugObjCt = 0; template<> long CefCppToC<CefFrameCppToC, CefFrame, cef_frame_t>::DebugObjCt =
0;
#endif #endif

3
libcef_dll/cpptoc/handler_cpptoc.cc
View File

@ -532,6 +532,7 @@ CefHandlerCppToC::CefHandlerCppToC(CefHandler* cls)
} }
#ifdef _DEBUG #ifdef _DEBUG
long CefCppToC<CefHandlerCppToC, CefHandler, cef_handler_t>::DebugObjCt = 0; template<> long CefCppToC<CefHandlerCppToC, CefHandler,
cef_handler_t>::DebugObjCt = 0;
#endif #endif

3
libcef_dll/cpptoc/post_data_cpptoc.cc
View File

@ -101,6 +101,7 @@ CefPostDataCppToC::CefPostDataCppToC(CefPostData* cls)
} }
#ifdef _DEBUG #ifdef _DEBUG
long CefCppToC<CefPostDataCppToC, CefPostData, cef_post_data_t>::DebugObjCt = 0; template<> long CefCppToC<CefPostDataCppToC, CefPostData,
cef_post_data_t>::DebugObjCt = 0;
#endif #endif

2
libcef_dll/cpptoc/post_data_element_cpptoc.cc
View File

@ -115,7 +115,7 @@ CefPostDataElementCppToC::CefPostDataElementCppToC(CefPostDataElement* cls)
} }
#ifdef _DEBUG #ifdef _DEBUG
long CefCppToC<CefPostDataElementCppToC, CefPostDataElement, template<> long CefCppToC<CefPostDataElementCppToC, CefPostDataElement,
cef_post_data_element_t>::DebugObjCt = 0; cef_post_data_element_t>::DebugObjCt = 0;
#endif #endif

2
libcef_dll/cpptoc/read_handler_cpptoc.cc
View File

@ -66,7 +66,7 @@ CefReadHandlerCppToC::CefReadHandlerCppToC(CefReadHandler* cls)
} }
#ifdef _DEBUG #ifdef _DEBUG
long CefCppToC<CefReadHandlerCppToC, CefReadHandler, template<> long CefCppToC<CefReadHandlerCppToC, CefReadHandler,
cef_read_handler_t>::DebugObjCt = 0; cef_read_handler_t>::DebugObjCt = 0;
#endif #endif

3
libcef_dll/cpptoc/request_cpptoc.cc
View File

@ -162,6 +162,7 @@ CefRequestCppToC::CefRequestCppToC(CefRequest* cls)
} }
#ifdef _DEBUG #ifdef _DEBUG
long CefCppToC<CefRequestCppToC, CefRequest, cef_request_t>::DebugObjCt = 0; template<> long CefCppToC<CefRequestCppToC, CefRequest,
cef_request_t>::DebugObjCt = 0;
#endif #endif

2
libcef_dll/cpptoc/scheme_handler_cpptoc.cc
View File

@ -70,7 +70,7 @@ CefSchemeHandlerCppToC::CefSchemeHandlerCppToC(CefSchemeHandler* cls)
} }
#ifdef _DEBUG #ifdef _DEBUG
long CefCppToC<CefSchemeHandlerCppToC, CefSchemeHandler, template<> long CefCppToC<CefSchemeHandlerCppToC, CefSchemeHandler,
cef_scheme_handler_t>::DebugObjCt = 0; cef_scheme_handler_t>::DebugObjCt = 0;
#endif #endif

4
libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc
View File

@ -37,7 +37,7 @@ CefSchemeHandlerFactoryCppToC::CefSchemeHandlerFactoryCppToC(
} }
#ifdef _DEBUG #ifdef _DEBUG
long CefCppToC<CefSchemeHandlerFactoryCppToC, CefSchemeHandlerFactory, template<> long CefCppToC<CefSchemeHandlerFactoryCppToC,
cef_scheme_handler_factory_t>::DebugObjCt = 0; CefSchemeHandlerFactory, cef_scheme_handler_factory_t>::DebugObjCt = 0;
#endif #endif

2
libcef_dll/cpptoc/stream_reader_cpptoc.cc
View File

@ -100,7 +100,7 @@ CefStreamReaderCppToC::CefStreamReaderCppToC(CefStreamReader* cls)
} }
#ifdef _DEBUG #ifdef _DEBUG
long CefCppToC<CefStreamReaderCppToC, CefStreamReader, template<> long CefCppToC<CefStreamReaderCppToC, CefStreamReader,
cef_stream_reader_t>::DebugObjCt = 0; cef_stream_reader_t>::DebugObjCt = 0;
#endif #endif

2
libcef_dll/cpptoc/stream_writer_cpptoc.cc
View File

@ -99,7 +99,7 @@ CefStreamWriterCppToC::CefStreamWriterCppToC(CefStreamWriter* cls)
} }
#ifdef _DEBUG #ifdef _DEBUG
long CefCppToC<CefStreamWriterCppToC, CefStreamWriter, template<> long CefCppToC<CefStreamWriterCppToC, CefStreamWriter,
cef_stream_writer_t>::DebugObjCt = 0; cef_stream_writer_t>::DebugObjCt = 0;
#endif #endif

2
libcef_dll/cpptoc/task_cpptoc.cc
View File

@ -35,6 +35,6 @@ CefTaskCppToC::CefTaskCppToC(CefTask* cls)
} }
#ifdef _DEBUG #ifdef _DEBUG
long CefCppToC<CefTaskCppToC, CefTask, cef_task_t>::DebugObjCt = 0; template<> long CefCppToC<CefTaskCppToC, CefTask, cef_task_t>::DebugObjCt = 0;
#endif #endif

4
libcef_dll/cpptoc/v8handler_cpptoc.cc
View File

@ -56,7 +56,7 @@ CefV8HandlerCppToC::CefV8HandlerCppToC(CefV8Handler* cls)
} }
#ifdef _DEBUG #ifdef _DEBUG
long CefCppToC<CefV8HandlerCppToC, CefV8Handler, cef_v8handler_t>::DebugObjCt = template<> long CefCppToC<CefV8HandlerCppToC, CefV8Handler,
0; cef_v8handler_t>::DebugObjCt = 0;
#endif #endif

3
libcef_dll/cpptoc/v8value_cpptoc.cc
View File

@ -430,6 +430,7 @@ CefV8ValueCppToC::CefV8ValueCppToC(CefV8Value* cls)
} }
#ifdef _DEBUG #ifdef _DEBUG
long CefCppToC<CefV8ValueCppToC, CefV8Value, cef_v8value_t>::DebugObjCt = 0; template<> long CefCppToC<CefV8ValueCppToC, CefV8Value,
cef_v8value_t>::DebugObjCt = 0;
#endif #endif

2
libcef_dll/cpptoc/write_handler_cpptoc.cc
View File

@ -67,7 +67,7 @@ CefWriteHandlerCppToC::CefWriteHandlerCppToC(CefWriteHandler* cls)
} }
#ifdef _DEBUG #ifdef _DEBUG
long CefCppToC<CefWriteHandlerCppToC, CefWriteHandler, template<> long CefCppToC<CefWriteHandlerCppToC, CefWriteHandler,
cef_write_handler_t>::DebugObjCt = 0; cef_write_handler_t>::DebugObjCt = 0;
#endif #endif

4
libcef_dll/cpptoc/xml_reader_cpptoc.cc
View File

@ -378,7 +378,7 @@ CefXmlReaderCppToC::CefXmlReaderCppToC(CefXmlReader* cls)
} }
#ifdef _DEBUG #ifdef _DEBUG
long CefCppToC<CefXmlReaderCppToC, CefXmlReader, cef_xml_reader_t>::DebugObjCt = template<> long CefCppToC<CefXmlReaderCppToC, CefXmlReader,
0; cef_xml_reader_t>::DebugObjCt = 0;
#endif #endif

4
libcef_dll/cpptoc/zip_reader_cpptoc.cc
View File

@ -166,7 +166,7 @@ CefZipReaderCppToC::CefZipReaderCppToC(CefZipReader* cls)
} }
#ifdef _DEBUG #ifdef _DEBUG
long CefCppToC<CefZipReaderCppToC, CefZipReader, cef_zip_reader_t>::DebugObjCt = template<> long CefCppToC<CefZipReaderCppToC, CefZipReader,
0; cef_zip_reader_t>::DebugObjCt = 0;
#endif #endif

3
libcef_dll/ctocpp/browser_ctocpp.cc
View File

@ -198,6 +198,7 @@ void CefBrowserCToCpp::StopFinding(bool clearSelection)
#ifdef _DEBUG #ifdef _DEBUG
long CefCToCpp<CefBrowserCToCpp, CefBrowser, cef_browser_t>::DebugObjCt = 0; template<> long CefCToCpp<CefBrowserCToCpp, CefBrowser,
cef_browser_t>::DebugObjCt = 0;
#endif #endif

2
libcef_dll/ctocpp/download_handler_ctocpp.cc
View File

@ -33,7 +33,7 @@ void CefDownloadHandlerCToCpp::Complete()
#ifdef _DEBUG #ifdef _DEBUG
long CefCToCpp<CefDownloadHandlerCToCpp, CefDownloadHandler, template<> long CefCToCpp<CefDownloadHandlerCToCpp, CefDownloadHandler,
cef_download_handler_t>::DebugObjCt = 0; cef_download_handler_t>::DebugObjCt = 0;
#endif #endif

3
libcef_dll/ctocpp/frame_ctocpp.cc
View File

@ -195,6 +195,7 @@ CefString CefFrameCToCpp::GetURL()
#ifdef _DEBUG #ifdef _DEBUG
long CefCToCpp<CefFrameCToCpp, CefFrame, cef_frame_t>::DebugObjCt = 0; template<> long CefCToCpp<CefFrameCToCpp, CefFrame, cef_frame_t>::DebugObjCt =
0;
#endif #endif

3
libcef_dll/ctocpp/handler_ctocpp.cc
View File

@ -367,6 +367,7 @@ CefHandler::RetVal CefHandlerCToCpp::HandleFindResult(
#ifdef _DEBUG #ifdef _DEBUG
long CefCToCpp<CefHandlerCToCpp, CefHandler, cef_handler_t>::DebugObjCt = 0; template<> long CefCToCpp<CefHandlerCToCpp, CefHandler,
cef_handler_t>::DebugObjCt = 0;
#endif #endif

3
libcef_dll/ctocpp/post_data_ctocpp.cc
View File

@ -80,6 +80,7 @@ void CefPostDataCToCpp::RemoveElements()
#ifdef _DEBUG #ifdef _DEBUG
long CefCToCpp<CefPostDataCToCpp, CefPostData, cef_post_data_t>::DebugObjCt = 0; template<> long CefCToCpp<CefPostDataCToCpp, CefPostData,
cef_post_data_t>::DebugObjCt = 0;
#endif #endif

2
libcef_dll/ctocpp/post_data_element_ctocpp.cc
View File

@ -87,7 +87,7 @@ size_t CefPostDataElementCToCpp::GetBytes(size_t size, void* bytes)
#ifdef _DEBUG #ifdef _DEBUG
long CefCToCpp<CefPostDataElementCToCpp, CefPostDataElement, template<> long CefCToCpp<CefPostDataElementCToCpp, CefPostDataElement,
cef_post_data_element_t>::DebugObjCt = 0; cef_post_data_element_t>::DebugObjCt = 0;
#endif #endif

2
libcef_dll/ctocpp/read_handler_ctocpp.cc
View File

@ -49,7 +49,7 @@ int CefReadHandlerCToCpp::Eof()
#ifdef _DEBUG #ifdef _DEBUG
long CefCToCpp<CefReadHandlerCToCpp, CefReadHandler, template<> long CefCToCpp<CefReadHandlerCToCpp, CefReadHandler,
cef_read_handler_t>::DebugObjCt = 0; cef_read_handler_t>::DebugObjCt = 0;
#endif #endif

3
libcef_dll/ctocpp/request_ctocpp.cc
View File

@ -149,6 +149,7 @@ void CefRequestCToCpp::Set(const CefString& url, const CefString& method,
#ifdef _DEBUG #ifdef _DEBUG
long CefCToCpp<CefRequestCToCpp, CefRequest, cef_request_t>::DebugObjCt = 0; template<> long CefCToCpp<CefRequestCToCpp, CefRequest,
cef_request_t>::DebugObjCt = 0;
#endif #endif

2
libcef_dll/ctocpp/scheme_handler_ctocpp.cc
View File

@ -46,7 +46,7 @@ bool CefSchemeHandlerCToCpp::ReadResponse(void* data_out, int bytes_to_read,
#ifdef _DEBUG #ifdef _DEBUG
long CefCToCpp<CefSchemeHandlerCToCpp, CefSchemeHandler, template<> long CefCToCpp<CefSchemeHandlerCToCpp, CefSchemeHandler,
cef_scheme_handler_t>::DebugObjCt = 0; cef_scheme_handler_t>::DebugObjCt = 0;
#endif #endif

4
libcef_dll/ctocpp/scheme_handler_factory_ctocpp.cc
View File

@ -28,7 +28,7 @@ CefRefPtr<CefSchemeHandler> CefSchemeHandlerFactoryCToCpp::Create()
#ifdef _DEBUG #ifdef _DEBUG
long CefCToCpp<CefSchemeHandlerFactoryCToCpp, CefSchemeHandlerFactory, template<> long CefCToCpp<CefSchemeHandlerFactoryCToCpp,
cef_scheme_handler_factory_t>::DebugObjCt = 0; CefSchemeHandlerFactory, cef_scheme_handler_factory_t>::DebugObjCt = 0;
#endif #endif

2
libcef_dll/ctocpp/stream_reader_ctocpp.cc
View File

@ -82,7 +82,7 @@ int CefStreamReaderCToCpp::Eof()
#ifdef _DEBUG #ifdef _DEBUG
long CefCToCpp<CefStreamReaderCToCpp, CefStreamReader, template<> long CefCToCpp<CefStreamReaderCToCpp, CefStreamReader,
cef_stream_reader_t>::DebugObjCt = 0; cef_stream_reader_t>::DebugObjCt = 0;
#endif #endif

2
libcef_dll/ctocpp/stream_writer_ctocpp.cc
View File

@ -82,7 +82,7 @@ int CefStreamWriterCToCpp::Flush()
#ifdef _DEBUG #ifdef _DEBUG
long CefCToCpp<CefStreamWriterCToCpp, CefStreamWriter, template<> long CefCToCpp<CefStreamWriterCToCpp, CefStreamWriter,
cef_stream_writer_t>::DebugObjCt = 0; cef_stream_writer_t>::DebugObjCt = 0;
#endif #endif

2
libcef_dll/ctocpp/task_ctocpp.cc
View File

@ -25,6 +25,6 @@ void CefTaskCToCpp::Execute(CefThreadId threadId)
#ifdef _DEBUG #ifdef _DEBUG
long CefCToCpp<CefTaskCToCpp, CefTask, cef_task_t>::DebugObjCt = 0; template<> long CefCToCpp<CefTaskCToCpp, CefTask, cef_task_t>::DebugObjCt = 0;
#endif #endif

4
libcef_dll/ctocpp/v8handler_ctocpp.cc
View File

@ -47,7 +47,7 @@ bool CefV8HandlerCToCpp::Execute(const CefString& name,
#ifdef _DEBUG #ifdef _DEBUG
long CefCToCpp<CefV8HandlerCToCpp, CefV8Handler, cef_v8handler_t>::DebugObjCt = template<> long CefCToCpp<CefV8HandlerCToCpp, CefV8Handler,
0; cef_v8handler_t>::DebugObjCt = 0;
#endif #endif

3
libcef_dll/ctocpp/v8value_ctocpp.cc
View File

@ -369,6 +369,7 @@ bool CefV8ValueCToCpp::ExecuteFunction(CefRefPtr<CefV8Value> object,
#ifdef _DEBUG #ifdef _DEBUG
long CefCToCpp<CefV8ValueCToCpp, CefV8Value, cef_v8value_t>::DebugObjCt = 0; template<> long CefCToCpp<CefV8ValueCToCpp, CefV8Value,
cef_v8value_t>::DebugObjCt = 0;
#endif #endif

2
libcef_dll/ctocpp/write_handler_ctocpp.cc
View File

@ -49,7 +49,7 @@ int CefWriteHandlerCToCpp::Flush()
#ifdef _DEBUG #ifdef _DEBUG
long CefCToCpp<CefWriteHandlerCToCpp, CefWriteHandler, template<> long CefCToCpp<CefWriteHandlerCToCpp, CefWriteHandler,
cef_write_handler_t>::DebugObjCt = 0; cef_write_handler_t>::DebugObjCt = 0;
#endif #endif

4
libcef_dll/ctocpp/xml_reader_ctocpp.cc
View File

@ -308,7 +308,7 @@ bool CefXmlReaderCToCpp::MoveToCarryingElement()
#ifdef _DEBUG #ifdef _DEBUG
long CefCToCpp<CefXmlReaderCToCpp, CefXmlReader, cef_xml_reader_t>::DebugObjCt = template<> long CefCToCpp<CefXmlReaderCToCpp, CefXmlReader,
0; cef_xml_reader_t>::DebugObjCt = 0;
#endif #endif

4
libcef_dll/ctocpp/zip_reader_ctocpp.cc
View File

@ -131,7 +131,7 @@ bool CefZipReaderCToCpp::Eof()
#ifdef _DEBUG #ifdef _DEBUG
long CefCToCpp<CefZipReaderCToCpp, CefZipReader, cef_zip_reader_t>::DebugObjCt = template<> long CefCToCpp<CefZipReaderCToCpp, CefZipReader,
0; cef_zip_reader_t>::DebugObjCt = 0;
#endif #endif

2
libcef_dll/libcef_dll.cc
View File

@ -136,7 +136,9 @@ CEF_EXPORT int cef_register_plugin(const cef_plugin_info_t* plugin_info)
pluginInfo.mime_types.push_back(mimeType); pluginInfo.mime_types.push_back(mimeType);
} }
#if !defined(OS_POSIX) || defined(OS_MACOSX)
pluginInfo.np_getentrypoints = plugin_info->np_getentrypoints; pluginInfo.np_getentrypoints = plugin_info->np_getentrypoints;
#endif
pluginInfo.np_initialize = plugin_info->np_initialize; pluginInfo.np_initialize = plugin_info->np_initialize;
pluginInfo.np_shutdown = plugin_info->np_shutdown; pluginInfo.np_shutdown = plugin_info->np_shutdown;

4
libcef_dll/wrapper/cef_zip_archive.cc
View File

@ -6,6 +6,10 @@
#include "libcef_dll/cef_logging.h" #include "libcef_dll/cef_logging.h"
#include <algorithm> #include <algorithm>
#if defined(__linux__)
#include <wctype.h>
#endif
namespace { namespace {
class CefZipFile : public CefThreadSafeBase<CefZipArchive::File> class CefZipFile : public CefThreadSafeBase<CefZipArchive::File>

2
libcef_dll/wrapper/libcef_dll_wrapper.cc
View File

@ -116,7 +116,9 @@ bool CefRegisterPlugin(const struct CefPluginInfo& plugin_info)
cef_string_from_utf8(typeDescriptions.c_str(), typeDescriptions.length(), cef_string_from_utf8(typeDescriptions.c_str(), typeDescriptions.length(),
&pluginInfo.type_descriptions); &pluginInfo.type_descriptions);
#if !defined(OS_POSIX) || defined(OS_MACOSX)
pluginInfo.np_getentrypoints = plugin_info.np_getentrypoints; pluginInfo.np_getentrypoints = plugin_info.np_getentrypoints;
#endif
pluginInfo.np_initialize = plugin_info.np_initialize; pluginInfo.np_initialize = plugin_info.np_initialize;
pluginInfo.np_shutdown = plugin_info.np_shutdown; pluginInfo.np_shutdown = plugin_info.np_shutdown;

1
tests/cefclient/cefclient.cpp
View File

@ -10,6 +10,7 @@
#include "string_util.h" #include "string_util.h"
#include "util.h" #include "util.h"
#include <sstream> #include <sstream>
#include <stdio.h>
#include <string> #include <string>

1
tests/cefclient/download_handler.cpp
View File

@ -5,6 +5,7 @@
#include "download_handler.h" #include "download_handler.h"
#include "util.h" #include "util.h"
#include <sstream> #include <sstream>
#include <stdio.h>
#include <vector> #include <vector>
#ifdef _WIN32 #ifdef _WIN32

2
tools/make_cpptoc_header.py
View File

@ -73,7 +73,7 @@ def make_cpptoc_header(header, clsname):
def write_cpptoc_header(header, clsname, dir, backup): def write_cpptoc_header(header, clsname, dir, backup):
file = dir+'\\'+get_capi_name(clsname[3:], False)+'_cpptoc.h' file = dir+os.sep+get_capi_name(clsname[3:], False)+'_cpptoc.h'
if file_exists(file): if file_exists(file):
oldcontents = read_file(file) oldcontents = read_file(file)

4
tools/make_cpptoc_impl.py
View File

@ -134,7 +134,7 @@ def make_cpptoc_impl(header, clsname, impl):
const += '}\n\n'+ \ const += '}\n\n'+ \
'#ifdef _DEBUG\n'+ \ '#ifdef _DEBUG\n'+ \
'long CefCppToC<'+clsname+'CppToC, '+clsname+', '+capiname+'>::DebugObjCt = 0;\n'+ \ 'template<> long CefCppToC<'+clsname+'CppToC, '+clsname+', '+capiname+'>::DebugObjCt = 0;\n'+ \
'#endif\n' '#endif\n'
result += wrap_code(const) result += wrap_code(const)
@ -142,7 +142,7 @@ def make_cpptoc_impl(header, clsname, impl):
def write_cpptoc_impl(header, clsname, dir, backup): def write_cpptoc_impl(header, clsname, dir, backup):
file = dir+'\\'+get_capi_name(clsname[3:], False)+'_cpptoc.cc' file = dir+os.sep+get_capi_name(clsname[3:], False)+'_cpptoc.cc'
if file_exists(file): if file_exists(file):
oldcontents = read_file(file) oldcontents = read_file(file)

2
tools/make_ctocpp_header.py
View File

@ -81,7 +81,7 @@ def make_ctocpp_header(header, clsname):
def write_ctocpp_header(header, clsname, dir, backup): def write_ctocpp_header(header, clsname, dir, backup):
file = dir+'\\'+get_capi_name(clsname[3:], False)+'_ctocpp.h' file = dir+os.sep+get_capi_name(clsname[3:], False)+'_ctocpp.h'
if file_exists(file): if file_exists(file):
oldcontents = read_file(file) oldcontents = read_file(file)

4
tools/make_ctocpp_impl.py
View File

@ -121,14 +121,14 @@ def make_ctocpp_impl(header, clsname, impl):
result += includes+'\n'+resultingimpl+'\n' result += includes+'\n'+resultingimpl+'\n'
result += wrap_code('#ifdef _DEBUG\n'+ \ result += wrap_code('#ifdef _DEBUG\n'+ \
'long CefCToCpp<'+clsname+'CToCpp, '+clsname+', '+capiname+'>::DebugObjCt = 0;\n'+ \ 'template<> long CefCToCpp<'+clsname+'CToCpp, '+clsname+', '+capiname+'>::DebugObjCt = 0;\n'+ \
'#endif\n') '#endif\n')
return result return result
def write_ctocpp_impl(header, clsname, dir, backup): def write_ctocpp_impl(header, clsname, dir, backup):
file = dir+'\\'+get_capi_name(clsname[3:], False)+'_ctocpp.cc' file = dir+os.sep+get_capi_name(clsname[3:], False)+'_ctocpp.cc'
if file_exists(file): if file_exists(file):
oldcontents = read_file(file) oldcontents = read_file(file)

2
tools/translator.sh Executable file
View File

@ -0,0 +1,2 @@
#!/bin/sh
python translator.py --cpp-header ../include/cef.h --capi-header ../include/cef_capi.h --cpptoc-dir ../libcef_dll/cpptoc --ctocpp-dir ../libcef_dll/ctocpp