aboutsummaryrefslogtreecommitdiff
path: root/mp/src/vgui2/chromehtml/html_chrome.cpp
diff options
context:
space:
mode:
authorJoe Ludwig <[email protected]>2014-05-15 13:59:18 -0700
committerJoe Ludwig <[email protected]>2014-05-15 13:59:18 -0700
commit53e78c503e6e9c7d15e2eefc480755fe37dd7077 (patch)
treec8cc106eb4c0a2b2b5d79f534f2facb0514f5f55 /mp/src/vgui2/chromehtml/html_chrome.cpp
parentAdded many shader source files (diff)
downloadsource-sdk-2013-53e78c503e6e9c7d15e2eefc480755fe37dd7077.tar.xz
source-sdk-2013-53e78c503e6e9c7d15e2eefc480755fe37dd7077.zip
General:
* Upgraded Steamworks SDK to v1.29 * Fixed mod compatibility problem with Multiplayer Base that was introduced in September. * In Hammer, while using the Vertex Tool, pressing CTRL+B will snap selected vertices to the grid. Virtual Reality: * Mods that support virtual reality now need to have a line in gameinfo.txt that says “supportsvr 1”. This indicates to gameui and engine that certain UI should be enabled. * VR-enabled mods will now start up in VR mode when launched from Steam’s VR mode. Windows: * Upgraded to Visual Studio 2013. If you need to build projects for VS 2010, add /2010 to your VPC command line. OSX: * Upgraded to XCode 5.
Diffstat (limited to 'mp/src/vgui2/chromehtml/html_chrome.cpp')
-rw-r--r--mp/src/vgui2/chromehtml/html_chrome.cpp65
1 files changed, 37 insertions, 28 deletions
diff --git a/mp/src/vgui2/chromehtml/html_chrome.cpp b/mp/src/vgui2/chromehtml/html_chrome.cpp
index 37ba4f74..83ea654c 100644
--- a/mp/src/vgui2/chromehtml/html_chrome.cpp
+++ b/mp/src/vgui2/chromehtml/html_chrome.cpp
@@ -2079,7 +2079,12 @@ void CClientHandler::OnLoadEnd(CefRefPtr<CefBrowser> browser,
{
CHTMLProtoBufMsg<CMsgFinishedRequest> cmd( eHTMLCommands_FinishedRequest );
- cmd.Body().set_url( CStrAutoEncode( browser->GetMainFrame()->GetURL().c_str() ).ToString() );
+
+ if ( browser->GetMainFrame()->GetURL().size() > 0 )
+ cmd.Body().set_url( CStrAutoEncode( browser->GetMainFrame()->GetURL().c_str() ).ToString() );
+ else
+ cmd.Body().set_url( "" );
+
CefString frameName = browser->GetMainFrame()->GetName();
if ( !frameName.empty() )
cmd.Body().set_pagetitle( frameName.c_str() );
@@ -2221,6 +2226,9 @@ bool CClientHandler::OnBeforeResourceLoad(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefResponse> response,
int loadFlags)
{
+ if ( request->GetURL().size() == 0 )
+ return false;
+
CHTMLProtoBufMsg<CMsgLoadingResource> cmd( eHTMLCommands_LoadingResource );
cmd.Body().set_url( CStrAutoEncode( request->GetURL().c_str() ).ToString() );
DISPATCH_MESSAGE( eHTMLCommands_LoadingResource );
@@ -3022,42 +3030,43 @@ void CClientHandler::RequestScreenShot( const CHTMLProtoBufMsg<CMsgSavePageToJPE
//-----------------------------------------------------------------------------
void CClientHandler::SavePageToJPEGIfNeeded( CefRefPtr<CefBrowser> browser, const byte *pRGBA, int wide, int tall )
{
- if ( m_Snapshot.m_sURLSnapshot.IsValid() && wide && tall
- && m_Snapshot.m_sURLSnapshot == CStrAutoEncode( browser->GetMainFrame()->GetURL().c_str() ).ToString() )
+ if ( m_Snapshot.m_sURLSnapshot.IsValid() && wide && tall && ( browser->GetMainFrame()->GetURL().size() > 0 ) )
{
- VPROF_BUDGET( "CClientHandler::SavePageToJPEGIfNeeded", VPROF_BUDGETGROUP_TENFOOT );
+ if ( m_Snapshot.m_sURLSnapshot == CStrAutoEncode( browser->GetMainFrame()->GetURL().c_str() ).ToString() )
+ {
+ VPROF_BUDGET( "CClientHandler::SavePageToJPEGIfNeeded", VPROF_BUDGETGROUP_TENFOOT );
- CUtlBuffer bufRGB;
+ CUtlBuffer bufRGB;
- bufRGB.Put( pRGBA, wide * tall *4 );
- if ( !BConvertRGBAToRGB( bufRGB, wide, tall ) )
- return;
+ bufRGB.Put( pRGBA, wide * tall *4 );
+ if ( !BConvertRGBAToRGB( bufRGB, wide, tall ) )
+ return;
- BResizeImageRGB( bufRGB, wide, tall, m_Snapshot.m_nWide, m_Snapshot.m_nTall );
- // input format is actually BGRA so now swizzle to rgb
- byte *pBGR = (byte *)bufRGB.Base();
- for ( int i = 0; i < m_Snapshot.m_nTall; i++ )
- {
- for ( int j = 0; j < m_Snapshot.m_nWide; j++ )
+ BResizeImageRGB( bufRGB, wide, tall, m_Snapshot.m_nWide, m_Snapshot.m_nTall );
+ // input format is actually BGRA so now swizzle to rgb
+ byte *pBGR = (byte *)bufRGB.Base();
+ for ( int i = 0; i < m_Snapshot.m_nTall; i++ )
{
- char cR = pBGR[0];
- pBGR[0] = pBGR[2];
- pBGR[2] = cR;
- pBGR += 3;
+ for ( int j = 0; j < m_Snapshot.m_nWide; j++ )
+ {
+ char cR = pBGR[0];
+ pBGR[0] = pBGR[2];
+ pBGR[2] = cR;
+ pBGR += 3;
+ }
}
- }
- if ( !ConvertRGBToJpeg( m_Snapshot.m_sFileNameSnapshot, k_ScreenshotQuality, m_Snapshot.m_nWide, m_Snapshot.m_nTall, bufRGB ) )
- return;
+ if ( !ConvertRGBToJpeg( m_Snapshot.m_sFileNameSnapshot, k_ScreenshotQuality, m_Snapshot.m_nWide, m_Snapshot.m_nTall, bufRGB ) )
+ return;
- CHTMLProtoBufMsg<CMsgSavePageToJPEGResponse> cmd( eHTMLCommands_SavePageToJPEGResponse );
- cmd.Body().set_url( m_Snapshot.m_sURLSnapshot );
- cmd.Body().set_filename( m_Snapshot.m_sFileNameSnapshot );
- DISPATCH_MESSAGE( eHTMLCommands_SavePageToJPEGResponse );
-
- m_Snapshot.m_sURLSnapshot.Clear();
- m_Snapshot.m_flRequestTimeout = 0.0f;
+ CHTMLProtoBufMsg<CMsgSavePageToJPEGResponse> cmd( eHTMLCommands_SavePageToJPEGResponse );
+ cmd.Body().set_url( m_Snapshot.m_sURLSnapshot );
+ cmd.Body().set_filename( m_Snapshot.m_sFileNameSnapshot );
+ DISPATCH_MESSAGE( eHTMLCommands_SavePageToJPEGResponse );
+ m_Snapshot.m_sURLSnapshot.Clear();
+ m_Snapshot.m_flRequestTimeout = 0.0f;
+ }
}
}