Skip to content

Update CEF version #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
vpoddubchak wants to merge 2 commits into
base: linux
Choose a base branch
from
Draft

Update CEF version #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d22056
updated to the latest CEF
Aug 16, 2019
303ea93
fixed build errors after update CEF
vpoddubchak Aug 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
1 change: 1 addition & 0 deletions cmake/DownloadCEF.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion src/browser_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ void Browser::CreateCefWindow(CefRefPtr<CefWindowManager> client) {
CefBrowserSettings browser_settings;
browser_settings.windowless_frame_rate = 30;

CefRefPtr<CefBrowser> browser = CefBrowserHost::CreateBrowserSync(window_info, client, client->GetUrl(), browser_settings, NULL);
CefRefPtr<CefBrowser> browser = CefBrowserHost::CreateBrowserSync(window_info, client, client->GetUrl(), browser_settings, NULL, NULL);
browser->GetHost()->WasResized();
}

Expand Down
4 changes: 2 additions & 2 deletions src/cef_window_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ gst_cef_(gst_cef) {

CefWindowManager::~CefWindowManager() {}

bool CefWindowManager::GetViewRect(CefRefPtr<CefBrowser> browser, CefRect &rect)
void CefWindowManager::GetViewRect(CefRefPtr<CefBrowser> browser, CefRect &rect)
{
//GST_LOG("GetViewRect: %uX%u", width_, height_);
rect.Set(0, 0, width_, height_);
return true;
return;
}

void CefWindowManager::OnPaint(CefRefPtr<CefBrowser> browser, PaintElementType paintType, const RectList &rects,
Expand Down
2 changes: 1 addition & 1 deletion src/cef_window_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class CefWindowManager : public CefClient,
CefRefPtr<CefFrame> frame,
int httpStatusCode) OVERRIDE;

bool GetViewRect(CefRefPtr<CefBrowser> browser, CefRect &rect);
void GetViewRect(CefRefPtr<CefBrowser> browser, CefRect &rect);
void OnPaint(CefRefPtr<CefBrowser> browser, PaintElementType paintType,
const RectList &rects, const void *buffer, int width, int height) OVERRIDE;

Expand Down
2 changes: 1 addition & 1 deletion src/file_scheme_handler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

void RegisterFileSchemeHandlerFactory(CefRawPtr<CefSchemeRegistrar> 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)
Expand Down
2 changes: 1 addition & 1 deletion src/subprocess.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ void BrowserApp::OnBeforeCommandLineProcessing(
void BrowserApp::OnRegisterCustomSchemes(
CefRawPtr<CefSchemeRegistrar> 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
Expand Down