Send events to all frames

obsproject · Jul 16, 2023 · 5292ff3 · 5292ff3
1 parent 5d74047
commit 5292ff3
Showing 1 changed file with 38 additions and 28 deletions.
diff --git a/browser-app.cpp b/browser-app.cpp
@@ -142,19 +142,25 @@ void BrowserApp::ExecuteJSFunction(CefRefPtr<CefBrowser> browser,
  const char *functionName,
  CefV8ValueList arguments)
 {
- CefRefPtr<CefV8Context> context =
- browser->GetMainFrame()->GetV8Context();
+ std::vector<CefString> names;
+ browser->GetFrameNames(names);
+ for (auto &name : names) {
+ CefRefPtr<CefFrame> frame = browser->GetFrame(name);
+ CefRefPtr<CefV8Context> context = frame->GetV8Context();
 
- context->Enter();
+  context->Enter();
 
- CefRefPtr<CefV8Value> globalObj = context->GetGlobal();
- CefRefPtr<CefV8Value> obsStudioObj = globalObj->GetValue("obsstudio");
- CefRefPtr<CefV8Value> jsFunction = obsStudioObj->GetValue(functionName);
+ CefRefPtr<CefV8Value> globalObj = context->GetGlobal();
+ CefRefPtr<CefV8Value> obsStudioObj =
+ globalObj->GetValue("obsstudio");
+ CefRefPtr<CefV8Value> jsFunction =
+ obsStudioObj->GetValue(functionName);
 
- if (jsFunction && jsFunction->IsFunction())
- jsFunction->ExecuteFunction(nullptr, arguments);
+  if (jsFunction && jsFunction->IsFunction())
+  jsFunction->ExecuteFunction(nullptr, arguments);
 
- context->Exit();
+ context->Exit();
+ }
 }
 
 #if !ENABLE_WASHIDDEN
@@ -270,13 +276,6 @@ bool BrowserApp::OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
  ExecuteJSFunction(browser, "onActiveChange", arguments);
 
  } else if (message->GetName() == "DispatchJSEvent") {
- CefRefPtr<CefV8Context> context =
- browser->GetMainFrame()->GetV8Context();
-
- context->Enter();
-
- CefRefPtr<CefV8Value> globalObj = context->GetGlobal();
-
  nlohmann::json payloadJson = nlohmann::json::parse(
  args->GetString(1).ToString(), nullptr, false);
 
@@ -292,22 +291,33 @@ bool BrowserApp::OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
  script += wrapperJsonString;
  script += ");";
 
- CefRefPtr<CefV8Value> returnValue;
- CefRefPtr<CefV8Exception> exception;
+ std::vector<CefString> names;
+ browser->GetFrameNames(names);
+ for (auto &name : names) {
+ CefRefPtr<CefFrame> frame = browser->GetFrame(name);
+ CefRefPtr<CefV8Context> context = frame->GetV8Context();
 
- /* Create the CustomEvent object
- * We have to use eval to invoke the new operator */
- context->Eval(script, browser->GetMainFrame()->GetURL(), 0,
- returnValue, exception);
+ context->Enter();
 
- CefV8ValueList arguments;
- arguments.push_back(returnValue);
+ CefRefPtr<CefV8Value> globalObj = context->GetGlobal();
 
- CefRefPtr<CefV8Value> dispatchEvent =
- globalObj->GetValue("dispatchEvent");
- dispatchEvent->ExecuteFunction(nullptr, arguments);
+ CefRefPtr<CefV8Value> returnValue;
+ CefRefPtr<CefV8Exception> exception;
 
- context->Exit();
+ /* Create the CustomEvent object
+ * We have to use eval to invoke the new operator */
+ context->Eval(script, browser->GetMainFrame()->GetURL(),
+ 0, returnValue, exception);
+
+ CefV8ValueList arguments;
+ arguments.push_back(returnValue);
+
+ CefRefPtr<CefV8Value> dispatchEvent =
+ globalObj->GetValue("dispatchEvent");
+ dispatchEvent->ExecuteFunction(nullptr, arguments);
+
+ context->Exit();
+ }
 
  } else if (message->GetName() == "executeCallback") {
  CefRefPtr<CefV8Context> context =