Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(415)

Unified Diff: webrtc/modules/video_render/windows/video_render_direct3d9.cc

Issue 1593713013: Roll chromium_revision 7a4fb8d..f527e86 (370025:370073) (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Fix/disable Win Clang warnings Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/video_render/windows/video_render_direct3d9.cc
diff --git a/webrtc/modules/video_render/windows/video_render_direct3d9.cc b/webrtc/modules/video_render/windows/video_render_direct3d9.cc
index 83835aebb80a81e959169551c23b67f0baab493d..b59b944e483405818db95708c5793ac8cdc28ede 100644
--- a/webrtc/modules/video_render/windows/video_render_direct3d9.cc
+++ b/webrtc/modules/video_render/windows/video_render_direct3d9.cc
@@ -1125,12 +1125,6 @@ int32_t VideoRenderDirect3D9::SetBitmap(const void* bitMap,
int32_t VideoRenderDirect3D9::GetGraphicsMemory(uint64_t& totalMemory,
uint64_t& availableMemory)
{
- if (_totalMemory == -1 || _availableMemory == -1)
kjellander_webrtc 2016/01/19 08:39:05 This code must have been dead forever :)
- {
- totalMemory = 0;
- availableMemory = 0;
- return -1;
- }
totalMemory = _totalMemory;
availableMemory = _availableMemory;
return 0;

Powered by Google App Engine
This is Rietveld 408576698