When asked to execute JavaScript, defer until the current page load is done.

[nageru] / cef_capture.cpp

diff --git a/cef_capture.cpp b/cef_capture.cpp
index 1836eb88f9cf474b9cc5c4287b3b7c011f39ac4c..76c5c7f753c8630ff6a796de58ac660daff65bf1 100644 (file)
--- a/cef_capture.cpp
+++ b/cef_capture.cpp
@@ -52,6 +52,7 @@ void CEFCapture::post_to_cef_ui_thread(std::function<void()> &&func)
 void CEFCapture::set_url(const string &url)
 {
        post_to_cef_ui_thread([this, url] {
+               loaded = false;
                browser->GetMainFrame()->LoadURL(url);
        });
 }
@@ -74,9 +75,13 @@ void CEFCapture::set_max_fps(int max_fps)
 void CEFCapture::execute_javascript_async(const string &js)
 {
        post_to_cef_ui_thread([this, js] {
-               CefString script_url("<theme eval>");
-               int start_line = 1;
-               browser->GetMainFrame()->ExecuteJavaScript(js, script_url, start_line);
+               if (loaded) {
+                       CefString script_url("<theme eval>");
+                       int start_line = 1;
+                       browser->GetMainFrame()->ExecuteJavaScript(js, script_url, start_line);
+               } else {
+                       deferred_javascript.push_back(js);
+               }
        });
 }
 
@@ -106,6 +111,19 @@ void CEFCapture::OnPaint(const void *buffer, int width, int height)
                FrameAllocator::Frame(), 0, AudioFormat());
 }
 
+void CEFCapture::OnLoadEnd()
+{
+       post_to_cef_ui_thread([this] {
+               loaded = true;
+               for (const string &js : deferred_javascript) {
+                       CefString script_url("<theme eval>");
+                       int start_line = 1;
+                       browser->GetMainFrame()->ExecuteJavaScript(js, script_url, start_line);
+               }
+               deferred_javascript.clear();
+       });
+}
+
 #define FRAME_SIZE (8 << 20)  // 8 MB.
 
 void CEFCapture::configure_card()
@@ -199,3 +217,8 @@ bool NageruCEFClient::GetViewRect(CefRefPtr<CefBrowser> browser, CefRect &rect)
        rect = CefRect(0, 0, width, height);
        return true;
 }
+
+void NageruCEFClient::OnLoadEnd(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int httpStatusCode)
+{
+       parent->OnLoadEnd();
+}