Revert "Added ignoreCache parameter to loadBrowserURL"

jushar · jushar · commit 6b9314c1a5a6 · 2015-10-25T16:50:38.000+01:00
This reverts commit 85df037.
diff --git a/MTA10/core/CWebView.cpp b/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 bIgnoreCache )
+bool CWebView::LoadURL ( const SString& strURL, bool bFilterEnabled, const SString& strPostData, bool bURLEncoded )
 {
     if ( !m_pWebView )
         return false;
@@ -97,10 +97,6 @@ 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
     {
diff --git a/MTA10/core/CWebView.h b/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 bIgnoreCache = false );
+    bool LoadURL                ( const SString& strURL, bool bFilterEnabled = true, const SString& strPostData = SString(), bool bURLEncoded = true );
     bool IsLoading              ();
     SString GetURL              ();
     const SString& GetTitle     ();
diff --git a/MTA10/mods/shared_logic/CClientWebBrowser.cpp b/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 bIgnoreCache )
+bool CClientWebBrowser::LoadURL ( const SString& strURL, bool bFilterEnabled, const SString& strPostData, bool bURLEncoded )
 {
-    return m_pWebView->LoadURL ( strURL, bFilterEnabled, strPostData, bURLEncoded, bIgnoreCache );
+    return m_pWebView->LoadURL ( strURL, bFilterEnabled, strPostData, bURLEncoded );
 }
 
 const SString& CClientWebBrowser::GetTitle ()
diff --git a/MTA10/mods/shared_logic/CClientWebBrowser.h b/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 bIgnoreCache = false );
+    bool                        LoadURL             ( const SString& strURL, bool bFilterEnabled = true, const SString& strPostData = SString(), bool bURLEncoded = true );
     const SString&              GetTitle            ();
     SString                     GetURL              ();
     void                        SetRenderingPaused  ( bool bPaused );
diff --git a/MTA10/mods/shared_logic/lua/CLuaFunctionDefs.Browser.cpp b/MTA10/mods/shared_logic/lua/CLuaFunctionDefs.Browser.cpp
@@ -111,15 +111,14 @@ int CLuaFunctionDefs::RequestBrowserDomains ( lua_State* luaVM )
 
 int CLuaFunctionDefs::LoadBrowserURL ( lua_State* luaVM )
 {
-//  bool loadBrowserURL ( browser webBrowser, string url [, string postData = "", bool postURLEncoded = true, bool ignoreCache = false ] )
-    CClientWebBrowser* pWebBrowser; SString strURL; SString strPostData; bool bURLEncoded; bool bIgnoreCache;
+//  bool loadBrowserURL ( browser webBrowser, string url [, string postData = "", bool postURLEncoded = true ] )
+    CClientWebBrowser* pWebBrowser; SString strURL; SString strPostData; bool bURLEncoded;
 
     CScriptArgReader argStream ( luaVM );
     argStream.ReadUserData ( pWebBrowser );
     argStream.ReadString ( strURL );
     argStream.ReadString ( strPostData, "" );
     argStream.ReadBool ( bURLEncoded, true );
-    argStream.ReadBool ( bIgnoreCache, false );
 
     if ( !argStream.HasErrors () )
     {
@@ -133,7 +132,7 @@ int CLuaFunctionDefs::LoadBrowserURL ( lua_State* luaVM )
                 return 1;
             }
 
-            lua_pushboolean ( luaVM, pWebBrowser->LoadURL ( strURL, !isLocalURL, strPostData, bURLEncoded, bIgnoreCache ) );
+            lua_pushboolean ( luaVM, pWebBrowser->LoadURL ( strURL, !isLocalURL, strPostData, bURLEncoded ) );
             return 1;
         }
 
@@ -149,7 +148,7 @@ int CLuaFunctionDefs::LoadBrowserURL ( lua_State* luaVM )
                 // Output deprecated warning, TODO: Remove this at a later point
                 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" );
 
-                lua_pushboolean ( luaVM,  pWebBrowser->LoadURL ( "mtalocal://" + strURL, false, strPostData, bURLEncoded, bIgnoreCache ) );
+                lua_pushboolean ( luaVM,  pWebBrowser->LoadURL ( "mtalocal://" + strURL, false, strPostData, bURLEncoded ) );
                 return 1;
             }
         }
diff --git a/MTA10/sdk/core/CWebViewInterface.h b/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, bool bIgnoreCache = false ) = 0;
+    virtual bool LoadURL            ( const SString& strURL, bool bFilterEnabled = true, const SString& strPostData = SString(), bool bURLEncoded = true ) = 0;
     virtual bool IsLoading          () = 0;
     virtual void SetBeingDestroyed  ( bool state ) = 0;
     

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ void CWebView::CloseBrowser ()`
`79`	`79`	`m_pWebView->GetHost ()->CloseBrowser ( true );`
`80`	`80`	`}`
`81`	`81`
`82`		`-bool CWebView::LoadURL ( const SString& strURL, bool bFilterEnabled, const SString& strPostData, bool bURLEncoded, bool bIgnoreCache )`
	`82`	`+bool CWebView::LoadURL ( const SString& strURL, bool bFilterEnabled, const SString& strPostData, bool bURLEncoded )`
`83`	`83`	`{`
`84`	`84`	`if ( !m_pWebView )`
`85`	`85`	`return false;`
`@@ -97,10 +97,6 @@ bool CWebView::LoadURL ( const SString& strURL, bool bFilterEnabled, const SStri`
`97`	`97`	`if ( strPostData.empty () )`
`98`	`98`	`{`
`99`	`99`	`pFrame->LoadURL ( strURL );`
`100`		`-`
`101`		`- // Reload immediately and flush the cache if either requested or test mode is enabled`
`102`		`- if ( bIgnoreCache \|\| g_pCore->GetWebCore ()->IsTestModeEnabled () )`
`103`		`- m_pWebView->ReloadIgnoreCache ();`
`104`	`100`	`}`
`105`	`101`	`else`
`106`	`102`	`{`
Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,9 @@ bool CClientWebBrowser::IsLoading ()`
`51`	`51`	`return m_pWebView->IsLoading ();`
`52`	`52`	`}`
`53`	`53`
`54`		`-bool CClientWebBrowser::LoadURL ( const SString& strURL, bool bFilterEnabled, const SString& strPostData, bool bURLEncoded, bool bIgnoreCache )`
	`54`	`+bool CClientWebBrowser::LoadURL ( const SString& strURL, bool bFilterEnabled, const SString& strPostData, bool bURLEncoded )`
`55`	`55`	`{`
`56`		`- return m_pWebView->LoadURL ( strURL, bFilterEnabled, strPostData, bURLEncoded, bIgnoreCache );`
	`56`	`+ return m_pWebView->LoadURL ( strURL, bFilterEnabled, strPostData, bURLEncoded );`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`const SString& CClientWebBrowser::GetTitle ()`
Original file line number	Diff line number	Diff line change
`@@ -111,15 +111,14 @@ int CLuaFunctionDefs::RequestBrowserDomains ( lua_State* luaVM )`
`111`	`111`
`112`	`112`	`int CLuaFunctionDefs::LoadBrowserURL ( lua_State* luaVM )`
`113`	`113`	`{`
`114`		`-// bool loadBrowserURL ( browser webBrowser, string url [, string postData = "", bool postURLEncoded = true, bool ignoreCache = false ] )`
`115`		`- CClientWebBrowser* pWebBrowser; SString strURL; SString strPostData; bool bURLEncoded; bool bIgnoreCache;`
	`114`	`+// bool loadBrowserURL ( browser webBrowser, string url [, string postData = "", bool postURLEncoded = true ] )`
	`115`	`+ CClientWebBrowser* pWebBrowser; SString strURL; SString strPostData; bool bURLEncoded;`
`116`	`116`
`117`	`117`	`CScriptArgReader argStream ( luaVM );`
`118`	`118`	`argStream.ReadUserData ( pWebBrowser );`
`119`	`119`	`argStream.ReadString ( strURL );`
`120`	`120`	`argStream.ReadString ( strPostData, "" );`
`121`	`121`	`argStream.ReadBool ( bURLEncoded, true );`
`122`		`- argStream.ReadBool ( bIgnoreCache, false );`
`123`	`122`
`124`	`123`	`if ( !argStream.HasErrors () )`
`125`	`124`	`{`
`@@ -133,7 +132,7 @@ int CLuaFunctionDefs::LoadBrowserURL ( lua_State* luaVM )`
`133`	`132`	`return 1;`
`134`	`133`	`}`
`135`	`134`
`136`		`- lua_pushboolean ( luaVM, pWebBrowser->LoadURL ( strURL, !isLocalURL, strPostData, bURLEncoded, bIgnoreCache ) );`
	`135`	`+ lua_pushboolean ( luaVM, pWebBrowser->LoadURL ( strURL, !isLocalURL, strPostData, bURLEncoded ) );`
`137`	`136`	`return 1;`
`138`	`137`	`}`
`139`	`138`
`@@ -149,7 +148,7 @@ int CLuaFunctionDefs::LoadBrowserURL ( lua_State* luaVM )`
`149`	`148`	`// Output deprecated warning, TODO: Remove this at a later point`
`150`	`149`	`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" );`
`151`	`150`
`152`		`- lua_pushboolean ( luaVM, pWebBrowser->LoadURL ( "mtalocal://" + strURL, false, strPostData, bURLEncoded, bIgnoreCache ) );`
	`151`	`+ lua_pushboolean ( luaVM, pWebBrowser->LoadURL ( "mtalocal://" + strURL, false, strPostData, bURLEncoded ) );`
`153`	`152`	`return 1;`
`154`	`153`	`}`
`155`	`154`	`}`