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

Side by Side Diff: webrtc/modules/desktop_capture/win/dxgi_texture.cc

Issue 2964773002: Revert "Update includes for webrtc/{base => rtc_base} rename (1/3)" (Closed)
Patch Set: Created 3 years, 5 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/modules/desktop_capture/win/dxgi_texture.h" 11 #include "webrtc/modules/desktop_capture/win/dxgi_texture.h"
12 12
13 #include <comdef.h> 13 #include <comdef.h>
14 #include <wrl/client.h> 14 #include <wrl/client.h>
15 #include <D3D11.h> 15 #include <D3D11.h>
16 16
17 #include "webrtc/base/checks.h"
18 #include "webrtc/base/logging.h"
17 #include "webrtc/modules/desktop_capture/desktop_region.h" 19 #include "webrtc/modules/desktop_capture/desktop_region.h"
18 #include "webrtc/rtc_base/checks.h"
19 #include "webrtc/rtc_base/logging.h"
20 20
21 using Microsoft::WRL::ComPtr; 21 using Microsoft::WRL::ComPtr;
22 22
23 namespace webrtc { 23 namespace webrtc {
24 24
25 namespace { 25 namespace {
26 26
27 class DxgiDesktopFrame : public DesktopFrame { 27 class DxgiDesktopFrame : public DesktopFrame {
28 public: 28 public:
29 explicit DxgiDesktopFrame(const DxgiTexture& texture) 29 explicit DxgiDesktopFrame(const DxgiTexture& texture)
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 bool DxgiTexture::Release() { 75 bool DxgiTexture::Release() {
76 frame_.reset(); 76 frame_.reset();
77 return DoRelease(); 77 return DoRelease();
78 } 78 }
79 79
80 DXGI_MAPPED_RECT* DxgiTexture::rect() { 80 DXGI_MAPPED_RECT* DxgiTexture::rect() {
81 return &rect_; 81 return &rect_;
82 } 82 }
83 83
84 } // namespace webrtc 84 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698