Add button to properties to refresh the current page's cache

Also fixed some spaces that were supposed to be tabs

Author: OsirisNL

obs-browser/browser-manager-base.cpp

@@ -85,6 +85,11 @@ void BrowserManager::ExecuteSceneChangeJSCallback(const char *name)
 	pimpl->ExecuteSceneChangeJSCallback(name);
 }
 
+void BrowserManager::RefreshPageNoCache(int browserIdentifier)
+{
+	pimpl->RefreshPageNoCache(browserIdentifier);
+}
+
 BrowserManager::Impl::Impl()
 {
 	os_event_init(&dispatchEvent, OS_EVENT_TYPE_AUTO);
@@ -322,6 +327,14 @@ void BrowserManager::Impl::ExecuteSceneChangeJSCallback(const char *name)
 	});
 }
 
+void BrowserManager::Impl::RefreshPageNoCache(int browserIdentifier)
+{
+	ExecuteOnBrowser(browserIdentifier, [&](CefRefPtr<CefBrowser> b)
+	{
+		b->ReloadIgnoreCache();
+	});
+}
+
 void
 BrowserManager::Impl::Startup() 
 {

obs-browser/browser-manager-base.hpp

@@ -36,17 +36,17 @@ class BrowserManager::Impl
 	void DestroyBrowser(int browserIdentifier);
 	void TickBrowser(int browserIdentifier);
 
-    void SendMouseClick(int browserIdentifier,
-        const struct obs_mouse_event *event, int32_t type,
-        bool mouse_up, uint32_t click_count);
-    void SendMouseMove(int browserIdentifier,
-        const struct obs_mouse_event *event, bool mouseLeave);
-    void SendMouseWheel(int browserIdentifier,
-        const struct obs_mouse_event *event, int xDelta,
-        int yDelta);
-    void SendFocus(int browserIdentifier, bool focus);
-    void SendKeyClick(int browserIdentifier,
-        const struct obs_key_event *event, bool keyUp);
+	void SendMouseClick(int browserIdentifier,
+		const struct obs_mouse_event *event, int32_t type,
+		bool mouse_up, uint32_t click_count);
+	void SendMouseMove(int browserIdentifier,
+		const struct obs_mouse_event *event, bool mouseLeave);
+	void SendMouseWheel(int browserIdentifier,
+		const struct obs_mouse_event *event, int xDelta,
+		int yDelta);
+	void SendFocus(int browserIdentifier, bool focus);
+	void SendKeyClick(int browserIdentifier,
+		const struct obs_key_event *event, bool keyUp);
 
 	void AddListener(const int browserIdentifier,
 		std::shared_ptr<BrowserListener> browserListener);
@@ -58,6 +58,8 @@ class BrowserManager::Impl
 
 	void ExecuteSceneChangeJSCallback(const char *name);
 
+	void RefreshPageNoCache(int browserIdentifier);
+
 private: 
 	void ExecuteOnBrowser(int browserIdentifier, 
 			std::function<void(CefRefPtr<CefBrowser>)> f, 

obs-browser/main-source.cpp

@@ -42,6 +42,17 @@ static bool restart_button_clicked(obs_properties_t *props,
 	BrowserManager::Instance()->Restart();
 	return true;
 }
+
+static bool refreshnocache_button_clicked(obs_properties_t *props,
+	obs_property_t *property, void *data)
+{
+	BrowserSource *bs = static_cast<BrowserSource *>(data);
+
+	BrowserManager::Instance()->RefreshPageNoCache(bs->GetBrowserIdentifier());
+	
+	return true;
+}
+
 static bool is_local_file_modified(obs_properties_t *props,
 		obs_property_t *prop, obs_data_t *settings)
 {
@@ -97,6 +108,8 @@ static obs_properties_t *browser_source_get_properties(void *data)
 	obs_properties_add_bool(props, "shutdown",
 		obs_module_text("Shutdown when not active"));
 
+	obs_properties_add_button(props, "refreshnocache",
+		obs_module_text("Refresh cache of current page"), refreshnocache_button_clicked);
 
 #ifdef __APPLE__
 	// osx is the only process-isolated cef impl

obs-browser/main.cpp

@@ -43,7 +43,7 @@ static void handle_obs_frontend_event(enum obs_frontend_event event, void *)
 
 bool obs_module_load(void)
 {
-    blog(LOG_INFO, "[browser_source: 'Version: %s']", OBS_BROWSER_VERSION);
+	blog(LOG_INFO, "[browser_source: 'Version: %s']", OBS_BROWSER_VERSION);
 
 	browser_source_info = create_browser_source_info();
 

shared/browser-app.hpp

@@ -47,7 +47,7 @@ class BrowserApp : public CefApp,
 private:
 	virtual void ExecuteJSFunction(CefRefPtr<CefBrowser> browser,
 		const char *functionName,
-        CefV8ValueList arguments);
+		CefV8ValueList arguments);
 
 	IMPLEMENT_REFCOUNTING(BrowserApp);
 

shared/browser-manager.hpp

@@ -60,8 +60,10 @@ class BrowserManager {
 	const char *GetModulePath() { return path; }
 
 	void ExecuteVisiblityJSCallback(int browserIdentifier, bool visible);
-    
-    void ExecuteSceneChangeJSCallback(const char *name);
+	
+	void ExecuteSceneChangeJSCallback(const char *name);
+
+	void RefreshPageNoCache(int browserIdentifier);
 
 private:
 	class Impl;

shared/browser-scheme.cpp

@@ -37,10 +37,10 @@ bool BrowserSchemeHandler::ProcessRequest(CefRefPtr<CefRequest> request,
 
 	path = CefURIDecode(path, true, cef_uri_unescape_rule_t::UU_SPACES);
 	path = CefURIDecode(path, true, cef_uri_unescape_rule_t::UU_URL_SPECIAL_CHARS_EXCEPT_PATH_SEPARATORS);
-    
+
 #ifdef WIN32
 	//blog(LOG_INFO, "%s", path.erase(0,1));
-    inputStream.open(nowide::widen(path.erase(0,1)), std::ifstream::binary);
+	inputStream.open(nowide::widen(path.erase(0,1)), std::ifstream::binary);
 #else
 	inputStream.open(path, std::ifstream::binary);
 #endif