void CEFCapture::post_to_cef_ui_thread(std::function<void()> &&func)
{
- lock_guard<mutex> lock(browser_mutex);
+ lock_guard<recursive_mutex> lock(browser_mutex);
if (browser != nullptr) {
CefPostTask(TID_UI, new CEFTaskAdapter(std::move(func)));
} else {
void CEFCapture::reload()
{
post_to_cef_ui_thread([this] {
+ loaded = false;
browser->Reload();
});
}
});
}
+void CEFCapture::resize(unsigned width, unsigned height)
+{
+ lock_guard<mutex> lock(resolution_mutex);
+ this->width = width;
+ this->height = height;
+}
+
void CEFCapture::OnPaint(const void *buffer, int width, int height)
{
steady_clock::time_point timestamp = steady_clock::now();
// so we need to do this explicitly, or we could be stuck on an
// old frame forever if the image doesn't change.)
post_to_cef_ui_thread([this] {
- browser->GetHost()->Invalidate(PET_VIEW);
+ lock_guard<recursive_mutex> lock(browser_mutex);
+ if (browser != nullptr) { // Could happen if we are shutting down.
+ browser->GetHost()->Invalidate(PET_VIEW);
+ }
});
++timecode;
} else {
cef_app->initialize_cef();
CefPostTask(TID_UI, new CEFTaskAdapter([this]{
- lock_guard<mutex> lock(browser_mutex);
+ lock_guard<recursive_mutex> lock(browser_mutex);
CefBrowserSettings browser_settings;
browser_settings.web_security = cef_state_t::STATE_DISABLED;
void CEFCapture::stop_dequeue_thread()
{
- lock_guard<mutex> lock(browser_mutex);
- cef_app->close_browser(browser);
- browser = nullptr; // Or unref_cef() will be sad.
+ {
+ lock_guard<recursive_mutex> lock(browser_mutex);
+ cef_app->close_browser(browser);
+ browser = nullptr; // Or unref_cef() will be sad.
+ }
cef_app->unref_cef();
}
bool NageruCEFClient::GetViewRect(CefRefPtr<CefBrowser> browser, CefRect &rect)
{
+ return parent->GetViewRect(rect);
+}
+
+bool CEFCapture::GetViewRect(CefRect &rect)
+{
+ lock_guard<mutex> lock(resolution_mutex);
rect = CefRect(0, 0, width, height);
return true;
}