Merge branch 'master' into bugfix/melee-sync

Author: Dutchman101

Client/cefweb/CWebCore.cpp

@@ -479,6 +479,15 @@ void CWebCore::OnPostScreenshot()
     }
 }
 
+void CWebCore::OnFPSLimitChange(std::uint16_t fps)
+{
+    dassert(g_pCore->GetNetwork() != nullptr);            // Ensure network module is loaded
+    for (auto& webView : m_WebViews)
+    {
+        webView->GetCefBrowser()->GetHost()->SetWindowlessFrameRate(fps);
+    }
+}
+
 void CWebCore::ProcessInputMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     if (!m_pFocusedWebView ||

Client/cefweb/CWebCore.h

@@ -96,6 +96,8 @@ class CWebCore : public CWebCoreInterface
     void OnPreScreenshot();
     void OnPostScreenshot();
 
+    void OnFPSLimitChange(std::uint16_t fps) override;
+
     bool SetGlobalAudioVolume(float fVolume);
 
     bool        UpdateListsFromMaster();

Client/cefweb/CWebView.cpp

@@ -54,7 +54,7 @@ void CWebView::Initialise()
 {
     // Initialise the web session (which holds the actual settings) in in-memory mode
     CefBrowserSettings browserSettings;
-    browserSettings.windowless_frame_rate = g_pCore->GetFrameRateLimit();
+    browserSettings.windowless_frame_rate = g_pCore->GetFPSLimiter()->GetFPSTarget();
     browserSettings.javascript_access_clipboard = cef_state_t::STATE_DISABLED;
     browserSettings.javascript_dom_paste = cef_state_t::STATE_DISABLED;
     browserSettings.webgl = cef_state_t::STATE_ENABLED;