Added ignoreCache parameter to loadBrowserURL

Also ignoring cache by default if testmode is enabled

Author: jushar

MTA10/core/CWebView.cpp

@@ -79,7 +79,7 @@ void CWebView::CloseBrowser ()
         m_pWebView->GetHost ()->CloseBrowser ( true );
 }
 
-bool CWebView::LoadURL ( const SString& strURL, bool bFilterEnabled, const SString& strPostData, bool bURLEncoded )
+bool CWebView::LoadURL ( const SString& strURL, bool bFilterEnabled, const SString& strPostData, bool bURLEncoded, bool bIgnoreCache )
 {
     if ( !m_pWebView )
         return false;
@@ -97,6 +97,10 @@ bool CWebView::LoadURL ( const SString& strURL, bool bFilterEnabled, const SStri
     if ( strPostData.empty () )
     {
         pFrame->LoadURL ( strURL );
+
+        // Reload immediately and flush the cache if either requested or test mode is enabled
+        if ( bIgnoreCache || g_pCore->GetWebCore ()->IsTestModeEnabled () )
+            m_pWebView->ReloadIgnoreCache ();
     }
     else
     {

MTA10/core/CWebView.h

@@ -43,7 +43,7 @@ class CWebView : public CWebViewInterface, private CefClient, private CefRenderH
     void                        SetBeingDestroyed ( bool state ) { m_bBeingDestroyed = state; }
 
     // Exported methods
-    bool LoadURL                ( const SString& strURL, bool bFilterEnabled = true, const SString& strPostData = SString(), bool bURLEncoded = true );
+    bool LoadURL                ( const SString& strURL, bool bFilterEnabled = true, const SString& strPostData = SString(), bool bURLEncoded = true, bool bIgnoreCache = false );
     bool IsLoading              ();
     void GetURL                 ( SString& outURL );
     void GetTitle               ( SString& outTitle );

MTA10/mods/shared_logic/CClientWebBrowser.cpp

@@ -51,9 +51,9 @@ bool CClientWebBrowser::IsLoading ()
     return m_pWebView->IsLoading ();
 }
 
-bool CClientWebBrowser::LoadURL ( const SString& strURL, bool bFilterEnabled, const SString& strPostData, bool bURLEncoded )
+bool CClientWebBrowser::LoadURL ( const SString& strURL, bool bFilterEnabled, const SString& strPostData, bool bURLEncoded, bool bIgnoreCache )
 {
-    return m_pWebView->LoadURL ( strURL, bFilterEnabled, strPostData, bURLEncoded );
+    return m_pWebView->LoadURL ( strURL, bFilterEnabled, strPostData, bURLEncoded, bIgnoreCache );
 }
 
 void CClientWebBrowser::GetTitle ( SString& outPageTitle )

MTA10/mods/shared_logic/CClientWebBrowser.h

@@ -28,7 +28,7 @@ class CClientWebBrowser : public CClientTexture, public CWebBrowserEventsInterfa
     inline CWebViewInterface*   GetWebView          ()    { return m_pWebView; }
 
     bool                        IsLoading           ();
-    bool                        LoadURL             ( const SString& strURL, bool bFilterEnabled = true, const SString& strPostData = SString(), bool bURLEncoded = true );
+    bool                        LoadURL             ( const SString& strURL, bool bFilterEnabled = true, const SString& strPostData = SString(), bool bURLEncoded = true, bool bIgnoreCache = false );
     void                        GetTitle            ( SString& outPageTitle );
     void                        GetURL              ( SString& outURL );
     void                        SetRenderingPaused  ( bool bPaused );

MTA10/mods/shared_logic/lua/CLuaFunctionDefs.Browser.cpp

@@ -111,14 +111,15 @@ int CLuaFunctionDefs::RequestBrowserDomains ( lua_State* luaVM )
 
 int CLuaFunctionDefs::LoadBrowserURL ( lua_State* luaVM )
 {
-//  bool loadBrowserURL ( browser webBrowser, string url [, string postData = "", bool postURLEncoded = true ] )
-    CClientWebBrowser* pWebBrowser; SString strURL; SString strPostData; bool bURLEncoded;
+//  bool loadBrowserURL ( browser webBrowser, string url [, string postData = "", bool postURLEncoded = true, bool ignoreCache = false ] )
+    CClientWebBrowser* pWebBrowser; SString strURL; SString strPostData; bool bURLEncoded; bool bIgnoreCache;
 
     CScriptArgReader argStream ( luaVM );
     argStream.ReadUserData ( pWebBrowser );
     argStream.ReadString ( strURL );
     argStream.ReadString ( strPostData, "" );
     argStream.ReadBool ( bURLEncoded, true );
+    argStream.ReadBool ( bIgnoreCache, false );
 
     if ( !argStream.HasErrors () )
     {
@@ -132,7 +133,7 @@ int CLuaFunctionDefs::LoadBrowserURL ( lua_State* luaVM )
                 return 1;
             }
 
-            lua_pushboolean ( luaVM, pWebBrowser->LoadURL ( strURL, !isLocalURL, strPostData, bURLEncoded ) );
+            lua_pushboolean ( luaVM, pWebBrowser->LoadURL ( strURL, !isLocalURL, strPostData, bURLEncoded, bIgnoreCache ) );
             return 1;
         }
 
@@ -149,7 +150,7 @@ int CLuaFunctionDefs::LoadBrowserURL ( lua_State* luaVM )
                 m_pScriptDebugging->LogWarning ( luaVM, "This URL scheme is deprecated and may not work in future versions. Please consider using http://mta/* instead. See https://wiki.mtasa.com/wiki/LoadBrowserURL for details" );
 
                 pWebBrowser->SetTempURL ( strURL );
-                lua_pushboolean ( luaVM,  pWebBrowser->LoadURL ( "mtalocal://" + strURL, false, strPostData, bURLEncoded ) );
+                lua_pushboolean ( luaVM,  pWebBrowser->LoadURL ( "mtalocal://" + strURL, false, strPostData, bURLEncoded, bIgnoreCache ) );
                 return 1;
             }
         }

MTA10/sdk/core/CWebViewInterface.h

@@ -20,7 +20,7 @@ class CWebViewInterface
 public:
     virtual void Initialise         () = 0;
     virtual void SetWebBrowserEvents( CWebBrowserEventsInterface* pInterface ) = 0;
-    virtual bool LoadURL            ( const SString& strURL, bool bFilterEnabled = true, const SString& strPostData = SString(), bool bURLEncoded = true ) = 0;
+    virtual bool LoadURL            ( const SString& strURL, bool bFilterEnabled = true, const SString& strPostData = SString(), bool bURLEncoded = true, bool bIgnoreCache = false ) = 0;
     virtual bool IsLoading          () = 0;
     virtual void SetBeingDestroyed  ( bool state ) = 0;