diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f2dcc7..335009f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ set(CMAKE_CONFIGURATION_TYPES Release Debug) project(gst-cef) -set(CEF_VERSION "3.3538.1849.g458cc98") +set(CEF_VERSION "76.1.9+g2cf916e+chromium-76.0.3809.87") # Determine the platform. if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") diff --git a/cmake/DownloadCEF.cmake b/cmake/DownloadCEF.cmake index 0468898..e2b7a8a 100644 --- a/cmake/DownloadCEF.cmake +++ b/cmake/DownloadCEF.cmake @@ -31,6 +31,7 @@ function(DownloadCEF platform version download_dir) # Download the binary distribution and verify the hash. # message(STATUS "Downloading ${CEF_DOWNLOAD_PATH}...") + STRING(REPLACE "+" "%2B" CEF_DOWNLOAD_URL ${CEF_DOWNLOAD_URL}) file( DOWNLOAD "${CEF_DOWNLOAD_URL}" "${CEF_DOWNLOAD_PATH}" # EXPECTED_HASH SHA1=${CEF_SHA1} diff --git a/src/browser_manager.cpp b/src/browser_manager.cpp index 3de0503..071a5d9 100644 --- a/src/browser_manager.cpp +++ b/src/browser_manager.cpp @@ -92,7 +92,7 @@ void Browser::CreateCefWindow(CefRefPtr client) { CefBrowserSettings browser_settings; browser_settings.windowless_frame_rate = 30; - CefRefPtr browser = CefBrowserHost::CreateBrowserSync(window_info, client, client->GetUrl(), browser_settings, NULL); + CefRefPtr browser = CefBrowserHost::CreateBrowserSync(window_info, client, client->GetUrl(), browser_settings, NULL, NULL); browser->GetHost()->WasResized(); } diff --git a/src/cef_window_manager.cpp b/src/cef_window_manager.cpp index 1891887..5bc1045 100644 --- a/src/cef_window_manager.cpp +++ b/src/cef_window_manager.cpp @@ -37,11 +37,11 @@ gst_cef_(gst_cef) { CefWindowManager::~CefWindowManager() {} -bool CefWindowManager::GetViewRect(CefRefPtr browser, CefRect &rect) +void CefWindowManager::GetViewRect(CefRefPtr browser, CefRect &rect) { //GST_LOG("GetViewRect: %uX%u", width_, height_); rect.Set(0, 0, width_, height_); - return true; + return; } void CefWindowManager::OnPaint(CefRefPtr browser, PaintElementType paintType, const RectList &rects, diff --git a/src/cef_window_manager.h b/src/cef_window_manager.h index a67115e..c1857f4 100644 --- a/src/cef_window_manager.h +++ b/src/cef_window_manager.h @@ -50,7 +50,7 @@ class CefWindowManager : public CefClient, CefRefPtr frame, int httpStatusCode) OVERRIDE; - bool GetViewRect(CefRefPtr browser, CefRect &rect); + void GetViewRect(CefRefPtr browser, CefRect &rect); void OnPaint(CefRefPtr browser, PaintElementType paintType, const RectList &rects, const void *buffer, int width, int height) OVERRIDE; diff --git a/src/file_scheme_handler.cpp b/src/file_scheme_handler.cpp index dd78094..5559663 100644 --- a/src/file_scheme_handler.cpp +++ b/src/file_scheme_handler.cpp @@ -15,7 +15,7 @@ void RegisterFileSchemeHandlerFactory(CefRawPtr registrar) { - registrar->AddCustomScheme(kFileSchemeProtocol, true, false, false, true, true, false); + registrar->AddCustomScheme(kFileSchemeProtocol, CEF_SCHEME_OPTION_STANDARD | CEF_SCHEME_OPTION_SECURE | CEF_SCHEME_OPTION_CORS_ENABLED); } FileSchemeHandler::FileSchemeHandler(CefString local_filepath) diff --git a/src/subprocess.cpp b/src/subprocess.cpp index a2bae62..0bf90b9 100644 --- a/src/subprocess.cpp +++ b/src/subprocess.cpp @@ -37,7 +37,7 @@ void BrowserApp::OnBeforeCommandLineProcessing( void BrowserApp::OnRegisterCustomSchemes( CefRawPtr registrar) { - registrar->AddCustomScheme(kFileSchemeProtocol, true, false, false, true, true, false); + registrar->AddCustomScheme(kFileSchemeProtocol, CEF_SCHEME_OPTION_STANDARD | CEF_SCHEME_OPTION_SECURE | CEF_SCHEME_OPTION_CORS_ENABLED); } #ifdef _WIN32