Move texture uploading out of a lambda.

[nageru] / nageru / nageru_cef_app.cpp

diff --git a/nageru/nageru_cef_app.cpp b/nageru/nageru_cef_app.cpp
index 2e64ceee9aa35b11b1016fa4674b56fdaa1f3859..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()
@@ -29,7 +32,7 @@ void NageruCefApp::initialize_cef()
 
 void NageruCefApp::close_browser(CefRefPtr<CefBrowser> browser)
 {
-       unique_lock<mutex> lock(cef_mutex);
+       lock_guard<mutex> lock(cef_mutex);
        browser->GetHost()->CloseBrowser(/*force_close=*/true);
 }