From: Steinar H. Gunderson <steinar+nageru@gunderson.no>
Date: Fri, 20 Mar 2020 18:59:48 +0000 (+0100)
Subject: Update for newer CEF.
X-Git-Tag: 1.9.2~7
X-Git-Url: https://git.sesse.net/?p=nageru;a=commitdiff_plain;h=a728398a530a78df171a0a5de5f8ec2b444cb6c1

Update for newer CEF.
---

diff --git a/meson.build b/meson.build
index 76b4b59..13be758 100644
--- a/meson.build
+++ b/meson.build
@@ -87,7 +87,7 @@ if have_cef
 	system_cef = (cef_build_type == 'system')
 	if system_cef
 		cef_lib_dir = cef_dir
-		cef_resource_dir = '/usr/share/cef/Resources'
+		cef_resource_dir = cef_dir
 	else
 		cef_lib_dir = join_paths(cef_dir, cef_build_type)
 		cef_resource_dir = join_paths(cef_dir, 'Resources')
@@ -122,7 +122,7 @@ if have_cef
 		nageru_deps += cefdlldep
 	endif
 
-	cef_libs = ['libEGL.so', 'libGLESv2.so', 'natives_blob.bin', 'snapshot_blob.bin', 'v8_context_snapshot.bin']
+	cef_libs = ['libEGL.so', 'libGLESv2.so', 'snapshot_blob.bin', 'v8_context_snapshot.bin']
 	cef_resources = ['cef.pak', 'cef_100_percent.pak', 'cef_200_percent.pak', 'cef_extensions.pak', 'devtools_resources.pak']
 	if not get_option('cef_no_icudtl')
 		cef_resources += ['icudtl.dat']
diff --git a/nageru/cef_capture.cpp b/nageru/cef_capture.cpp
index 9524861..b9baa0e 100644
--- a/nageru/cef_capture.cpp
+++ b/nageru/cef_capture.cpp
@@ -189,7 +189,7 @@ void CEFCapture::start_bm_capture()
 
 		CefWindowInfo window_info;
 		window_info.SetAsWindowless(0);
-		browser = CefBrowserHost::CreateBrowserSync(window_info, cef_client, start_url, browser_settings, nullptr);
+		browser = CefBrowserHost::CreateBrowserSync(window_info, cef_client, start_url, browser_settings, nullptr, nullptr);
 		for (function<void()> &task : deferred_tasks) {
 			task();
 		}
diff --git a/nageru/nageru_cef_app.cpp b/nageru/nageru_cef_app.cpp
index edda9b2..877635d 100644
--- a/nageru/nageru_cef_app.cpp
+++ b/nageru/nageru_cef_app.cpp
@@ -16,6 +16,9 @@ void NageruCefApp::OnBeforeCommandLineProcessing(
 	command_line->AppendSwitch("disable-gpu");
 	command_line->AppendSwitch("disable-gpu-compositing");
 	command_line->AppendSwitch("enable-begin-frame-scheduling");
+
+	// https://bitbucket.org/chromiumembedded/cef/issues/2717/xmlhttprequest-empty-responsetext
+	command_line->AppendSwitch("disable-web-security");
 }
 
 void NageruCefApp::initialize_cef()