summarylogtreecommitdiffstats
path: root/cef91.patch
diff options
context:
space:
mode:
Diffstat (limited to 'cef91.patch')
-rw-r--r--cef91.patch61
1 files changed, 0 insertions, 61 deletions
diff --git a/cef91.patch b/cef91.patch
deleted file mode 100644
index c8fd75db2210..000000000000
--- a/cef91.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/browser-app.cpp b/browser-app.cpp
-index f0aba74..df16c0a 100644
---- a/browser-app.cpp
-+++ b/browser-app.cpp
-@@ -117,7 +117,7 @@ void BrowserApp::OnContextCreated(CefRefPtr<CefBrowser> browser,
- {
- CefRefPtr<CefV8Value> globalObj = context->GetGlobal();
-
-- CefRefPtr<CefV8Value> obsStudioObj = CefV8Value::CreateObject(0, 0);
-+ CefRefPtr<CefV8Value> obsStudioObj = CefV8Value::CreateObject(nullptr, nullptr);
- globalObj->SetValue("obsstudio", obsStudioObj,
- V8_PROPERTY_ATTRIBUTE_NONE);
-
-@@ -154,7 +154,7 @@ void BrowserApp::ExecuteJSFunction(CefRefPtr<CefBrowser> browser,
- CefRefPtr<CefV8Value> jsFunction = obsStudioObj->GetValue(functionName);
-
- if (jsFunction && jsFunction->IsFunction())
-- jsFunction->ExecuteFunction(NULL, arguments);
-+ jsFunction->ExecuteFunction(nullptr, arguments);
-
- context->Exit();
- }
-@@ -310,7 +310,7 @@ bool BrowserApp::OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
-
- CefRefPtr<CefV8Value> dispatchEvent =
- globalObj->GetValue("dispatchEvent");
-- dispatchEvent->ExecuteFunction(NULL, arguments);
-+ dispatchEvent->ExecuteFunction(nullptr, arguments);
-
- context->Exit();
-
-@@ -340,7 +340,7 @@ bool BrowserApp::OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
- args.push_back(retval);
-
- if (callback)
-- callback->ExecuteFunction(NULL, args);
-+ callback->ExecuteFunction(nullptr, args);
-
- context->Exit();
-
-diff --git a/obs-browser-source.cpp b/obs-browser-source.cpp
-index 113a9f6..abac2a5 100644
---- a/obs-browser-source.cpp
-+++ b/obs-browser-source.cpp
-@@ -178,12 +178,15 @@ bool BrowserSource::CreateBrowser()
- cefBrowserSettings.default_font_size = 16;
- cefBrowserSettings.default_fixed_font_size = 16;
-
-+#if CHROME_VERSION_BUILD < 4430
- #if ENABLE_LOCAL_FILE_URL_SCHEME
- if (is_local) {
- /* Disable web security for file:// URLs to allow
-- * local content access to remote APIs */
-+ * local content access to remote APIs
-+ * This flag was removed from CEF >= 91 */
- cefBrowserSettings.web_security = STATE_DISABLED;
- }
-+#endif
- #endif
-
- cefBrowser = CefBrowserHost::CreateBrowserSync(