aboutsummaryrefslogtreecommitdiff
path: root/webrtc/test/win
diff options
context:
space:
mode:
authorPeter Boström <pbos@webrtc.org>2015-06-04 15:18:17 +0200
committerPeter Boström <pbos@webrtc.org>2015-06-04 13:18:28 +0000
commit26b08605e2b99136fcc1cab0800234f469d6e236 (patch)
treee89bf8ef2ecd620cba1bcc7208fc814af5607684 /webrtc/test/win
parent491bd534ef726456883ec372562d1c8fef82e7ca (diff)
downloadwebrtc-26b08605e2b99136fcc1cab0800234f469d6e236.tar.gz
Use one scoped_refptr.
Uses webrtc/base/scoped_ref_ptr.h and removes the copy in system_wrappers. BUG= R=kwiberg@webrtc.org, tommi@webrtc.org Review URL: https://codereview.webrtc.org/1152733005 Cr-Commit-Position: refs/heads/master@{#9370}
Diffstat (limited to 'webrtc/test/win')
-rw-r--r--webrtc/test/win/d3d_renderer.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/webrtc/test/win/d3d_renderer.h b/webrtc/test/win/d3d_renderer.h
index c3b728b796..46ce266460 100644
--- a/webrtc/test/win/d3d_renderer.h
+++ b/webrtc/test/win/d3d_renderer.h
@@ -14,7 +14,7 @@
#include <d3d9.h>
#pragma comment(lib, "d3d9.lib") // located in DirectX SDK
-#include "webrtc/system_wrappers/interface/scoped_refptr.h"
+#include "webrtc/base/scoped_ref_ptr.h"
#include "webrtc/test/video_renderer.h"
#include "webrtc/typedefs.h"
@@ -42,11 +42,11 @@ class D3dRenderer : public VideoRenderer {
size_t width_, height_;
HWND hwnd_;
- scoped_refptr<IDirect3D9> d3d_;
- scoped_refptr<IDirect3DDevice9> d3d_device_;
+ rtc::scoped_refptr<IDirect3D9> d3d_;
+ rtc::scoped_refptr<IDirect3DDevice9> d3d_device_;
- scoped_refptr<IDirect3DTexture9> texture_;
- scoped_refptr<IDirect3DVertexBuffer9> vertex_buffer_;
+ rtc::scoped_refptr<IDirect3DTexture9> texture_;
+ rtc::scoped_refptr<IDirect3DVertexBuffer9> vertex_buffer_;
};
} // namespace test
} // namespace webrtc