Added on demand loading of web core dll

Author: ccw808

Client/core/CCore.cpp

@@ -1147,13 +1147,13 @@ void CCore::DestroyNetwork ( )
 }
 
 
-void CCore::InitialiseWeb ()
+CWebCoreInterface* CCore::GetWebCore ()
 {
-    // Don't initialise webcore twice
-    if ( m_pWebCore )
-        return;
-
-    m_pWebCore = CreateModule < CWebCoreInterface > ( m_WebCoreModule, "CefWeb", "cefweb", "InitWebCoreInterface", this );
+    if ( m_pWebCore == nullptr )
+    {
+        m_pWebCore = CreateModule < CWebCoreInterface > ( m_WebCoreModule, "CefWeb", "cefweb", "InitWebCoreInterface", this );
+    }
+    return m_pWebCore;
 }
 
 

Client/core/CCore.h

@@ -107,7 +107,7 @@ class CCore : public CCoreInterface, public CSingleton < CCore >
     CMouseControl*          GetMouseControl                 ( void )                { return m_pMouseControl; };
     CLocalGUI*              GetLocalGUI                     ( void );
     CLocalizationInterface* GetLocalization                 ( void )                { return g_pLocalization; };
-    CWebCoreInterface*      GetWebCore                      ( void )                { return m_pWebCore; };
+    CWebCoreInterface*      GetWebCore                      ( void );
     CTrayIconInterface*     GetTrayIcon                     ( void )                { return m_pTrayIcon; };
 
     void                    SaveConfig                      ( bool bWaitUntilFinished = false );
@@ -184,7 +184,7 @@ class CCore : public CCoreInterface, public CSingleton < CCore >
     void                    DestroyGUI                      ( void );
 
     // Web
-    void                    InitialiseWeb                   ( void );
+    bool                    IsWebCoreLoaded                 ( void )                { return m_pWebCore != nullptr; }
     void                    DestroyWeb                      ( void );
 
     // Hooks

Client/core/CGUI.cpp

@@ -525,10 +525,9 @@ void CLocalGUI::EchoChat ( const char* szText, bool bColorCoded )
 
 bool CLocalGUI::IsWebRequestGUIVisible ()
 {
-    auto pWebCore = g_pCore->GetWebCore ();
-    if ( pWebCore )
+    if ( g_pCore->IsWebCoreLoaded () )
     {
-        return pWebCore->IsRequestsGUIVisible ();
+        return g_pCore->GetWebCore ()->IsRequestsGUIVisible ();
     }
     return false;
 }

Client/core/CKeyBinds.cpp

@@ -301,7 +301,7 @@ CKeyBinds::~CKeyBinds ( void )
 
 bool CKeyBinds::ProcessMessage ( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
-    if ( g_pCore->GetWebCore () && !m_pCore->IsMenuVisible() && !m_pCore->GetConsole()->IsVisible() && !m_pCore->IsChatInputEnabled() )
+    if ( g_pCore->IsWebCoreLoaded () && !m_pCore->IsMenuVisible() && !m_pCore->GetConsole()->IsVisible() && !m_pCore->IsChatInputEnabled() )
         g_pCore->GetWebCore ()->ProcessInputMessage ( uMsg, wParam, lParam );
 
     // Don't process Shift keys here, we have a hack for that

Client/core/CSettings.cpp

@@ -2896,9 +2896,9 @@ void CSettings::LoadData ( void )
     m_pGridBrowserWhitelist->Clear ();
     m_bBrowserListsChanged = false;
 
-    auto pWebCore = CCore::GetSingleton().GetWebCore();
-    if ( pWebCore )
+    if ( g_pCore->IsWebCoreLoaded() )
     {
+        auto pWebCore = g_pCore->GetWebCore();
         std::vector<std::pair<SString, bool>> customBlacklist;
         pWebCore->GetFilterEntriesByType( customBlacklist, eWebFilterType::WEBFILTER_USER );
         for ( std::vector<std::pair<SString, bool>>::iterator iter = customBlacklist.begin(); iter != customBlacklist.end(); ++iter )
@@ -3201,9 +3201,9 @@ void CSettings::SaveData ( void )
         CVARS_SET ( "browser_remote_javascript", m_pCheckBoxRemoteJavascript->GetSelected () );
     }
 
-    auto pWebCore = CCore::GetSingleton().GetWebCore();
-    if ( pWebCore )
+    if ( g_pCore->IsWebCoreLoaded() )
     {
+        auto pWebCore = g_pCore->GetWebCore();
         std::vector<SString> customBlacklist;
         for ( int i = 0; i < m_pGridBrowserBlacklist->GetRowCount (); ++i )
         {

Client/core/DXHook/CDirect3DEvents9.cpp

@@ -49,9 +49,6 @@ void CDirect3DEvents9::OnDirect3DDeviceCreate  ( IDirect3DDevice9 *pDevice )
 
     // Create the GUI elements
     CLocalGUI::GetSingleton().CreateObjects ( pDevice );
-
-    // Init webbrowser
-    CCore::GetSingleton ().InitialiseWeb ();
 }
 
 void CDirect3DEvents9::OnDirect3DDeviceDestroy ( IDirect3DDevice9 *pDevice )
@@ -147,11 +144,10 @@ void CDirect3DEvents9::OnPresent ( IDirect3DDevice9 *pDevice )
     CGraphics::GetSingleton ().GetRenderItemManager ()->FlushNonAARenderTarget();
 
     bool bTookScreenShot = false;
-    auto pWebCore = g_pCore->GetWebCore ();
     if ( !CGraphics::GetSingleton ().GetScreenGrabber ()->IsQueueEmpty () )
     {
-        if ( pWebCore )
-            pWebCore->OnPreScreenshot ();
+        if ( g_pCore->IsWebCoreLoaded() )
+            g_pCore->GetWebCore()->OnPreScreenshot();
 
         bTookScreenShot = true;
     }
@@ -162,8 +158,8 @@ void CDirect3DEvents9::OnPresent ( IDirect3DDevice9 *pDevice )
     // Maybe grab screen for upload
     CGraphics::GetSingleton ().GetScreenGrabber ()->DoPulse ();
 
-    if ( bTookScreenShot && pWebCore )
-        pWebCore->OnPostScreenshot ();
+    if ( bTookScreenShot && g_pCore->IsWebCoreLoaded() )
+        g_pCore->GetWebCore()->OnPostScreenshot();
 
     // Draw the GUI
     CLocalGUI::GetSingleton().Draw ();

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -2335,8 +2335,7 @@ bool CClientGame::KeyStrokeHandler ( const SString& strKey, bool bState, bool bI
         bool bIgnore = false;
         if ( bState )
         {
-            auto pWebCore = g_pCore->GetWebCore();
-            auto pFocusedBrowser = pWebCore ? pWebCore->GetFocusedWebView () : nullptr;
+            auto pFocusedBrowser = g_pCore->IsWebCoreLoaded() ? g_pCore->GetWebCore()->GetFocusedWebView () : nullptr;
             bool isMouseKey = strKey.substr(0, 5) == "mouse";
 
             if ( g_pCore->IsMenuVisible() || ( g_pCore->GetConsole()->IsInputActive() && bIsConsoleInputKey )
@@ -2398,8 +2397,7 @@ bool CClientGame::CharacterKeyHandler ( WPARAM wChar )
     if ( m_pRootEntity && g_pCore->IsMenuVisible() == false && g_pCore->GetConsole()->IsInputActive() == false )
     {
         // Cancel event if remote browser is focused
-        auto pWebCore = g_pCore->GetWebCore();
-        auto pFocusedBrowser = pWebCore ? pWebCore->GetFocusedWebView () : nullptr;
+        auto pFocusedBrowser = g_pCore->IsWebCoreLoaded() ? g_pCore->GetWebCore()->GetFocusedWebView () : nullptr;
         if ( pFocusedBrowser && !pFocusedBrowser->IsLocal () )
             return false;
 
@@ -6370,7 +6368,7 @@ void CClientGame::SetDevelopmentMode ( bool bEnable, bool bEnableWeb )
     else
         g_pGame->GetAudio ()->SetWorldSoundHandler ( NULL );
 
-    if ( g_pCore->GetWebCore() )
+    if ( g_pCore->IsWebCoreLoaded() )
         g_pCore->GetWebCore()->SetTestModeEnabled ( bEnableWeb );
 }
 

Client/mods/deathmatch/logic/CClientWebBrowser.cpp

@@ -19,7 +19,6 @@ CClientWebBrowser::CClientWebBrowser ( CClientManager* pManager, ElementID ID, C
     SetTypeName ( "webbrowser" );
 
     // Create the web view
-    assert( g_pCore->GetWebCore() );
     m_pWebView = g_pCore->GetWebCore ()->CreateWebView ( pWebBrowserItem->m_uiSizeX, pWebBrowserItem->m_uiSizeY, bLocal, pWebBrowserItem, bTransparent );
 
     // Set events interface

Client/sdk/core/CCoreInterface.h

@@ -110,6 +110,7 @@ class CCoreInterface
     virtual void                    SetConnected                    ( bool bConnected ) = 0;
     virtual void                    SetOfflineMod                   ( bool bOffline ) = 0;
     virtual void                    ApplyHooks3                     ( bool bEnable ) = 0;
+    virtual bool                    IsWebCoreLoaded                 ( void ) = 0;
 
     virtual bool                    IsConnected                     ( void ) = 0;
     virtual bool                    Reconnect                       ( const char* szHost, unsigned short usPort, const char* szPassword, bool bSave = true ) = 0;