Update for newer CEF.

diff --git a/meson.build b/meson.build
index 76b4b59c27410fd3d5dfadff653bf39e1d9a246e..13be7585c1d0f976a29f6c9100169e5e1b2c06e9 100644 (file)
--- 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 952486158cdb67e19d604c6322af253d745b71ea..b9baa0e001cd073912d2679e235feed4503576da 100644 (file)
--- 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 edda9b20bd87f6cd2c74cea7eb86f3024d381e7f..877635daf79acd19b2424d022b1707acfb6385f5 100644 (file)
--- 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()