Roll chromium_revision 7a4fb8d..f527e86 (370025:370073)

webrtc/modules/video_render/windows/video_render_direct3d9.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 1107 matching lines @@
     _logoTop = top;
     _logoBottom = bottom;
 
     return 0;
 
 }
 
 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;
 }
 
 int32_t VideoRenderDirect3D9::ConfigureRenderer(const uint32_t channel,
                                                 const uint16_t streamId,
                                                 const unsigned int zOrder,
                                                 const float left,
                                                 const float top,
@@ skipping 13 matching lines @@
                      "Direct3D render failed to find channel");
         return -1;
     }
     // Only allow one stream per channel, demuxing is
     ddobj->SetStreamSettings(0, zOrder, left, top, right, bottom);
 
     return 0;
 }
 
 }  // namespace webrtc