diff --git a/Gruntfile.js b/Gruntfile.js index 61b57d255..0473fca83 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -40,7 +40,7 @@ module.exports = function (grunt) { if (platform === "mac") { cef_version = "3.2704.1434"; } else if (platform === "linux") { - cef_version = "3.2785.1487"; + cef_version = "3.3683.1920.g9f41a27"; } grunt.initConfig({ @@ -253,6 +253,10 @@ module.exports = function (grunt) { "natives_blob.bin", "snapshot_blob.bin", "chrome-sandbox", + "libEGL.so", + "libGLESv2.so", + "swiftshader/**", + "v8_context_snapshot.bin", ], "dest" : "<%= build.staging %>" }, diff --git a/appshell.gyp b/appshell.gyp index 366557118..f7f2ead05 100755 --- a/appshell.gyp +++ b/appshell.gyp @@ -395,6 +395,10 @@ '$(BUILDTYPE)/libcef.so', '$(BUILDTYPE)/natives_blob.bin', '$(BUILDTYPE)/snapshot_blob.bin', + '$(BUILDTYPE)/libEGL.so', + '$(BUILDTYPE)/libGLESv2.so', + '$(BUILDTYPE)/swiftshader', + '$(BUILDTYPE)/v8_context_snapshot.bin', ], }, { @@ -444,6 +448,7 @@ 'msvs_guid': 'A9D6DC71-C0DC-4549-AEA0-3B15B44E86A9', 'defines': [ 'USING_CEF_SHARED', + 'WRAPPING_CEF_SHARED', ], 'configurations': { 'Common_Base': { @@ -459,6 +464,7 @@ '<@(includes_common)', '<@(includes_capi)', '<@(includes_wrapper)', + '<@(libcef_dll_wrapper_sources_base)', '<@(libcef_dll_wrapper_sources_common)', ], 'xcode_settings': { @@ -628,4 +634,5 @@ }, }], ], -} \ No newline at end of file +} + diff --git a/appshell/appshell_extension_handler.h b/appshell/appshell_extension_handler.h index 588f42bbf..48138d3bf 100644 --- a/appshell/appshell_extension_handler.h +++ b/appshell/appshell_extension_handler.h @@ -157,7 +157,7 @@ class AppShellExtensionHandler : public CefV8Handler { CefRefPtr object, const CefV8ValueList& arguments, CefRefPtr& retval, - CefString& exception) { + CefString& exception) OVERRIDE { // The only messages that are handled here is getElapsedMilliseconds(), // GetCurrentLanguage(), GetApplicationSupportDirectory(), and GetRemoteDebuggingPort(). diff --git a/appshell/appshell_extensions_platform.cpp b/appshell/appshell_extensions_platform.cpp index 2337552c7..a3a929e96 100644 --- a/appshell/appshell_extensions_platform.cpp +++ b/appshell/appshell_extensions_platform.cpp @@ -2,6 +2,7 @@ #include #include #include +#include #ifdef OS_LINUX #include "appshell/browser/main_context.h" @@ -71,7 +72,7 @@ void CharSetEncode::operator()(std::string &contents) { if(error != U_BUFFER_OVERFLOW_ERROR) { throw "Unable to convert encoding"; } - std::auto_ptr target(new char[targetLen + 1]()); + std::unique_ptr target(new char[targetLen + 1]()); error = U_ZERO_ERROR; ustr.extract(target.get(), targetLen, m_conv, error); target.get()[targetLen] = '\0'; @@ -87,7 +88,7 @@ void DecodeContents(std::string &contents, const std::string& encoding) { if(status != U_BUFFER_OVERFLOW_ERROR) { throw "Unable to decode contents"; } - std::auto_ptr target(new char[targetLen + 1]()); + std::unique_ptr target(new char[targetLen + 1]()); status = U_ZERO_ERROR; ustr.extract(target.get(), targetLen, NULL, status); target.get()[targetLen] = '\0'; diff --git a/appshell/browser/client_app_browser.h b/appshell/browser/client_app_browser.h index 0b58f0d22..6663ba226 100644 --- a/appshell/browser/client_app_browser.h +++ b/appshell/browser/client_app_browser.h @@ -19,7 +19,7 @@ class ClientAppBrowser : public ClientApp, // Interface for browser delegates. All Delegates must be returned via // CreateDelegates. Do not perform work in the Delegate // constructor. See CefBrowserProcessHandler for documentation. - class Delegate : public virtual CefBase { + class Delegate : public virtual CefBaseRefCounted { public: virtual void OnBeforeCommandLineProcessing( CefRefPtr app, diff --git a/appshell/browser/client_handler.cc b/appshell/browser/client_handler.cc index 81d5e1830..26156f77a 100644 --- a/appshell/browser/client_handler.cc +++ b/appshell/browser/client_handler.cc @@ -272,32 +272,6 @@ void ClientHandler::OnFullscreenModeChange(CefRefPtr browser, NotifyFullscreen(fullscreen); } -bool ClientHandler::OnConsoleMessage(CefRefPtr browser, - const CefString& message, - const CefString& source, - int line) { - CEF_REQUIRE_UI_THREAD(); - - // FILE* file = fopen(console_log_file_.c_str(), "a"); - // if (file) { - // std::stringstream ss; - // ss << "Message: " << message.ToString() << NEWLINE << - // "Source: " << source.ToString() << NEWLINE << - // "Line: " << line << NEWLINE << - // "-----------------------" << NEWLINE; - // fputs(ss.str().c_str(), file); - // fclose(file); - - // if (first_console_message_) { - // test_runner::Alert( - // browser, "Console messages written to \"" + console_log_file_ + "\""); - // first_console_message_ = false; - // } - // } - - return false; -} - void ClientHandler::OnBeforeDownload( CefRefPtr browser, CefRefPtr download_item, @@ -347,7 +321,6 @@ void ClientHandler::OnDraggableRegionsChanged( NotifyDraggableRegions(regions); } -#endif bool ClientHandler::OnRequestGeolocationPermission( CefRefPtr browser, @@ -360,6 +333,7 @@ bool ClientHandler::OnRequestGeolocationPermission( callback->Continue(true); return true; } +#endif bool ClientHandler::OnPreKeyEvent(CefRefPtr browser, const CefKeyEvent& event, @@ -393,7 +367,7 @@ bool ClientHandler::OnBeforePopup( CefRefPtr& client, CefBrowserSettings& settings, bool* no_javascript_access) { - CEF_REQUIRE_IO_THREAD(); + CEF_REQUIRE_UI_THREAD(); // Return true to cancel the popup window. return !CreatePopupWindow(browser, false, popupFeatures, windowInfo, client, @@ -577,6 +551,7 @@ bool ClientHandler::OnCertificateError( CefRefPtr callback) { CEF_REQUIRE_UI_THREAD(); +#if 0 CefRefPtr subject = ssl_info->GetSubject(); CefRefPtr issuer = ssl_info->GetIssuer(); @@ -622,6 +597,7 @@ bool ClientHandler::OnCertificateError( // Load the error page. LoadErrorPage(browser->GetMainFrame(), request_url, cert_error, ss.str()); +#endif return false; // Cancel the request. } diff --git a/appshell/browser/client_handler.h b/appshell/browser/client_handler.h index 13e32e621..f260fe354 100644 --- a/appshell/browser/client_handler.h +++ b/appshell/browser/client_handler.h @@ -40,7 +40,6 @@ class ClientHandler : public CefDisplayHandler, public CefDownloadHandler, public CefDragHandler, - public CefGeolocationHandler, public CefKeyboardHandler, public CefLifeSpanHandler, public CefLoadHandler, @@ -111,9 +110,6 @@ class ClientHandler : } #endif - CefRefPtr GetGeolocationHandler() OVERRIDE { - return this; - } CefRefPtr GetKeyboardHandler() OVERRIDE { return this; } @@ -159,11 +155,6 @@ class ClientHandler : const CefString& title) OVERRIDE; void OnFullscreenModeChange(CefRefPtr browser, bool fullscreen) OVERRIDE; - bool OnConsoleMessage(CefRefPtr browser, - const CefString& message, - const CefString& source, - int line) OVERRIDE; - // CefDownloadHandler methods void OnBeforeDownload( CefRefPtr browser, @@ -190,13 +181,6 @@ class ClientHandler : const std::vector& regions) OVERRIDE; #endif - // CefGeolocationHandler methods - bool OnRequestGeolocationPermission( - CefRefPtr browser, - const CefString& requesting_url, - int request_id, - CefRefPtr callback) OVERRIDE; - // CefKeyboardHandler methods bool OnPreKeyEvent(CefRefPtr browser, const CefKeyEvent& event, @@ -235,7 +219,7 @@ class ClientHandler : bool OnBeforeBrowse(CefRefPtr browser, CefRefPtr frame, CefRefPtr request, - bool is_redirect) OVERRIDE; + bool is_redirect); bool OnOpenURLFromTab( CefRefPtr browser, CefRefPtr frame, diff --git a/appshell/browser/print_handler_gtk.cc b/appshell/browser/print_handler_gtk.cc index 377e30289..460018cf7 100644 --- a/appshell/browser/print_handler_gtk.cc +++ b/appshell/browser/print_handler_gtk.cc @@ -286,6 +286,7 @@ void ClientPrintHandlerGtk::OnPrintStart(CefRefPtr browser) { } void ClientPrintHandlerGtk::OnPrintSettings( + CefRefPtr browser, CefRefPtr settings, bool get_defaults) { if (get_defaults) { @@ -357,6 +358,7 @@ void ClientPrintHandlerGtk::OnPrintSettings( } bool ClientPrintHandlerGtk::OnPrintDialog( + CefRefPtr browser, bool has_selection, CefRefPtr callback) { dialog_callback_ = callback; @@ -398,6 +400,7 @@ bool ClientPrintHandlerGtk::OnPrintDialog( } bool ClientPrintHandlerGtk::OnPrintJob( + CefRefPtr browser, const CefString& document_name, const CefString& pdf_file_path, CefRefPtr callback) { @@ -424,7 +427,7 @@ bool ClientPrintHandlerGtk::OnPrintJob( return true; } -void ClientPrintHandlerGtk::OnPrintReset() { +void ClientPrintHandlerGtk::OnPrintReset( CefRefPtr browser) { if (dialog_) { gtk_widget_destroy(dialog_); dialog_ = NULL; diff --git a/appshell/browser/print_handler_gtk.h b/appshell/browser/print_handler_gtk.h index 11618e67d..1d7b55bea 100644 --- a/appshell/browser/print_handler_gtk.h +++ b/appshell/browser/print_handler_gtk.h @@ -20,15 +20,18 @@ class ClientPrintHandlerGtk : public CefPrintHandler { // CefPrintHandler methods. void OnPrintStart(CefRefPtr browser) OVERRIDE; - void OnPrintSettings(CefRefPtr settings, + void OnPrintSettings(CefRefPtr browser, + CefRefPtr settings, bool get_defaults) OVERRIDE; bool OnPrintDialog( + CefRefPtr browser, bool has_selection, CefRefPtr callback) OVERRIDE; - bool OnPrintJob(const CefString& document_name, + bool OnPrintJob(CefRefPtr browser, + const CefString& document_name, const CefString& pdf_file_path, - CefRefPtr callback) OVERRIDE; - void OnPrintReset() OVERRIDE; + CefRefPtr callback); + void OnPrintReset(CefRefPtr browser) OVERRIDE; CefSize GetPdfPaperSize(int device_units_per_inch) OVERRIDE; private: diff --git a/appshell/browser/root_window_manager.cc b/appshell/browser/root_window_manager.cc index 92a735dbd..c1b4707a4 100644 --- a/appshell/browser/root_window_manager.cc +++ b/appshell/browser/root_window_manager.cc @@ -22,6 +22,7 @@ class ClientRequestContextHandler : public CefRequestContextHandler { bool OnBeforePluginLoad(const CefString& mime_type, const CefString& plugin_url, + bool is_main_frame, const CefString& top_origin_url, CefRefPtr plugin_info, PluginPolicy* plugin_policy) OVERRIDE { diff --git a/appshell/cefclient.cpp b/appshell/cefclient.cpp index 72777401b..eba9fc304 100644 --- a/appshell/cefclient.cpp +++ b/appshell/cefclient.cpp @@ -28,7 +28,7 @@ CefRefPtr AppGetBrowser() { CefWindowHandle AppGetMainHwnd() { if (!g_handler.get()) - return NULL; + return 0; return g_handler->GetMainHwnd(); } diff --git a/appshell/cefclient_gtk.cc b/appshell/cefclient_gtk.cc index bb45d6ce1..e4304db01 100644 --- a/appshell/cefclient_gtk.cc +++ b/appshell/cefclient_gtk.cc @@ -233,7 +233,5 @@ int RunMain(int argc, char* argv[]) { // Program entry point function. int main(int argc, char* argv[]) { - char extra_option[] ="--disable-gpu"; - argv[argc]=extra_option; ++argc; return client::RunMain(argc, argv); } diff --git a/appshell/client_app.h b/appshell/client_app.h index f1a64940c..fad4a128f 100644 --- a/appshell/client_app.h +++ b/appshell/client_app.h @@ -20,7 +20,7 @@ class ClientApp : public CefApp, // Interface for renderer delegates. All RenderDelegates must be returned via // CreateRenderDelegates. Do not perform work in the RenderDelegate // constructor. See CefRenderProcessHandler for documentation. - class RenderDelegate : public virtual CefBase { + class RenderDelegate : public virtual CefBaseRefCounted { public: virtual void OnRenderThreadCreated(CefRefPtr app, CefRefPtr extra_info) {} @@ -93,11 +93,11 @@ class ClientApp : public CefApp, static void CreateRenderDelegates(RenderDelegateSet& delegates); // Registers custom schemes. Implemented in client_app_delegates. - static void RegisterCustomSchemes(CefRefPtr registrar); + static void RegisterCustomSchemes(CefRawPtr registrar); // CefApp methods. virtual void OnRegisterCustomSchemes( - CefRefPtr registrar) OVERRIDE { + CefRawPtr registrar) OVERRIDE { RegisterCustomSchemes(registrar); } virtual CefRefPtr GetRenderProcessHandler() @@ -121,6 +121,10 @@ class ClientApp : public CefApp, CefRefPtr browser, CefProcessId source_process, CefRefPtr message) OVERRIDE; + virtual void OnBeforeCommandLineProcessing(const CefString& process_type,CefRefPtr command_line) override + { + command_line->AppendSwitch("--disable-web-security"); + } // Set of supported RenderDelegates. RenderDelegateSet render_delegates_; diff --git a/appshell/client_app_delegates.cpp b/appshell/client_app_delegates.cpp index f8345d852..a093b358c 100644 --- a/appshell/client_app_delegates.cpp +++ b/appshell/client_app_delegates.cpp @@ -9,5 +9,5 @@ void ClientApp::CreateRenderDelegates(RenderDelegateSet& delegates) { } // static -void ClientApp::RegisterCustomSchemes(CefRefPtr registrar) { +void ClientApp::RegisterCustomSchemes(CefRawPtr registrar) { } diff --git a/appshell/client_handler.cpp b/appshell/client_handler.cpp index 83d3d8f6f..075e24810 100644 --- a/appshell/client_handler.cpp +++ b/appshell/client_handler.cpp @@ -205,9 +205,7 @@ bool ClientHandler::OnDragEnter(CefRefPtr browser, void ClientHandler::OnLoadStart(CefRefPtr browser, CefRefPtr frame - #ifdef OS_LINUX ,TransitionType transition_type - #endif ) { CEF_REQUIRE_UI_THREAD(); @@ -280,65 +278,6 @@ void ClientHandler::OnLoadingStateChange(CefRefPtr browser, SetNavState(canGoBack, canGoForward); } -bool ClientHandler::OnConsoleMessage(CefRefPtr browser, - const CefString& message, - const CefString& source, - int line) { - // Don't write the message to a console.log file. Instead, we'll just - // return false here so the message gets written to the console (output window - // in xcode, or console window in dev tools) - -/* - CEF_REQUIRE_UI_THREAD(); - - bool first_message; - std::string logFile; - - { - AutoLock lock_scope(this); - - first_message = m_LogFile.empty(); - if (first_message) { - std::stringstream ss; - ss << AppGetWorkingDirectory(); -#if defined(OS_WIN) - ss << "\\"; -#else - ss << "/"; -#endif - ss << "console.log"; - m_LogFile = ss.str(); - } - logFile = m_LogFile; - } - - FILE* file = fopen(logFile.c_str(), "a"); - if (file) { - std::stringstream ss; - ss << "Message: " << std::string(message) << "\r\nSource: " << - std::string(source) << "\r\nLine: " << line << - "\r\n-----------------------\r\n"; - fputs(ss.str().c_str(), file); - fclose(file); - - if (first_message) - SendNotification(NOTIFY_CONSOLE_MESSAGE); - } -*/ - return false; -} - -bool ClientHandler::OnRequestGeolocationPermission( - CefRefPtr browser, - const CefString& requesting_url, - int request_id, - CefRefPtr callback) { - // Allow geolocation access from all websites. - // TODO: What does ref app do? - callback->Continue(true); - return true; -} - void ClientHandler::OnBeforeContextMenu( CefRefPtr browser, CefRefPtr frame, diff --git a/appshell/client_handler.h b/appshell/client_handler.h index 7c67a3598..774885b7f 100644 --- a/appshell/client_handler.h +++ b/appshell/client_handler.h @@ -31,13 +31,12 @@ class ClientHandler : public CefClient, public CefRequestHandler, public CefDisplayHandler, public CefKeyboardHandler, - public CefGeolocationHandler, public CefContextMenuHandler { public: // Interface for process message delegates. Do not perform work in the // RenderDelegate constructor. - class ProcessMessageDelegate : public virtual CefBase { + class ProcessMessageDelegate : public virtual CefBaseRefCounted { public: // Called when a process message is received. Return true if the message was // handled and should not be passed on to other handlers. @@ -57,7 +56,7 @@ class ClientHandler : public CefClient, // Interface for request handler delegates. Do not perform work in the // RequestDelegate constructor. - class RequestDelegate : public virtual CefBase { + class RequestDelegate : public virtual CefBaseRefCounted { public: // Called to retrieve a resource handler. virtual CefRefPtr GetResourceHandler( @@ -94,9 +93,6 @@ class ClientHandler : public CefClient, virtual CefRefPtr GetDisplayHandler() OVERRIDE { return this; } - virtual CefRefPtr GetGeolocationHandler() OVERRIDE { - return this; - } virtual CefRefPtr GetContextMenuHandler() OVERRIDE { return this; } @@ -135,9 +131,7 @@ virtual bool OnBeforePopup(CefRefPtr browser, // CefLoadHandler methods virtual void OnLoadStart(CefRefPtr browser, CefRefPtr frame - #ifdef OS_LINUX ,TransitionType transition_type - #endif ) OVERRIDE; virtual void OnLoadEnd(CefRefPtr browser, CefRefPtr frame, @@ -164,17 +158,6 @@ virtual bool OnBeforePopup(CefRefPtr browser, const CefString& url) OVERRIDE; virtual void OnTitleChange(CefRefPtr browser, const CefString& title) OVERRIDE; - virtual bool OnConsoleMessage(CefRefPtr browser, - const CefString& message, - const CefString& source, - int line) OVERRIDE; - - // CefGeolocationHandler methods - virtual bool OnRequestGeolocationPermission( - CefRefPtr browser, - const CefString& requesting_url, - int request_id, - CefRefPtr callback) OVERRIDE; // CefContextMenuHandler methods virtual void OnBeforeContextMenu(CefRefPtr browser, diff --git a/appshell/command_callbacks.h b/appshell/command_callbacks.h index 709797c48..8ff25fe51 100644 --- a/appshell/command_callbacks.h +++ b/appshell/command_callbacks.h @@ -53,7 +53,7 @@ const ExtensionString EDIT_SELECT_ALL = "edit.selectAll"; #endif // Base CommandCallback class -class CommandCallback : public CefBase { +class CommandCallback : public CefBaseRefCounted { public: // Called when the command is complete. When handled=true, the command diff --git a/appshell/common/client_app.cc b/appshell/common/client_app.cc index 662e2b654..3b05bf964 100644 --- a/appshell/common/client_app.cc +++ b/appshell/common/client_app.cc @@ -42,7 +42,7 @@ ClientApp::ProcessType ClientApp::GetProcessType( } void ClientApp::OnRegisterCustomSchemes( - CefRefPtr registrar) { + CefRawPtr registrar) { RegisterCustomSchemes(registrar, cookieable_schemes_); } diff --git a/appshell/common/client_app.h b/appshell/common/client_app.h index cdbbfdadd..295b564c4 100644 --- a/appshell/common/client_app.h +++ b/appshell/common/client_app.h @@ -34,12 +34,12 @@ class ClientApp : public CefApp { private: // Registers custom schemes. Implemented by cefclient in // client_app_delegates_common.cc - static void RegisterCustomSchemes(CefRefPtr registrar, - std::vector& cookiable_schemes); + static void RegisterCustomSchemes(CefRawPtr registrar, + std::vector& cookiable_schemes) /*OVERRIDE*/; // CefApp methods. void OnRegisterCustomSchemes( - CefRefPtr registrar) OVERRIDE; + CefRawPtr registrar); DISALLOW_COPY_AND_ASSIGN(ClientApp); }; diff --git a/appshell/common/client_app_delegates_common.cc b/appshell/common/client_app_delegates_common.cc index 67c091f63..9c37ea378 100644 --- a/appshell/common/client_app_delegates_common.cc +++ b/appshell/common/client_app_delegates_common.cc @@ -9,7 +9,7 @@ namespace client { // static void ClientApp::RegisterCustomSchemes( - CefRefPtr registrar, + CefRawPtr registrar, std::vector& cookiable_schemes) { // Brackets specific change. //scheme_test::RegisterCustomSchemes(registrar, cookiable_schemes); diff --git a/appshell/renderer/client_app_renderer.h b/appshell/renderer/client_app_renderer.h index ad1048adf..05f469f6c 100644 --- a/appshell/renderer/client_app_renderer.h +++ b/appshell/renderer/client_app_renderer.h @@ -19,7 +19,7 @@ class ClientAppRenderer : public ClientApp, // Interface for renderer delegates. All Delegates must be returned via // CreateDelegates. Do not perform work in the Delegate // constructor. See CefRenderProcessHandler for documentation. - class Delegate : public virtual CefBase { + class Delegate : public virtual CefBaseRefCounted { public: virtual void OnRenderThreadCreated(CefRefPtr app, CefRefPtr extra_info) {} @@ -105,7 +105,7 @@ class ClientAppRenderer : public ClientApp, CefRefPtr frame, CefRefPtr request, NavigationType navigation_type, - bool is_redirect) OVERRIDE; + bool is_redirect); void OnContextCreated(CefRefPtr browser, CefRefPtr frame, CefRefPtr context) OVERRIDE; diff --git a/appshell_paths.gypi b/appshell_paths.gypi index 3b14692a1..66db1e3f2 100755 --- a/appshell_paths.gypi +++ b/appshell_paths.gypi @@ -30,7 +30,6 @@ 'include/base/cef_string16.h', 'include/base/cef_template_util.h', 'include/base/cef_thread_checker.h', - 'include/base/cef_thread_collision_warner.h', 'include/base/cef_trace_event.h', 'include/base/cef_tuple.h', 'include/base/cef_weak_ptr.h', @@ -40,9 +39,6 @@ 'include/base/internal/cef_raw_scoped_refptr_mismatch_checker.h', 'include/base/internal/cef_thread_checker_impl.h', 'include/cef_base.h', - 'include/cef_pack_resources.h', - 'include/cef_pack_strings.h', - 'include/cef_runnable.h', 'include/cef_version.h', 'include/internal/cef_export.h', 'include/internal/cef_logging_internal.h', @@ -70,10 +66,14 @@ 'include/wrapper/cef_helpers.h', 'include/wrapper/cef_message_router.h', 'include/wrapper/cef_resource_manager.h', + 'include/wrapper/cef_scoped_temp_dir.h', 'include/wrapper/cef_stream_resource_handler.h', 'include/wrapper/cef_xml_object.h', 'include/wrapper/cef_zip_archive.h', ], + 'includes_wrapper_mac': [ + 'include/wrapper/cef_library_loader.h', + ], 'includes_win': [ 'include/base/internal/cef_atomicops_x86_msvc.h', 'include/base/internal/cef_bind_internal_win.h', @@ -85,29 +85,36 @@ 'include/base/internal/cef_atomicops_atomicword_compat.h', 'include/base/internal/cef_atomicops_mac.h', 'include/cef_application_mac.h', + 'include/cef_sandbox_mac.h', 'include/internal/cef_mac.h', 'include/internal/cef_types_mac.h', ], 'includes_linux': [ 'include/base/internal/cef_atomicops_atomicword_compat.h', + 'include/base/internal/cef_atomicops_arm_gcc.h', 'include/base/internal/cef_atomicops_x86_gcc.h', 'include/internal/cef_linux.h', 'include/internal/cef_types_linux.h', ], 'libcef_sources_common': [ - 'libcef_dll/cpptoc/cpptoc.h', - 'libcef_dll/ctocpp/base_ctocpp.cc', - 'libcef_dll/ctocpp/base_ctocpp.h', - 'libcef_dll/ctocpp/ctocpp.h', + 'libcef_dll/cpptoc/cpptoc_ref_counted.h', + 'libcef_dll/cpptoc/cpptoc_scoped.h', + 'libcef_dll/ctocpp/base_ref_counted_ctocpp.cc', + 'libcef_dll/ctocpp/base_ref_counted_ctocpp.h', + 'libcef_dll/ctocpp/base_scoped_ctocpp.cc', + 'libcef_dll/ctocpp/base_scoped_ctocpp.h', + 'libcef_dll/ctocpp/ctocpp_ref_counted.h', + 'libcef_dll/ctocpp/ctocpp_scoped.h', 'libcef_dll/libcef_dll.cc', 'libcef_dll/libcef_dll2.cc', + 'libcef_dll/ptr_util.h', 'libcef_dll/resource.h', 'libcef_dll/transfer_util.cc', 'libcef_dll/transfer_util.h', 'libcef_dll/wrapper_types.h', '<@(autogen_library_side)', ], - 'libcef_dll_wrapper_sources_common': [ + 'libcef_dll_wrapper_sources_base': [ 'libcef_dll/base/cef_atomicops_x86_gcc.cc', 'libcef_dll/base/cef_bind_helpers.cc', 'libcef_dll/base/cef_callback_helpers.cc', @@ -118,12 +125,18 @@ 'libcef_dll/base/cef_ref_counted.cc', 'libcef_dll/base/cef_string16.cc', 'libcef_dll/base/cef_thread_checker_impl.cc', - 'libcef_dll/base/cef_thread_collision_warner.cc', 'libcef_dll/base/cef_weak_ptr.cc', - 'libcef_dll/cpptoc/base_cpptoc.cc', - 'libcef_dll/cpptoc/base_cpptoc.h', - 'libcef_dll/cpptoc/cpptoc.h', - 'libcef_dll/ctocpp/ctocpp.h', + ], + 'libcef_dll_wrapper_sources_common': [ + 'libcef_dll/cpptoc/base_ref_counted_cpptoc.cc', + 'libcef_dll/cpptoc/base_ref_counted_cpptoc.h', + 'libcef_dll/cpptoc/base_scoped_cpptoc.cc', + 'libcef_dll/cpptoc/base_scoped_cpptoc.h', + 'libcef_dll/cpptoc/cpptoc_ref_counted.h', + 'libcef_dll/cpptoc/cpptoc_scoped.h', + 'libcef_dll/ctocpp/ctocpp_ref_counted.h', + 'libcef_dll/ctocpp/ctocpp_scoped.h', + 'libcef_dll/ptr_util.h', 'libcef_dll/transfer_util.cc', 'libcef_dll/transfer_util.h', 'libcef_dll/wrapper_types.h', @@ -132,6 +145,7 @@ 'libcef_dll/wrapper/cef_closure_task.cc', 'libcef_dll/wrapper/cef_message_router.cc', 'libcef_dll/wrapper/cef_resource_manager.cc', + 'libcef_dll/wrapper/cef_scoped_temp_dir.cc', 'libcef_dll/wrapper/cef_stream_resource_handler.cc', 'libcef_dll/wrapper/cef_xml_object.cc', 'libcef_dll/wrapper/cef_zip_archive.cc', @@ -139,6 +153,10 @@ 'libcef_dll/wrapper/libcef_dll_wrapper2.cc', '<@(autogen_client_side)', ], + 'libcef_dll_wrapper_sources_mac': [ + 'libcef_dll/wrapper/cef_library_loader_mac.mm', + 'libcef_dll/wrapper/libcef_dll_dylib.cc', + ], 'appshell_sources_browser': [ 'appshell/browser/client_types.h', 'appshell/browser/resource.h',